- fixed recent issues introduced in Tcl command Drillcncjob

- updated the Cncjob to use the 'endxy' parameter which dictates the x,y position at the end of the job
- now the Tcl commands Drillcncjob and Cncjob can use the toolchangexy and endxy parameters with or without parenthesis (but no spaces allowed)
This commit is contained in:
Marius Stanciu
2020-05-12 13:59:11 +03:00
committed by Marius
parent 4a82224883
commit 6aacd4d978
5 changed files with 76 additions and 20 deletions

View File

@@ -2676,7 +2676,7 @@ class CNCjob(Geometry):
if self.xy_toolchange and self.xy_toolchange != '':
self.xy_toolchange = [float(eval(a)) for a in self.xy_toolchange.split(",")]
if self.xy_toolchange and len(self.xy_toolchange) < 2:
if self.xy_toolchange and len(self.xy_toolchange) != 2:
self.app.inform.emit('[ERROR]%s' %
_("The Toolchange X,Y field in Edit -> Preferences has to be "
"in the format (x, y) \nbut now there is only one value, not two. "))