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

- solved some Shapely 2.0 deprecation warnings in the Geometry object

Browse Source
This commit is contained in:
Marius Stanciu
2021-11-19 20:27:47 +02:00
committed by Marius
parent 1ed9714d92
commit 538f949983
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appObjects/FlatCAMGeometry.py
View File

@@ -1255,7 +1255,9 @@ class GeometryObject(FlatCAMObj, Geometry):
# variables to display the percentage of work done # variables to display the percentage of work done
self.geo_len = 0 self.geo_len = 0
try: try:
self.geo_len = len(self.tools[tool]['solid_geometry']) source_geo = self.tools[tool]['solid_geometry']
work_geo = source_geo.geoms if isinstance(source_geo, MultiPolygon) else source_geo
self.geo_len = len(work_geo)
except TypeError: except TypeError:
self.geo_len = 1 self.geo_len = 1
self.old_disp_number = 0 self.old_disp_number = 0
@@ -1266,7 +1268,9 @@ class GeometryObject(FlatCAMObj, Geometry):
# variables to display the percentage of work done # variables to display the percentage of work done
self.geo_len = 0 self.geo_len = 0
try: try:
self.geo_len = len(self.solid_geometry) source_geo = self.solid_geometry
work_geo = source_geo.geoms if isinstance(source_geo, MultiPolygon) else source_geo
self.geo_len = len(work_geo)
except TypeError: except TypeError:
self.geo_len = 1 self.geo_len = 1