- fixed a Shapely deprecation warning in export_dxf() in GeometryObject class

This commit is contained in:
Marius Stanciu
2021-10-15 01:46:04 +03:00
committed by Marius
parent 02741cf37f
commit 156ffb23ed
2 changed files with 3 additions and 2 deletions

View File

@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
15.10.2021 15.10.2021
- added an ugly form of extra pad passes functionality in Isolation Plugin - does not take into consideration the milling direction - added an ugly form of extra pad passes functionality in Isolation Plugin - does not take into consideration the milling direction
- fixed a Shapely deprecation warning in export_dxf() in GeometryObject class
14.10.2021 14.10.2021

View File

@@ -551,7 +551,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def g2dxf(dxf_space, geo_obj): def g2dxf(dxf_space, geo_obj):
if isinstance(geo_obj, MultiPolygon): if isinstance(geo_obj, MultiPolygon):
for poly in geo_obj: for poly in geo_obj.geoms:
ext_points = list(poly.exterior.coords) ext_points = list(poly.exterior.coords)
dxf_space.add_lwpolyline(ext_points) dxf_space.add_lwpolyline(ext_points)
for interior in poly.interiors: for interior in poly.interiors:
@@ -562,7 +562,7 @@ class GeometryObject(FlatCAMObj, Geometry):
for interior in geo_obj.interiors: for interior in geo_obj.interiors:
dxf_space.add_lwpolyline(list(interior.coords)) dxf_space.add_lwpolyline(list(interior.coords))
if isinstance(geo_obj, MultiLineString): if isinstance(geo_obj, MultiLineString):
for line in geo_obj: for line in geo_obj.geoms:
dxf_space.add_lwpolyline(list(line.coords)) dxf_space.add_lwpolyline(list(line.coords))
if isinstance(geo_obj, LineString) or isinstance(geo_obj, LinearRing): if isinstance(geo_obj, LineString) or isinstance(geo_obj, LinearRing):
dxf_space.add_lwpolyline(list(geo_obj.coords)) dxf_space.add_lwpolyline(list(geo_obj.coords))