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

Merged in FixTlxCommandMillDrills (pull request #332) 

Fix for TclCommandMillDrills
This commit is contained in:
Andre Spahlinger 2021-01-02 15:10:48 +00:00 committed by Marius Stanciu
parent 1902575b93 c7ed8914de
commit 80311ecb8a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tclCommands/TclCommandMillDrills.py
View File

@ -22,7 +22,8 @@ class TclCommandMillDrills(TclCommandSignaled):
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['milldrills', 'milld']
description = '%s %s' % ("--", "Create a Geometry Object for milling drill holes from Excellon.")
description = '%s %s' % (
"--", "Create a Geometry Object for milling drill holes from Excellon.")
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
@ -104,7 +105,7 @@ class TclCommandMillDrills(TclCommandSignaled):
req_tools = set()
for tool in obj.tools:
for req_dia in diameters:
obj_dia_form = float('%.*f' % (obj.decimals, float(obj.tools[tool]["C"])))
obj_dia_form = float('%.*f' % (obj.decimals, float(obj.tools[tool]["tooldia"])))
req_dia_form = float('%.*f' % (obj.decimals, float(req_dia)))
if 'diatol' in args:
@ -126,19 +127,19 @@ class TclCommandMillDrills(TclCommandSignaled):
args['tools'] = req_tools
# no longer needed
del args['milled_dias']
del args['diatol']
# Split and put back. We are passing the whole dictionary later.
# args['milled_dias'] = [x.strip() for x in args['tools'].split(",")]
else:
args['tools'] = 'all'
# no longer needed, delete from dict if in keys
args.pop('milled_dias', None)
args.pop('diatol', None)
except Exception as e:
self.raise_tcl_error("Bad tools: %s" % str(e))
if obj.kind != 'excellon':
self.raise_tcl_error('Only Excellon objects can be mill-drilled, got %s %s.' % (name, type(obj)))
self.raise_tcl_error(
'Only Excellon objects can be mill-drilled, got %s %s.' % (name, type(obj)))
if self.app.collection.has_promises():
self.raise_tcl_error('!!!Promises exists, but should not here!!!')