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

- fixed the 'isolate' Tcl command: updated to the new tools data structure elements

Browse Source
This commit is contained in:
Marius Stanciu
2022-01-17 14:08:44 +02:00
committed by Marius
parent 0a9adcb82d
commit fd696b00a2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
- fixed issues in the 'millslots' and 'milldrills' Tcl commands for the case when some parameters are not used - fixed issues in the 'millslots' and 'milldrills' Tcl commands for the case when some parameters are not used
- made sure that in Tcl commands deleting argument keys will not raise an error - made sure that in Tcl commands deleting argument keys will not raise an error
- fixed the 'isolate' Tcl command: updated to the new tools data structure elements
15.01.2022 15.01.2022

10
appObjects/FlatCAMGerber.py
View File

@@ -555,7 +555,7 @@ class GerberObject(FlatCAMObj, Gerber):
def iso_init(geo_obj, app_obj): def iso_init(geo_obj, app_obj):
# Propagate options # Propagate options
geo_obj.options["tools_mill_tooldia"] = str(dia) geo_obj.options["tools_mill_tooldia"] = str(dia)
geo_obj.tool_type = self.app.defaults["tools_iso_tool_type"] geo_obj.tool_type = self.app.defaults["tools_iso_tool_shape"]
geo_obj.solid_geometry = [] geo_obj.solid_geometry = []
@@ -569,7 +569,7 @@ class GerberObject(FlatCAMObj, Gerber):
default_data[opt_key] = self.app.options[opt_key] default_data[opt_key] = self.app.options[opt_key]
geo_obj.tools = { geo_obj.tools = {
'1': { 1: {
'tooldia': dia, 'tooldia': dia,
'data': default_data, 'data': default_data,
'solid_geometry': geo_obj.solid_geometry 'solid_geometry': geo_obj.solid_geometry
@@ -591,7 +591,7 @@ class GerberObject(FlatCAMObj, Gerber):
geo_obj.solid_geometry.append(geom) geo_obj.solid_geometry.append(geom)
# update the geometry in the tools # update the geometry in the tools
geo_obj.tools['1']['solid_geometry'] = geo_obj.solid_geometry geo_obj.tools[1]['solid_geometry'] = geo_obj.solid_geometry
# detect if solid_geometry is empty and this require list flattening which is "heavy" # detect if solid_geometry is empty and this require list flattening which is "heavy"
# or just looking in the lists (they are one level depth) and if any is not empty # or just looking in the lists (they are one level depth) and if any is not empty
@@ -654,7 +654,7 @@ class GerberObject(FlatCAMObj, Gerber):
def iso_init(geo_obj, app_obj): def iso_init(geo_obj, app_obj):
# Propagate options # Propagate options
geo_obj.options["tools_mill_tooldia"] = str(dia) geo_obj.options["tools_mill_tooldia"] = str(dia)
geo_obj.tool_type = self.app.defaults["tools_iso_tool_type"] geo_obj.tool_type = self.app.defaults["tools_iso_tool_shape"]
# if milling type is climb then the move is counter-clockwise around features # if milling type is climb then the move is counter-clockwise around features
mill_dir = 1 if milling_type == 'cl' else 0 mill_dir = 1 if milling_type == 'cl' else 0
@@ -677,7 +677,7 @@ class GerberObject(FlatCAMObj, Gerber):
default_data[opt_key] = self.app.options[opt_key] default_data[opt_key] = self.app.options[opt_key]
geo_obj.tools = { geo_obj.tools = {
'1': { 1: {
'tooldia': dia, 'tooldia': dia,
'data': default_data, 'data': default_data,
'solid_geometry': geo_obj.solid_geometry 'solid_geometry': geo_obj.solid_geometry