Merge pull request #7 from Ledger-Donjon/marker-clear-button

Added menu to clear markers

laserstudio/laserstudio.py

@@ -22,6 +22,7 @@
     StageToolbar,
     CameraToolbar,
     MainToolbar,
+    MarkersToolbar,
     PDMToolbar,
     LaserDriverToolbar,
     CameraNITToolBar,
@@ -81,6 +82,10 @@ def __init__(self, config: Optional[dict]):
         toolbar = ZoomToolbar(self)
         self.addToolBar(Qt.ToolBarArea.TopToolBarArea, toolbar)
 
+        # Toolbar: Markers
+        toolbar = MarkersToolbar(self.viewer)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, toolbar)
+
         # Toolbar: Stage positioning
         if self.instruments.stage is not None:
             toolbar = StageToolbar(self)

laserstudio/widgets/toolbars/__init__.py

@@ -4,11 +4,13 @@
 from .pdmtoolbar import PDMToolbar
 from .laserdrivertoolbar import LaserDriverToolbar
 from .maintoolbar import MainToolbar
+from .markerstoolbar import MarkersToolbar
 from .scantoolbar import ScanToolbar
 from .picturetoolbar import PictureToolbar
 from .stagetoolbar import StageToolbar
 from .zoomtoolbar import ZoomToolbar
 
+
 __all__ = [
     "MainToolbar",
     "ScanToolbar",
@@ -20,4 +22,5 @@
     "LaserToolbar",
     "LaserDriverToolbar",
     "PDMToolbar",
+    "MarkersToolbar",
 ]

laserstudio/widgets/toolbars/maintoolbar.py

@@ -11,12 +11,13 @@
 
 class MainToolbar(QToolBar):
     def __init__(self, laser_studio: "LaserStudio"):
+        """
+        :param viewer: Required for the menu to remove markers.
+        """
         super().__init__("Main", laser_studio)
         self.setObjectName("toolbar-main")  # For settings save and restore
         group = laser_studio.viewer_buttons_group
-        self.setAllowedAreas(
-            Qt.ToolBarArea.LeftToolBarArea | Qt.ToolBarArea.RightToolBarArea
-        )
+        self.setAllowedAreas(Qt.ToolBarArea.AllToolBarAreas)
         self.setFloatable(True)
 
         # Icon Logo

laserstudio/widgets/toolbars/markerstoolbar.py

@@ -0,0 +1,45 @@
+from typing import TYPE_CHECKING
+from PyQt6.QtCore import Qt, QSize
+from PyQt6.QtGui import QIcon
+from PyQt6.QtWidgets import QToolBar, QPushButton
+from ..return_line_edit import ReturnSpinBox
+from ...utils.util import colored_image
+from ..viewer import Viewer
+
+
+class MarkersToolbar(QToolBar):
+    def __init__(self, viewer: Viewer):
+        super().__init__("Markers")
+        self.setObjectName("toolbar-markers")  # For settings save and restore
+        self.setAllowedAreas(Qt.ToolBarArea.TopToolBarArea)
+        self.setFloatable(True)
+
+        # Add a marker
+        w = QPushButton(self)
+        w.setIcon(QIcon(colored_image(":/icons/location-pin-plus.svg")))
+        w.setIconSize(QSize(24, 24))
+        w.setToolTip("Add markers")
+        w.clicked.connect(lambda: viewer.add_marker())
+        self.addWidget(w)
+
+        # Clear all markers
+        w = QPushButton(self)
+        w.setIcon(QIcon(colored_image(":/icons/location-pin-clear.svg")))
+        w.setIconSize(QSize(24, 24))
+        w.setToolTip("Clear all markers")
+        w.clicked.connect(viewer.clear_markers)
+        self.addWidget(w)
+
+        # Markers' size
+        self.marker_size_sp = w = ReturnSpinBox()
+        self.marker_size_sp.setSuffix(" µm")
+        self.marker_size_sp.setToolTip("Markers' size")
+        self.marker_size_sp.setMinimum(1)
+        self.marker_size_sp.setSingleStep(10)
+        self.marker_size_sp.setMaximum(2000)
+        self.marker_size_sp.setValue(int(viewer.default_marker_size))
+        self.marker_size_sp.reset()
+        w.returnPressed.connect(
+            lambda: viewer.marker_size(float(self.marker_size_sp.value()))
+        )
+        self.addWidget(self.marker_size_sp)

laserstudio/widgets/toolbars/zoomtoolbar.py

@@ -4,7 +4,6 @@
 from PyQt6.QtWidgets import QToolBar, QPushButton
 from ...utils.util import colored_image
 from ..coloredbutton import ColoredPushButton
-from ..return_line_edit import ReturnSpinBox
 
 if TYPE_CHECKING:
     from ...laserstudio import LaserStudio
@@ -91,20 +90,6 @@ def __init__(self, laser_studio: "LaserStudio"):
         self.addWidget(self.position)
         self.position.setChecked(True)
 
-        # Markers' size
-        self.marker_size_sp = w = ReturnSpinBox()
-        self.marker_size_sp.setSuffix(" µm")
-        self.marker_size_sp.setToolTip("Markers' size")
-        self.marker_size_sp.setMinimum(1)
-        self.marker_size_sp.setSingleStep(10)
-        self.marker_size_sp.setMaximum(2000)
-        self.marker_size_sp.setValue(int(laser_studio.viewer.default_marker_size))
-        self.marker_size_sp.reset()
-        w.returnPressed.connect(
-            lambda: laser_studio.viewer.marker_size(float(self.marker_size_sp.value()))
-        )
-        self.addWidget(self.marker_size_sp)
-
     def activate_mouse_tracking(self, activate: bool):
         if not activate:
             self.position.setText("Cursor Position")

laserstudio/widgets/viewer.py

@@ -613,6 +613,12 @@ def add_marker(
         marker.update_tooltip()
         return marker
 
+    def clear_markers(self):
+        """Removes all markers."""
+        for marker in self.__markers:
+            self.__scene.removeItem(marker)
+        self.__markers.clear()
+
     @property
     def yaml(self) -> dict:
         """Export settings to a dict for yaml serialization."""