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

- working on the Isolation Tool and Milling Tool

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-13 04:10:49 +02:00
committed by Marius
parent 0386dbf258
commit 3b8519276f
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appTools/ToolIsolation.py
View File

@@ -1722,8 +1722,8 @@ class ToolIsolation(AppTool, Gerber):
iso_except = self.ui.except_cb.get_value()
tool_dia = tools_storage[tool]['tooldia']
for i in range(passes):
tool_dia = tools_storage[tool]['tooldia']
tool_type = tools_storage[tool]['tool_type']
iso_offset = tool_dia * ((2 * i + 1) / 2.0000001) - (i * overlap * tool_dia)
@@ -1775,6 +1775,8 @@ class ToolIsolation(AppTool, Gerber):
def iso_init(geo_obj, fc_obj):
# Propagate options
geo_obj.options["tools_mill_tooldia"] = str(tool_dia)
tool_data["tools_mill_tooldia"] = float(tool_dia)
geo_obj.solid_geometry = deepcopy(new_solid_geo)
# ############################################################
@@ -1958,7 +1960,7 @@ class ToolIsolation(AppTool, Gerber):
'solid_geometry': deepcopy(new_solid_geo)
}
})
tools_storage[tool]['data']['tools_mill_tooldia'] = float(tool_dia)
total_solid_geometry += new_solid_geo
# if the geometry is all isolated
@@ -2150,6 +2152,7 @@ class ToolIsolation(AppTool, Gerber):
'solid_geometry': deepcopy(new_solid_geo)
}
})
tools_storage[tool]['data']['tools_mill_tooldia'] = float(tool_dia)
total_solid_geometry += new_solid_geo

2
appTools/ToolMilling.py
View File

@@ -2965,7 +2965,7 @@ class ToolMilling(AppTool, Excellon):
tools_dict[tooluid_key]['data']['ppname_g'] = self.ui.pp_geo_name_cb.get_value()
# Offset calculation
offset_type = dia_cnc_dict['tools_mill_offset_type']
offset_type = dia_cnc_dict['data']['tools_mill_offset_type']
if offset_type == 1: # 'in'
tool_offset = -tooldia_val / 2
elif offset_type == 2: # 'out'