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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
tclCommands/TclCommandDrillcncjob.py
View File

@@ -148,7 +148,7 @@ class TclCommandDrillcncjob(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:
@@ -157,11 +157,11 @@ class TclCommandDrillcncjob(TclCommandSignaled):
tolerance = 0.0 if tolerance < 0.0 else tolerance
tolerance = 1.0 if tolerance > 1.0 else tolerance
if math.isclose(obj_dia_form, req_dia_form, rel_tol=tolerance):
req_tools.add(tool)
req_tools.add(str(tool))
nr_diameters -= 1
else:
if obj_dia_form == req_dia_form:
req_tools.add(tool)
req_tools.add(str(tool))
nr_diameters -= 1
if nr_diameters > 0:
@@ -176,8 +176,9 @@ class TclCommandDrillcncjob(TclCommandSignaled):
tools = ','.join(req_tools)
# no longer needed
del args['drilled_dias']
del args['diatol']
# del args['drilled_dias']
args.pop('drilled_dias', None)
args.pop('diatol', None)
# Split and put back. We are passing the whole dictionary later.
# args['milled_dias'] = [x.strip() for x in args['tools'].split(",")]

10
tclCommands/TclCommandMillDrills.py
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))