- cascaded_union() method will be deprecated in Shapely 1.8 in favor of unary_union; replaced the usage of cascaded_union with unary_union in all the app
This commit is contained in:
@@ -21,7 +21,7 @@ from appGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComb
|
||||
from appParsers.ParseFont import *
|
||||
|
||||
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon
|
||||
from shapely.ops import cascaded_union, unary_union, linemerge
|
||||
from shapely.ops import unary_union, linemerge
|
||||
import shapely.affinity as affinity
|
||||
from shapely.geometry.polygon import orient
|
||||
|
||||
@@ -3147,7 +3147,7 @@ class FCEraser(FCShapeTool):
|
||||
temp_shape = eraser_shape.buffer(0.0000001)
|
||||
temp_shape = Polygon(temp_shape.exterior)
|
||||
eraser_sel_shapes.append(temp_shape)
|
||||
eraser_sel_shapes = cascaded_union(eraser_sel_shapes)
|
||||
eraser_sel_shapes = unary_union(eraser_sel_shapes)
|
||||
|
||||
for obj_shape in self.storage.get_objects():
|
||||
try:
|
||||
@@ -5134,7 +5134,7 @@ class AppGeoEditor(QtCore.QObject):
|
||||
return
|
||||
|
||||
# add the result to the results list
|
||||
results.append(cascaded_union(local_results))
|
||||
results.append(unary_union(local_results))
|
||||
|
||||
# This is a dirty patch:
|
||||
for r in results:
|
||||
|
||||
@@ -9,7 +9,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets
|
||||
from PyQt5.QtCore import Qt, QSettings
|
||||
|
||||
from shapely.geometry import LineString, LinearRing, MultiLineString, Point, Polygon, MultiPolygon, box
|
||||
from shapely.ops import cascaded_union
|
||||
from shapely.ops import unary_union
|
||||
import shapely.affinity as affinity
|
||||
|
||||
from vispy.geometry import Rect
|
||||
@@ -2235,7 +2235,7 @@ class FCEraser(FCShapeTool):
|
||||
temp_shape = eraser_shape['solid'].buffer(0.0000001)
|
||||
temp_shape = Polygon(temp_shape.exterior)
|
||||
eraser_sel_shapes.append(temp_shape)
|
||||
eraser_sel_shapes = cascaded_union(eraser_sel_shapes)
|
||||
eraser_sel_shapes = unary_union(eraser_sel_shapes)
|
||||
|
||||
for storage in self.draw_app.storage_dict:
|
||||
try:
|
||||
@@ -4968,7 +4968,7 @@ class AppGerberEditor(QtCore.QObject):
|
||||
if 'solid' in actual_geo:
|
||||
edit_geo.append(actual_geo['solid'])
|
||||
|
||||
all_geo = cascaded_union(edit_geo)
|
||||
all_geo = unary_union(edit_geo)
|
||||
|
||||
# calculate the bounds values for the edited Gerber object
|
||||
xmin, ymin, xmax, ymax = all_geo.bounds
|
||||
|
||||
Reference in New Issue
Block a user