- applied the changes from Andre Spahlinger from PR's #332 and #334

This commit is contained in:
Marius Stanciu
2021-01-02 17:17:53 +02:00
committed by Marius Stanciu
parent f5751d3f59
commit 3995080503
4 changed files with 15 additions and 11 deletions

View File

@@ -104,7 +104,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,14 +126,14 @@ 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
del args['milled_dias']
del args['diatol']
except Exception as e:
self.raise_tcl_error("Bad tools: %s" % str(e))