- fixed bug that allowed empty tool in the tools generated in Geometry object

- fixed bug in Tool Cutout that did not allow the transfer of used cutout tool diameter to the cutout geometry object
This commit is contained in:
Marius Stanciu
2019-07-08 20:06:41 +03:00
parent 5e401fd9f7
commit 769f92147a
5 changed files with 15 additions and 5 deletions

View File

@@ -16,7 +16,7 @@ class Paste_1(FlatCAMPostProc_Tools):
def start_code(self, p):
units = ' ' + str(p['units']).lower()
coords_xy = [float(eval(a)) for a in p['xy_toolchange'].split(",")]
coords_xy = [float(eval(a)) for a in p['xy_toolchange'].split(",") if a != '']
gcode = ''
@@ -68,7 +68,7 @@ class Paste_1(FlatCAMPostProc_Tools):
def toolchange_code(self, p):
z_toolchange = float(p['z_toolchange'])
toolchangexy = [float(eval(a)) for a in p['xy_toolchange'].split(",")]
toolchangexy = [float(eval(a)) for a in p['xy_toolchange'].split(",") if a != '']
gcode = ''
if toolchangexy is not None:
@@ -119,7 +119,7 @@ M0
return ('G01 ' + self.position_code(p)).format(**p)
def end_code(self, p):
coords_xy = [float(eval(a)) for a in p['xy_toolchange'].split(",")]
coords_xy = [float(eval(a)) for a in p['xy_toolchange'].split(",") if a != '']
gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, float(p['z_toolchange'])) + "\n")
if coords_xy is not None: