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

Fixes in millcncjob command and progress towards #218.

Browse Source
This commit is contained in:
Juan Pablo Caram
2016-11-01 00:53:47 -04:00
parent fb6e1135e9
commit 546d2aacf0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tclCommands/TclCommandDrillcncjob.py
View File

@@ -68,12 +68,16 @@ class TclCommandDrillcncjob(TclCommand.TclCommandSignaled):
self.raise_tcl_error('Expected FlatCAMExcellon, got %s %s.' % (name, type(obj))) self.raise_tcl_error('Expected FlatCAMExcellon, got %s %s.' % (name, type(obj)))
def job_init(job_obj, app): def job_init(job_obj, app):
job_obj.z_cut = args["drillz"] job_obj.z_cut = args["drillz"] if "drillz" in args else obj.options["drillz"]
job_obj.z_move = args["travelz"] job_obj.z_move = args["travelz"] if "travelz" in args else obj.options["travelz"]
job_obj.feedrate = args["feedrate"] job_obj.feedrate = args["feedrate"] if "feedrate" in args else obj.options["feedrate"]
job_obj.spindlespeed = args["spindlespeed"] if "spindlespeed" in args else None job_obj.spindlespeed = args["spindlespeed"] if "spindlespeed" in args else None
toolchange = True if "toolchange" in args and args["toolchange"] == 1 else False toolchange = True if "toolchange" in args and args["toolchange"] == 1 else False
tools = args["tools"] if "tools" in args else 'all' tools = args["tools"] if "tools" in args else 'all'
job_obj.generate_from_excellon_by_tool(obj, tools, toolchange) job_obj.generate_from_excellon_by_tool(obj, tools, toolchange)
job_obj.gcode_parse() job_obj.gcode_parse()
job_obj.create_geometry() job_obj.create_geometry()