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

- for NCC, Cutout, Paint, Milling Tools made sure that the tool data dict is populated correctly

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-08 04:14:02 +02:00
committed by Marius
parent 4539d22329
commit 9e9eabb04e
6 changed files with 323 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
appTools/ToolIsolation.py
View File

@@ -314,42 +314,42 @@ class ToolIsolation(AppTool, Gerber):
if option.find('tools_') == 0:
self.default_data[option] = self.app.options[option]
self.default_data.update({
"name": outname + '_iso',
"plot": self.app.defaults["geometry_plot"],
"cutz": float(self.app.defaults["tools_iso_tool_cutz"]),
"vtipdia": float(self.app.defaults["tools_iso_tool_vtipdia"]),
"vtipangle": float(self.app.defaults["tools_iso_tool_vtipangle"]),
"travelz": self.app.defaults["geometry_travelz"],
"feedrate": self.app.defaults["geometry_feedrate"],
"feedrate_z": self.app.defaults["geometry_feedrate_z"],
"feedrate_rapid": self.app.defaults["geometry_feedrate_rapid"],
"multidepth": self.app.defaults["geometry_multidepth"],
"ppname_g": self.app.defaults["geometry_ppname_g"],
"depthperpass": self.app.defaults["geometry_depthperpass"],
"extracut": self.app.defaults["geometry_extracut"],
"extracut_length": self.app.defaults["geometry_extracut_length"],
"toolchange": self.app.defaults["geometry_toolchange"],
"toolchangez": self.app.defaults["geometry_toolchangez"],
"endz": self.app.defaults["geometry_endz"],
"endxy": self.app.defaults["geometry_endxy"],
"dwell": self.app.defaults["geometry_dwell"],
"dwelltime": self.app.defaults["geometry_dwelltime"],
"spindlespeed": self.app.defaults["geometry_spindlespeed"],
"spindledir": self.app.defaults["geometry_spindledir"],
"optimization_type": self.app.defaults["geometry_optimization_type"],
"search_time": self.app.defaults["geometry_search_time"],
"toolchangexy": self.app.defaults["geometry_toolchangexy"],
"startz": self.app.defaults["geometry_startz"],
"area_exclusion": self.app.defaults["geometry_area_exclusion"],
"area_shape": self.app.defaults["geometry_area_shape"],
"area_strategy": self.app.defaults["geometry_area_strategy"],
"area_overz": float(self.app.defaults["geometry_area_overz"]),
})
# self.default_data.update({
# "name": outname + '_iso',
# "plot": self.app.defaults["geometry_plot"],
# "cutz": float(self.app.defaults["tools_iso_tool_cutz"]),
# "vtipdia": float(self.app.defaults["tools_iso_tool_vtipdia"]),
# "vtipangle": float(self.app.defaults["tools_iso_tool_vtipangle"]),
# "travelz": self.app.defaults["geometry_travelz"],
# "feedrate": self.app.defaults["geometry_feedrate"],
# "feedrate_z": self.app.defaults["geometry_feedrate_z"],
# "feedrate_rapid": self.app.defaults["geometry_feedrate_rapid"],
#
# "multidepth": self.app.defaults["geometry_multidepth"],
# "ppname_g": self.app.defaults["geometry_ppname_g"],
# "depthperpass": self.app.defaults["geometry_depthperpass"],
# "extracut": self.app.defaults["geometry_extracut"],
# "extracut_length": self.app.defaults["geometry_extracut_length"],
# "toolchange": self.app.defaults["geometry_toolchange"],
# "toolchangez": self.app.defaults["geometry_toolchangez"],
# "endz": self.app.defaults["geometry_endz"],
# "endxy": self.app.defaults["geometry_endxy"],
#
# "dwell": self.app.defaults["geometry_dwell"],
# "dwelltime": self.app.defaults["geometry_dwelltime"],
# "spindlespeed": self.app.defaults["geometry_spindlespeed"],
# "spindledir": self.app.defaults["geometry_spindledir"],
#
# "optimization_type": self.app.defaults["geometry_optimization_type"],
# "search_time": self.app.defaults["geometry_search_time"],
# "toolchangexy": self.app.defaults["geometry_toolchangexy"],
# "startz": self.app.defaults["geometry_startz"],
#
# "area_exclusion": self.app.defaults["geometry_area_exclusion"],
# "area_shape": self.app.defaults["geometry_area_shape"],
# "area_strategy": self.app.defaults["geometry_area_strategy"],
# "area_overz": float(self.app.defaults["geometry_area_overz"]),
# })
try:
dias = [float(self.app.defaults["tools_iso_tooldia"])]