diff --git a/laserstudio/widgets/marker.py b/laserstudio/widgets/marker.py index 7d107b7..fa6a1da 100644 --- a/laserstudio/widgets/marker.py +++ b/laserstudio/widgets/marker.py @@ -95,7 +95,7 @@ def color(self, value: Union[QColor, Qt.GlobalColor, int]): def qfillcolor(self) -> QColor: """:return: Current fill color, as QColor.""" return QColor(self.__fillcolor) - + @property def fillcolor(self): """:return: Current fill color, as QColor.""" @@ -138,8 +138,8 @@ def update_pos(self): else: self.setVisible(False) - def setToolTip(self, value: str): - self.__ellipse.setToolTip(value) + def setToolTip(self, toolTip: Optional[str]): + self.__ellipse.setToolTip(toolTip) class IdMarker(Marker): diff --git a/laserstudio/widgets/scangeometry.py b/laserstudio/widgets/scangeometry.py index 55a6094..b290343 100644 --- a/laserstudio/widgets/scangeometry.py +++ b/laserstudio/widgets/scangeometry.py @@ -74,9 +74,14 @@ def __update(self): ) else: for poly in self.__scan_geometry.geoms: - self.__scan_zones_group.addToGroup( - ScanGeometry.__poly_to_path_item(poly) - ) + if isinstance(poly, Polygon): + self.__scan_zones_group.addToGroup( + ScanGeometry.__poly_to_path_item(poly) + ) + else: + logging.getLogger("laserstudio").error( + "Unsupported geometry type in scan geometry." + ) self.addToGroup(self.__scan_zones_group) # Also, update the scan path with the new geometry @@ -146,7 +151,7 @@ def density(self, value: int): @staticmethod def shapely_to_yaml( - geometry: Union[Polygon, MultiPolygon, GeometryCollection] + geometry: Union[Polygon, MultiPolygon, GeometryCollection], ) -> dict: """ :return: A dict for YAML serialization. diff --git a/laserstudio/widgets/toolbars/markerstoolbar.py b/laserstudio/widgets/toolbars/markerstoolbar.py index 180eabe..e95fe7f 100644 --- a/laserstudio/widgets/toolbars/markerstoolbar.py +++ b/laserstudio/widgets/toolbars/markerstoolbar.py @@ -1,6 +1,6 @@ from PyQt6.QtCore import Qt, QSize from PyQt6.QtGui import QIcon -from PyQt6.QtWidgets import QToolBar, QPushButton, QMainWindow +from PyQt6.QtWidgets import QToolBar, QPushButton from ..return_line_edit import ReturnSpinBox from ...utils.util import colored_image from ..viewer import Viewer