diff --git a/CHANGELOG.md b/CHANGELOG.md index ad31f61b..1693b215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta - made sure that for laser preprocessors, the laser is always turned off completely at the end of a job - added a new script example - improved the quit application process; now the `quit_flatcam` Tcl command works properly +- another fix for Shapely 2.0 deprecation warning 30.01.2022 diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index 2a88ec7a..85091cd7 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -591,14 +591,17 @@ class GeometryObject(FlatCAMObj, Geometry): if isinstance(geo_obj, LineString) or isinstance(geo_obj, LinearRing): dxf_space.add_lwpolyline(list(geo_obj.coords)) - multigeo_solid_geometry = [] + multigeo_solid = [] if self.multigeo: for tool in self.tools: - multigeo_solid_geometry += self.tools[tool]['solid_geometry'] + multigeo_solid += self.tools[tool]['solid_geometry'] else: - multigeo_solid_geometry = self.solid_geometry + multigeo_solid = self.solid_geometry - for geo in multigeo_solid_geometry: + + w_geo = multigeo_solid.geoms \ + if isinstance(multigeo_solid, (MultiPolygon, MultiLineString)) else multigeo_solid + for geo in w_geo: if type(geo) == list: for g in geo: g2dxf(msp, g) diff --git a/app_Main.py b/app_Main.py index 47aa0560..aa484c3b 100644 --- a/app_Main.py +++ b/app_Main.py @@ -474,10 +474,10 @@ class App(QtCore.QObject): # Folder for user settings. if sys.platform == 'win32': - if platform.architecture()[0] == '32bit': - self.log.debug("Win32!") - else: - self.log.debug("Win64!") + # if platform.architecture()[0] == '32bit': + # self.log.debug("Win32!") + # else: + # self.log.debug("Win64!") # ####################################################################################################### # ####### CONFIG FILE WITH PARAMETERS REGARDING PORTABILITY #############################################