From 205e6a4ae00b4a3200a6295d22b786e9024de905 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 15 Oct 2021 01:51:50 +0300 Subject: [PATCH] - in Geo Editor fixed another Shapely deprecation warning in flatten() method --- CHANGELOG.md | 1 + appEditors/AppGeoEditor.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c60e90f9..d79338dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta - 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 +- in Geo Editor fixed another Shapely deprecation warning in flatten() method 14.10.2021 diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index c075d746..a7fda20f 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -6021,7 +6021,12 @@ class AppGeoEditor(QtCore.QObject): # ## If iterable, expand recursively. try: - for geo in geometry: + if isinstance(geometry, (MultiPolygon, MultiLineString)): + work_geo = geometry.geoms + else: + work_geo = geometry + + for geo in work_geo: if geo is not None: self.flatten(geometry=geo, orient_val=orient_val,