- brought up-to-date and fixed the Tcl Command Drillcncjob and Cncjob

- fixed Tcl command Isolate to not print messages on message bar in case it is run headless
- fixed Tcl command Copper Clear (NCC)
- fixed Tcl command Paint
This commit is contained in:
Marius Stanciu
2020-10-28 13:15:38 +02:00
committed by Marius
parent 7ca44fa107
commit 9c97ce49b9
10 changed files with 70 additions and 47 deletions

View File

@@ -3596,6 +3596,7 @@ class CNCjob(Geometry):
for k, v in list(self.options.items()):
default_data[k] = deepcopy(v)
# it[1] is the tool diameter
self.exc_cnc_tools[it[1]] = {}
self.exc_cnc_tools[it[1]]['tool'] = it[0]
self.exc_cnc_tools[it[1]]['nr_drills'] = drill_no
@@ -6349,10 +6350,11 @@ class CNCjob(Geometry):
# Current path: temporary storage until tool is
# lifted or lowered.
if self.toolchange_xy_type == "excellon":
if self.app.defaults["excellon_toolchangexy"] == '' or self.app.defaults["excellon_toolchangexy"] is None:
if self.app.defaults["tools_drill_toolchangexy"] == '' or \
self.app.defaults["tools_drill_toolchangexy"] is None:
pos_xy = (0, 0)
else:
pos_xy = self.app.defaults["excellon_toolchangexy"]
pos_xy = self.app.defaults["tools_drill_toolchangexy"]
try:
pos_xy = [float(eval(a)) for a in pos_xy.split(",")]
except Exception: