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

Replicating fixes from TclCommandMillDrills. 

TclCommandMillSlots was clearly based upon TclCommandMillDrills,
and several fixes have been received over the last year for
TclCommandMillDrills that are also necessary for this command.

See these commits for the fixes applied here:

- 0488337672
- 980339e917
- 40f5bf9c12
This commit is contained in:
Adam Coddington 2021-02-23 13:44:55 -08:00
parent bd40265bf4
commit 8f22fe7e5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tclCommands/TclCommandMillSlots.py
View File

@ -93,9 +93,9 @@ class TclCommandMillSlots(TclCommandSignaled):
else: else:
args['use_thread'] = False args['use_thread'] = False
if not obj.slots: # if not obj.slots:
self.raise_tcl_error("The Excellon object has no slots: %s" % name) # self.raise_tcl_error("The Excellon object has no slots: %s" % name)
#
# units = self.app.defaults['units'].upper() # units = self.app.defaults['units'].upper()
try: try:
if 'milled_dias' in args and args['milled_dias'] != 'all': if 'milled_dias' in args and args['milled_dias'] != 'all':
@ -105,7 +105,7 @@ class TclCommandMillSlots(TclCommandSignaled):
req_tools = set() req_tools = set()
for tool in obj.tools: for tool in obj.tools:
for req_dia in diameters: 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))) req_dia_form = float('%.*f' % (obj.decimals, float(req_dia)))
if 'diatol' in args: if 'diatol' in args:
@ -128,8 +128,8 @@ class TclCommandMillSlots(TclCommandSignaled):
args['tools'] = req_tools args['tools'] = req_tools
# no longer needed # no longer needed
del args['milled_dias'] args.pop('milled_dias', None)
del args['diatol'] args.pop('diatol', None)
# Split and put back. We are passing the whole dictionary later. # Split and put back. We are passing the whole dictionary later.
# args['milled_dias'] = [x.strip() for x in args['tools'].split(",")] # args['milled_dias'] = [x.strip() for x in args['tools'].split(",")]