- fixed bug in ToolCutout where creating a cutout object geometry from another external isolation geometry failed

- fixed bug in cncjob TclCommand where the gcode could not be correctly generated due of missing bounds params in obj.options dict
- fixed a hardcoded tolerance in FlatCAMGeometry.generatecncjob() and in FlatCAMGeometry.mtool_gen_cncjob() to use the parameter from Preferences
This commit is contained in:
Marius Stanciu
2019-06-07 23:14:00 +03:00
parent 2974389404
commit a5ffe475dd
5 changed files with 39 additions and 10 deletions

View File

@@ -424,7 +424,8 @@ class CutOut(FlatCAMTool):
geo = (geo.buffer(margin + abs(dia / 2))).exterior
# Get min and max data for each object as we just cut rectangles across X or Y
xmin, ymin, xmax, ymax = geo.bounds
xmin, ymin, xmax, ymax = recursive_bounds(geo)
px = 0.5 * (xmin + xmax) + margin
py = 0.5 * (ymin + ymax) + margin
lenx = (xmax - xmin) + (margin * 2)
@@ -475,6 +476,11 @@ class CutOut(FlatCAMTool):
solid_geo.append(geo)
geo_obj.solid_geometry = deepcopy(solid_geo)
xmin, ymin, xmax, ymax = recursive_bounds(geo_obj.solid_geometry)
geo_obj.options['xmin'] = xmin
geo_obj.options['ymin'] = ymin
geo_obj.options['xmax'] = xmax
geo_obj.options['ymax'] = ymax
outname = cutout_obj.options["name"] + "_cutout"
self.app.new_object('geometry', outname, geo_init)