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

- fixed some issues in panelize and cncjob Tcl commands

Browse Source 
- reversed the mirroring axis in the `mirror` Tcl command to be consistent with the action in GUI
This commit is contained in:
Marius Stanciu
2022-02-01 22:09:14 +02:00
committed by Marius
parent 52a0efb62e
commit b1f038dd52
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tclCommands/TclCommandCncjob.py
View File

@@ -137,9 +137,9 @@ class TclCommandCncjob(TclCommandSignaled):
args["dia"] = args["dia"] if "dia" in args and args["dia"] else self.app.defaults["tools_mill_tooldia"]
args["z_cut"] = args["z_cut"] if "z_cut" in args and args["z_cut"] else self.app.defaults["geometry_cutz"]
args["z_cut"] = args["z_cut"] if "z_cut" in args and args["z_cut"] else self.app.defaults["tools_mill_cutz"]
args["z_move"] = args["z_move"] if "z_move" in args and args["z_move"] else \
self.app.defaults["geometry_travelz"]
self.app.defaults["tools_mill_travelz"]
args["pp"] = args["pp"] if "pp" in args and isinstance(args["pp"], str) else \
self.app.defaults["tools_mill_ppname_g"]
@@ -233,8 +233,6 @@ class TclCommandCncjob(TclCommandSignaled):
return "fail"
args.pop('name', None)
args.pop('las_power', None)
args.pop('las_min_pwr', None)
for arg in args:
if arg == "toolchange_xy" or arg == "spindlespeed" or arg == "startz":
@@ -250,10 +248,6 @@ class TclCommandCncjob(TclCommandSignaled):
else:
return "fail"
# HACK !!! Should be solved elsewhere!!!
# default option for multidepth is False
# obj.options['multidepth'] = False
if not obj.multigeo:
obj.generatecncjob(use_thread=False, plot=False, **args)
else:
@@ -286,7 +280,7 @@ class TclCommandCncjob(TclCommandSignaled):
local_tools_dict[tool_uid]['data']['tools_mill_spindlespeed'] = args["spindlespeed"]
local_tools_dict[tool_uid]['data']['tools_mill_dwell'] = args["dwell"]
local_tools_dict[tool_uid]['data']['tools_mill_dwelltime'] = args["dwelltime"]
local_tools_dict[tool_uid]['data']['tools_mill_min_power'] = args["las_min_pwr"]
local_tools_dict[tool_uid]['data']['tools_mill_min_power'] = args['las_min_pwr']
local_tools_dict[tool_uid]['data']['tools_mill_ppname_g'] = args["pp"]
self.app.milling_tool.mtool_gen_cncjob(