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

- fixed some minor errors in the new TclCommands: MillDrills and MillSlots

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-11 17:59:24 +03:00
parent dce347d9be
commit 90a8b44cdf
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FlatCAMApp.py
View File

@@ -1858,6 +1858,7 @@ class App(QtCore.QObject):
'endz', 'extracut', 'factor', 'False', 'false', 'feedrate', 'feedrate_rapid', 'endz', 'extracut', 'factor', 'False', 'false', 'feedrate', 'feedrate_rapid',
'filename', 'follow', 'gaps', 'gapsize', 'grid', 'gridoffset', 'gridoffsetx', 'filename', 'follow', 'gaps', 'gapsize', 'grid', 'gridoffset', 'gridoffsetx',
'gridoffsety', 'gridx', 'gridy', 'has_offset', 'holes', 'margin', 'method', 'gridoffsety', 'gridx', 'gridy', 'has_offset', 'holes', 'margin', 'method',
'milled_dias',
'minoffset', 'multidepth', 'name', 'offset', 'opt_type', 'order', 'outname', 'minoffset', 'multidepth', 'name', 'offset', 'opt_type', 'order', 'outname',
'overlap', 'passes', 'postamble', 'ppname_e', 'ppname_g', 'preamble', 'radius', 'ref', 'overlap', 'passes', 'postamble', 'ppname_e', 'ppname_g', 'preamble', 'radius', 'ref',
'rest', 'rows', 'scale_factor', 'spacing_columns', 'spacing_rows', 'spindlespeed', 'rest', 'rows', 'scale_factor', 'spacing_columns', 'spacing_rows', 'spindlespeed',

2
tclCommands/TclCommandMillDrills.py
View File

@@ -68,7 +68,7 @@ class TclCommandMillDrills(TclCommandSignaled):
try: try:
if 'milled_dias' in args and args['milled_dias'] != 'all': if 'milled_dias' in args and args['milled_dias'] != 'all':
diameters = [x.strip() for x in args['tools'].split(",")] diameters = [x.strip() for x in args['milled_dias'].split(",")]
req_tools = [] req_tools = []
for tool in obj.tools: for tool in obj.tools:
for req_dia in diameters: for req_dia in diameters:

2
tclCommands/TclCommandMillSlots.py
View File

@@ -68,7 +68,7 @@ class TclCommandMillSlots(TclCommandSignaled):
try: try:
if 'milled_dias' in args and args['milled_dias'] != 'all': if 'milled_dias' in args and args['milled_dias'] != 'all':
diameters = [x.strip() for x in args['tools'].split(",")] diameters = [x.strip() for x in args['milled_dias'].split(",")]
req_tools = [] req_tools = []
for tool in obj.tools: for tool in obj.tools:
for req_dia in diameters: for req_dia in diameters: