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

- preferences UI is now started on preferences open

Browse Source 
- more work/fixes in working on data structures (offset, offset_value, job_type, shape)
This commit is contained in:
Marius Stanciu
2021-07-14 22:35:29 +03:00
committed by Marius
parent 368413e6d2
commit f08466e7f2
15 changed files with 159 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tclCommands/TclCommandCopperClear.py
View File

@@ -193,27 +193,27 @@ class TclCommandCopperClear(TclCommand):
default_data.update({
"name": outname,
"plot": False,
"cutz": self.app.defaults["geometry_cutz"],
"vtipdia": float(self.app.defaults["tools_mill_vtipdia"]),
"vtipangle": float(self.app.defaults["tools_mill_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"],
"dwell": self.app.defaults["geometry_dwell"],
"dwelltime": self.app.defaults["geometry_dwelltime"],
"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"],
"spindlespeed": self.app.defaults["geometry_spindlespeed"],
"toolchangexy": self.app.defaults["geometry_toolchangexy"],
"startz": self.app.defaults["geometry_startz"],
"tools_mill_cutz": self.app.defaults["tools_mill_cutz"],
"tools_mill_vtipdia": float(self.app.defaults["tools_mill_vtipdia"]),
"tools_mill_vtipangle": float(self.app.defaults["tools_mill_vtipangle"]),
"tools_mill_travelz": self.app.defaults["tools_mill__travelz"],
"tools_mill_feedrate": self.app.defaults["tools_mill_feedrate"],
"tools_mill_feedrate_z": self.app.defaults["tools_mill_feedrate_z"],
"tools_mill_feedrate_rapid": self.app.defaults["tools_mill_feedrate_rapid"],
"tools_mill_dwell": self.app.defaults["tools_mill_dwell"],
"tools_mill_dwelltime": self.app.defaults["tools_mill_dwelltime"],
"tools_mill_multidepth": self.app.defaults["tools_mill_multidepth"],
"tools_mill_ppname_g": self.app.defaults["tools_mill_ppname_g"],
"tools_mill_depthperpass": self.app.defaults["tools_mill_depthperpass"],
"tools_mill_extracut": self.app.defaults["tools_mill_extracut"],
"tools_mill_extracut_length": self.app.defaults["tools_mill_extracut_length"],
"tools_mill_toolchange": self.app.defaults["tools_mill_toolchange"],
"tools_mill_toolchangez": self.app.defaults["tools_mill_toolchangez"],
"tools_mill_endz": self.app.defaults["tools_mill_endz"],
"tools_mill_endxy": self.app.defaults["tools_mill_endxy"],
"tools_mill_spindlespeed": self.app.defaults["tools_mill_spindlespeed"],
"tools_mill_toolchangexy": self.app.defaults["tools_mill_toolchangexy"],
"tools_mill_startz": self.app.defaults["tools_mill_startz"],
"area_exclusion": self.app.defaults["geometry_area_exclusion"],
"area_shape": self.app.defaults["geometry_area_shape"],
@@ -242,10 +242,6 @@ class TclCommandCopperClear(TclCommand):
ncc_tools.update({
int(tooluid): {
'tooldia': float('%.*f' % (obj.decimals, tool)),
'offset': 'Path',
'offset_value': 0.0,
'type': 'Iso',
'tool_type': 'C1',
'data': dict(default_data),
'solid_geometry': []
}