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

- fixed issue in the isolation function, if the isolation can't be done there will be generated no Geometry object

Browse Source
This commit is contained in:
Marius Stanciu
2019-08-06 03:29:43 +03:00
parent 59b4defa0b
commit 5a141ad115
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
FlatCAMObj.py
View File

@@ -876,17 +876,19 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
if invert:
try:
if type(geom) is MultiPolygon:
if type(geom) is MultiPolygon or type(geom) is list:
pl = []
for p in geom:
pl.append(Polygon(p.exterior.coords[::-1], p.interiors))
if p is not None:
pl.append(Polygon(p.exterior.coords[::-1], p.interiors))
geom = MultiPolygon(pl)
elif type(geom) is Polygon:
elif type(geom) is Polygon and geom is not None:
geom = Polygon(geom.exterior.coords[::-1], geom.interiors)
else:
log.debug("FlatCAMGerber.isolate().generate_envelope() Error --> Unexpected Geometry")
except Exception as e:
log.debug("FlatCAMGerber.isolate().generate_envelope() Error --> %s" % str(e))
return 'fail'
return geom
if float(self.options["isotooldia"]) < 0:
@@ -914,6 +916,9 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
geom = generate_envelope(iso_offset, 1, envelope_iso_type=self.iso_type, follow=follow)
else:
geom = generate_envelope(iso_offset, 0, envelope_iso_type=self.iso_type, follow=follow)
if geom == 'fail':
# app_obj.inform.emit(_("[ERROR_NOTCL] Isolation geometry could not be generated."))
return 'fail'
geo_obj.solid_geometry.append(geom)
# store here the default data for Geometry Data
@@ -1006,11 +1011,14 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
# if milling type is climb then the move is counter-clockwise around features
if milling_type == 'cl':
# geo_obj.solid_geometry = generate_envelope(offset, i == 0)
geo_obj.solid_geometry = generate_envelope(offset, 1, envelope_iso_type=self.iso_type,
follow=follow)
geom = generate_envelope(offset, 1, envelope_iso_type=self.iso_type, follow=follow)
else:
geo_obj.solid_geometry = generate_envelope(offset, 0, envelope_iso_type=self.iso_type,
follow=follow)
geom = generate_envelope(offset, 0, envelope_iso_type=self.iso_type, follow=follow)
if geom == 'fail':
# app_obj.inform.emit(_("[ERROR_NOTCL] Isolation geometry could not be generated."))
return 'fail'
geo_obj.solid_geometry = geom
# detect if solid_geometry is empty and this require list flattening which is "heavy"
# or just looking in the lists (they are one level depth) and if any is not empty