bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated the isolate, cutout and geocutout Tcl commands and now they yield multigeo Geometry objects

Browse Source
This commit is contained in:
Marius Stanciu
2022-01-31 21:19:37 +02:00
committed by Marius
parent 7306e7ada1
commit 28372c1e08
5 changed files with 121 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appObjects/FlatCAMGeometry.py
View File

@@ -110,7 +110,7 @@ class GeometryObject(FlatCAMObj, Geometry):
tool_id of the tools and the value is another dict that will hold the data under the following form:
{tooluid: {
'tooldia': 1,
'data': self.default_tool_data
'data': self.default_tool_data,
'solid_geometry': []
}
}

6
appObjects/FlatCAMGerber.py
View File

@@ -579,6 +579,7 @@ class GerberObject(FlatCAMObj, Gerber):
# Propagate options
geo_obj.options["tools_mill_tooldia"] = str(dia)
geo_obj.tool_type = self.app.defaults["tools_iso_tool_shape"]
geo_obj.multigeo = True
geo_obj.solid_geometry = []
@@ -639,9 +640,6 @@ class GerberObject(FlatCAMObj, Gerber):
msg = '[success] %s: %s' % (_("Isolation geometry created"), geo_obj.options["name"])
app_obj.inform.emit(msg)
# even if combine is checked, one pass is still single-geo
geo_obj.multigeo = True if passes > 1 else False
# ############################################################
# ########## AREA SUBTRACTION ################################
# ############################################################
@@ -679,6 +677,7 @@ class GerberObject(FlatCAMObj, Gerber):
# Propagate options
geo_obj.options["tools_mill_tooldia"] = str(dia)
geo_obj.tool_type = self.app.defaults["tools_iso_tool_shape"]
geo_obj.multigeo = True
# if milling type is climb then the move is counter-clockwise around features
mill_dir = 1 if milling_type == 'cl' else 0
@@ -731,7 +730,6 @@ class GerberObject(FlatCAMObj, Gerber):
elif plot:
msg = '[success] %s: %s' % (_("Isolation geometry created"), geo_obj.options["name"])
app_obj.inform.emit(msg)
geo_obj.multigeo = False
# ############################################################
# ########## AREA SUBTRACTION ################################