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
This commit is contained in:
Marius Stanciu
2021-10-28 22:30:33 +03:00
committed by Marius
parent 4ed8512cac
commit f9dde40eec
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
- fixed error that did not allowed printing from the TextEditor - fixed error that did not allowed printing from the TextEditor
- added an error message when the File -> Print to PDF functionality is not working due of missing a root element in the SVG step - added an error message when the File -> Print to PDF functionality is not working due of missing a root element in the SVG step
- fixed printing a CNCJob object with File -> Print(PDF) functionality by adding a root element if both travels and cuts are present - fixed printing a CNCJob object with File -> Print(PDF) functionality by adding a root element if both travels and cuts are present
- fixed some more Shapely 2.0 deprecation warnings
27.10.2021 27.10.2021

6
camlib.py
View File

@@ -1831,7 +1831,8 @@ class Geometry(object):
# Add lines to storage # Add lines to storage
try: try:
for line in lines_trimmed: lines_t_geo = lines_trimmed.geoms if isinstance(lines_trimmed, MultiLineString) else lines_trimmed
for line in lines_t_geo:
if isinstance(line, LineString) or isinstance(line, LinearRing): if isinstance(line, LineString) or isinstance(line, LinearRing):
if not line.is_empty: if not line.is_empty:
geoms.insert(line) geoms.insert(line)
@@ -1845,7 +1846,8 @@ class Geometry(object):
# Add margin (contour) to storage # Add margin (contour) to storage
if contour: if contour:
try: try:
for poly in margin_poly: margin_poly_geo = margin_poly.geoms if isinstance(margin_poly, MultiPolygon) else margin_poly
for poly in margin_poly_geo:
if isinstance(poly, Polygon) and not poly.is_empty: if isinstance(poly, Polygon) and not poly.is_empty:
geoms.insert(poly.exterior) geoms.insert(poly.exterior)
if prog_plot: if prog_plot: