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

- fixed some more Shapely 2.0 deprecation warnings

Browse Source 
- fixed a message bug in the AppMain
This commit is contained in:
Marius Stanciu
2021-12-08 23:11:23 +02:00
committed by Marius
parent 20587eaec8
commit 24caaedac0
6 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
appPlugins/ToolPanelize.py
View File

@@ -858,12 +858,20 @@ class Panelize(AppTool):
if panel_source_obj.multigeo is True:
for tool in panel_source_obj.tools:
try:
geo_len += len(panel_source_obj.tools[tool]['solid_geometry'])
work_geo = panel_source_obj.tools[tool]['solid_geometry']
geo_len += len(
work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString)) else
work_geo
)
except TypeError:
geo_len += 1
else:
try:
geo_len = len(panel_source_obj.solid_geometry)
work_geo = panel_source_obj.solid_geometry
geo_len = len(
work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString)) else
work_geo
)
except TypeError:
geo_len = 1
elif panel_source_obj.kind == 'gerber':
@@ -892,13 +900,20 @@ class Panelize(AppTool):
# calculate the number of polygons
try:
geo_len = len(panel_source_obj.tools[tool]['solid_geometry'])
work_geo = panel_source_obj.tools[tool]['solid_geometry']
geo_len = len(
work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString))
else work_geo
)
except TypeError:
geo_len = 1
# panelization
pol_nr = 0
for geo_el in panel_source_obj.tools[tool]['solid_geometry']:
work_geo = panel_source_obj.tools[tool]['solid_geometry']
i_wg = work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString)) \
else work_geo
for geo_el in i_wg:
trans_geo = translate_recursion(geo_el)
if not trans_geo.is_empty:
new_obj.tools[tool]['solid_geometry'].append(trans_geo)
@@ -920,14 +935,21 @@ class Panelize(AppTool):
# calculate the number of polygons
try:
geo_len = len(panel_source_obj.solid_geometry)
work_geo = panel_source_obj.solid_geometry
geo_len = len(
work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString))
else work_geo
)
except TypeError:
geo_len = 1
# panelization
pol_nr = 0
try:
for geo_el in panel_source_obj.solid_geometry:
work_geo = panel_source_obj.solid_geometry
i_wg = work_geo.geoms if isinstance(work_geo, (MultiPolygon, MultiLineString)) \
else work_geo
for geo_el in i_wg:
if app_obj.abort_flag:
# graceful abort requested by the user
raise grace
@@ -1178,7 +1200,7 @@ class PanelizeUI:
self.type_obj_combo.setItemIcon(2, QtGui.QIcon(self.app.resource_location + "/geometry16.png"))
grid0.addWidget(self.type_object_label, 2, 0)
grid0.addWidget( self.type_obj_combo, 2, 1)
grid0.addWidget(self.type_obj_combo, 2, 1)
# Object to be panelized
self.object_combo = FCComboBox()