Remove unecessary LaserToolbar class architecture

laserstudio/instruments/laserdriver.py

@@ -1,4 +1,4 @@
-# Lazy import, LaserDriver is not supported yet.
+# Lazy import, LaserDriver is not pubicly supported yet.
 try:
     from laser_driver import LaserDriver  # type: ignore
 except Exception:

laserstudio/laserstudio.py

@@ -103,9 +103,9 @@ def __init__(self, config: Optional[dict]):
         # Laser toolbars
         for i, laser in enumerate(self.instruments.lasers):
             if isinstance(laser, PDMInstrument):
-                toolbar = PDMToolbar(self, i)
+                toolbar = PDMToolbar(laser, i)
             elif isinstance(laser, LaserDriverInstrument):
-                toolbar = LaserDriverToolbar(self, i)
+                toolbar = LaserDriverToolbar(laser, i)
             else:
                 continue
             self.addToolBar(Qt.ToolBarArea.RightToolBarArea, toolbar)

laserstudio/widgets/toolbars/__init__.py

@@ -1,6 +1,5 @@
 from .cameratoolbar import CameraToolbar
 from .cameranittoolbar import CameraNITToolBar
-from .lasertoolbar import LaserToolbar
 from .pdmtoolbar import PDMToolbar
 from .laserdrivertoolbar import LaserDriverToolbar
 from .maintoolbar import MainToolbar
@@ -17,7 +16,6 @@
     "CameraToolbar",
     "CameraNITToolBar",
     "PictureToolbar",
-    "LaserToolbar",
     "LaserDriverToolbar",
     "PDMToolbar",
 ]

laserstudio/widgets/toolbars/laserdrivertoolbar.py

@@ -2,32 +2,31 @@
     from laser_driver import LaserDriverPanel  # type: ignore
 except Exception:
     LaserDriverPanel = None
-from .lasertoolbar import LaserToolbar
 from ...instruments.laserdriver import LaserDriverInstrument
-from typing import TYPE_CHECKING
 from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QToolBar
 
-if TYPE_CHECKING:
-    from ...laserstudio import LaserStudio
 
-
-class LaserDriverToolbar(LaserToolbar):
-    def __init__(self, laser_studio: "LaserStudio", laser_num: int):
+class LaserDriverToolbar(QToolBar):
+    def __init__(self, laser: LaserDriverInstrument, laser_num: int):
         """
-        :param laser_studio: Main windows of laserstudio. Can be used for interacting with
-            other elements of the UI.
+        :param laser: Laser Driver instrument.
         :param laser_num: Laser equipment index.
         """
-        assert LaserDriverPanel is not None
-        assert laser_num < len(laser_studio.instruments.lasers)
-        self.laser = laser_studio.instruments.lasers[laser_num]
-        assert isinstance(self.laser, LaserDriverInstrument)
-        super().__init__(f"Laser {laser_num} (Donjon Driver)", laser_studio, laser_num)
-        super().setObjectName(f"toolbox-laser-donjon-{laser_num}")  # For settings save and restore
+        assert isinstance(laser, LaserDriverInstrument)
+        self.laser = laser
+        super().__init__(f"Laser {laser_num} (Donjon Driver)")
+        self.setObjectName(
+            f"toolbox-laser-donjon-{laser_num}"
+        )  # For settings save and restore
+
         self.setAllowedAreas(
             Qt.ToolBarArea.LeftToolBarArea | Qt.ToolBarArea.RightToolBarArea
         )
         self.setFloatable(True)
+
+        # Construct a UI Panel for the Laser Driver
+        assert LaserDriverPanel is not None
         panel = LaserDriverPanel(self.laser.laser)
         panel.refresh_interval_edit.setMinimum(1000)
         panel.refresh_interval_edit.setMaximum(5000)

laserstudio/widgets/toolbars/pdmtoolbar.py

@@ -11,31 +11,28 @@
 
 from laserstudio.instruments.pdm import PDMInstrument
 from ...utils.util import resource_path, colored_image
-from typing import TYPE_CHECKING
 from ..return_line_edit import ReturnDoubleSpinBox
-from .lasertoolbar import LaserToolbar
+from PyQt6.QtWidgets import QToolBar
 
-if TYPE_CHECKING:
-    from ...laserstudio import LaserStudio
 
-
-class PDMToolbar(LaserToolbar):
-    def __init__(self, laser_studio: "LaserStudio", laser_num: int):
+class PDMToolbar(QToolBar):
+    def __init__(self, laser: PDMInstrument, laser_num: int):
         """
-        :param laser_studio: Main windows of laserstudio. Can be used for interacting with
-            other elements of the UI.
+        :param laser: Alphanov PDM instrument.
         :param laser_num: Laser equipment index.
         """
-        assert laser_num < len(laser_studio.instruments.lasers)
-        self.laser = laser_studio.instruments.lasers[laser_num]
-        assert isinstance(self.laser, PDMInstrument)
-        super().__init__(f"Laser {laser_num} (PDM)", laser_studio, laser_num)
-        super().setObjectName(f"toolbox-laser-pdm-{laser_num}")  # For settings save and restore
+        assert isinstance(laser, PDMInstrument)
+        self.laser = laser
+        super().__init__(f"Laser {laser_num} (PDM)")
+        self.setObjectName(
+            f"toolbox-laser-pdm-{laser_num}"
+        )  # For settings save and restore
+
         self.setAllowedAreas(
             Qt.ToolBarArea.LeftToolBarArea | Qt.ToolBarArea.RightToolBarArea
         )
-
         self.setFloatable(True)
+
         w = QPushButton(self)
         w.setToolTip("On/Off Laser")
         w.setCheckable(True)