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

- fixed issue #313 where TclCommand drillcncjob is spitting errors in Tcl Shell which should be ignored

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-17 02:58:01 +03:00
committed by Marius
parent bd0c1da007
commit fe97364ba5
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tclCommands/TclCommandDrillcncjob.py
View File

@@ -92,13 +92,16 @@ class TclCommandDrillcncjob(TclCommandSignaled):
obj = self.app.collection.get_by_name(name)
if obj is None:
self.raise_tcl_error("Object not found: %s" % name)
if muted == 0:
self.raise_tcl_error("Object not found: %s" % name)
else:
return "fail"
if not isinstance(obj, FlatCAMExcellon):
if not muted:
if muted == 0:
self.raise_tcl_error('Expected FlatCAMExcellon, got %s %s.' % (name, type(obj)))
else:
return
return "fail"
xmin = obj.options['xmin']
ymin = obj.options['ymin']
@@ -136,11 +139,11 @@ class TclCommandDrillcncjob(TclCommandSignaled):
nr_diameters -= 1
if nr_diameters > 0:
if not muted:
if muted == 0:
self.raise_tcl_error("One or more tool diameters of the drills to be drilled passed to the "
"TclCommand are not actual tool diameters in the Excellon object.")
else:
return
return "fail"
# make a string of diameters separated by comma; this is what generate_from_excellon_by_tool() is
# expecting as tools parameter
@@ -156,7 +159,11 @@ class TclCommandDrillcncjob(TclCommandSignaled):
tools = 'all'
except Exception as e:
tools = 'all'
self.raise_tcl_error("Bad tools: %s" % str(e))
if muted == 0:
self.raise_tcl_error("Bad tools: %s" % str(e))
else:
return "fail"
drillz = args["drillz"] if "drillz" in args and args["drillz"] else obj.options["drillz"]
toolchangez = args["toolchangez"] if "toolchangez" in args and args["toolchangez"] else \