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

- fixed some possible issues due of changes in version 2.0 of Shapely

Browse Source 
- removed the import * statement from most of the app
This commit is contained in:
Marius Stanciu
2023-03-06 16:40:49 +02:00
parent 33de5314b1
commit 3b3c87e953
230 changed files with 1253 additions and 15935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
appPlugins/ToolSub.py
View File

@@ -5,7 +5,21 @@
# MIT Licence #
# ##########################################################
from appTool import *
from PyQt6 import QtWidgets, QtCore, QtGui
from appTool import AppTool
from appGUI.GUIElements import VerticalScrollArea, FCLabel, FCButton, FCFrame, GLay, FCComboBox, FCCheckBox
import logging
from copy import deepcopy
import time
import traceback
from shapely.geometry import LineString, Polygon, MultiPolygon, MultiLineString
from shapely.ops import unary_union
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
@@ -545,7 +559,7 @@ class ToolSub(AppTool):
self.sub_union = unary_union(self.sub_geo_obj.solid_geometry)
# start the QTimer to check for promises with 0.5 second period check
# start the QTimer to check for promises with 0.5 seconds period check
self.periodic_check(500, reset=True)
if self.target_geo_obj.multigeo:
@@ -582,7 +596,7 @@ class ToolSub(AppTool):
if new_geo and not new_geo.is_empty:
new_geometry.append(new_geo)
elif isinstance(geo_elem, MultiPolygon):
for poly in geo_elem:
for poly in geo_elem.geoms:
for ring in self.poly2rings(poly):
new_geo = ring.difference(self.sub_union)
if new_geo and not new_geo.is_empty:
@@ -593,7 +607,7 @@ class ToolSub(AppTool):
if not new_geo.is_empty:
new_geometry.append(new_geo)
elif isinstance(geo_elem, MultiLineString):
for line_elem in geo_elem:
for line_elem in geo_elem.geoms:
new_geo = line_elem.difference(self.sub_union)
if new_geo and not new_geo.is_empty:
new_geometry.append(new_geo)
@@ -609,7 +623,7 @@ class ToolSub(AppTool):
if new_geo and not new_geo.is_empty:
new_geometry.append(new_geo)
elif isinstance(geo, MultiLineString):
for line_elem in geo:
for line_elem in geo.geoms:
new_geo = line_elem.difference(self.sub_union)
if new_geo and not new_geo.is_empty:
new_geometry.append(new_geo)
@@ -625,7 +639,7 @@ class ToolSub(AppTool):
time.sleep(0.5)
while True:
# removal from list is done in a multithreaded way therefore not always the removal can be done
# removal from list is done in a multithreaded way therefore not always the removal can be done,
# so we keep trying until it's done
if tool not in self.promises:
break
@@ -682,7 +696,7 @@ class ToolSub(AppTool):
def periodic_check(self, check_period, reset=False):
"""
This function starts an QTimer and it will periodically check if intersections are done
This function starts an QTimer, and it will periodically check if intersections are done
:param check_period: time at which to check periodically
:param reset: will reset the timer