From 538f94998304dbb8ebb68f7288e94c9a6cd27dd8 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 19 Nov 2021 20:27:47 +0200 Subject: [PATCH] - solved some Shapely 2.0 deprecation warnings in the Geometry object --- appObjects/FlatCAMGeometry.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index e5573de9..508ea671 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -1255,7 +1255,9 @@ class GeometryObject(FlatCAMObj, Geometry): # variables to display the percentage of work done self.geo_len = 0 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: self.geo_len = 1 self.old_disp_number = 0 @@ -1266,7 +1268,9 @@ class GeometryObject(FlatCAMObj, Geometry): # variables to display the percentage of work done self.geo_len = 0 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: self.geo_len = 1