giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Conflict resovle

This commit is contained in:
Jørn Sandvik Nilsson 2015-07-18 20:22:14 +02:00
parent c36af7b348 9a1e55e83f
commit 98e0e80b40
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FlatCAMApp.py
View File

@ -2058,7 +2058,8 @@ class App(QtCore.QObject):
'drillz': float,
'travelz': float,
'feedrate': float,
'spindlespeed': int
'spindlespeed': int,
'toolchange': int
}
for key in kwa:
@ -2090,7 +2091,8 @@ class App(QtCore.QObject):
job_obj.z_move = kwa["travelz"]
job_obj.feedrate = kwa["feedrate"]
job_obj.spindlespeed = kwa["spindlespeed"] if "spindlespeed" in kwa else None
job_obj.generate_from_excellon_by_tool(obj, kwa["tools"], True)
toolchange = True if "toolchange" in kwa and kwa["toolchange"] == 1 else False
job_obj.generate_from_excellon_by_tool(obj, kwa["tools"], toolchange)
job_obj.gcode_parse()
@ -2434,14 +2436,15 @@ class App(QtCore.QObject):
'drillcncjob': {
'fcn': drillcncjob,
'help': "Drill CNC job.\n" +
"> drillcncjob <name> -tools <str> -drillz <float> -travelz <float> -feedrate <float> -outname <str> [-spindlespeed (int)]\n" +
"> drillcncjob <name> -tools <str> -drillz <float> -travelz <float> -feedrate <float> -outname <str> [-spindlespeed (int)] [-toolchange (int)] \n" +
" name: Name of the object\n" +
" tools: Comma separated indexes of tools (example: 1,3 or 2)\n" +
" drillz: Drill depth into material (example: -2.0)\n" +
" travelz: Travel distance above material (example: 2.0)\n" +
" feedrate: Drilling feed rate\n" +
" outname: Name of object to create\n" +
" spindlespeed: Speed of the spindle in rpm (example: 4000)\n"
" spindlespeed: Speed of the spindle in rpm (example: 4000)\n" +
" toolchange: Enable tool changes (example: 1)\n"
},
'scale': {
'fcn': lambda name, factor: self.collection.get_by_name(str(name)).scale(float(factor)),