bec-widgets 0.82.0__py3-none-any.whl → 0.82.2__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGELOG
 
+## v0.82.2 (2024-07-08)
+
+### Fix
+
+* fix(rpc_server): pass cli config to server ([`90178e2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/90178e2f61fa9dac7d82c0d0db40a9767bb133e6))
+
+## v0.82.1 (2024-07-07)
+
+### Fix
+
+* fix(motor_map): bug where motors without limits were selected ([`c78cd89`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c78cd898f203f950d7cb589eb5609feaa88062cf))
+
+### Refactor
+
+* refactor(setting_dialog): moved to qt_utils ([`3826bb3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3826bb3d9e870e85709b5b20ef09a4d22641280c))
+
+* refactor(toolbar): toolbar moved from widgets to qt_utils ([`7ffc06f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7ffc06f3c7ddd86a1681408a75221b9bbadb236b))
+
+### Test
+
+* test(setting_dialog): tests added ([`74a249b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/74a249bd065d01006cb532bfff2a9bfedb34b592))
+
+### Unknown
+
+* tests(motor_map_widget): tests added ([`734f4c7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/734f4c77507a1edafd477d81b5f7401d8e759be2))
+
+* feat(settings_dialog):apply button ([`2020953`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2020953b933b6fcad61ecc770588d39518c26fdd))
+
 ## v0.82.0 (2024-07-07)
 
 ### Feature
@@ -110,12 +138,6 @@
 
 ## v0.77.0 (2024-07-02)
 
-### Feature
-
-* feat(bec_connector): export config to yaml ([`a391f30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a391f3018c50fee6a4a06884491b957df80c3cd3))
-
-* feat(utils): colors added convertor for rgba to hex ([`572f2fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/572f2fb8110d5cb0e80f3ca45ce57ef405572456))
-
 ### Fix
 
 * fix(waveform): scatter 2D brush error ([`215d59c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/215d59c8bfe7fda9aff8cec8353bef9e1ce2eca1))
@@ -123,17 +145,3 @@
 * fix(figure): API cleanup ([`008a33a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/008a33a9b192473cc58e90cd6d98c5bcb5f7b8c0))
 
 * fix(figure): if/else logic corrected in subplot_factory ([`3e78723`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3e787234c7274b0698423d7bf9a4c54ec46bad5f))
-
-* fix(image): processing of already displayed data; closes #106 ([`1173510`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1173510105d2d70d7e498c2ac1e122cea3a16597))
-
-* fix(bec_figure): full reconstruction with config from other bec figure ([`b6e1e20`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b6e1e20b7c8549bb092e981062329e601411dda6))
-
-* fix(motor_map): API changes updates current visualisation; motor_map can be initialised from config ([`2e2d422`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2e2d422910685a2527a3d961a468c787f771ca44))
-
-* fix(image): image add_custom_image fixed, closes #225 ([`f0556e4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0556e44113ffee66cf735aa2dd758c62cb634f4))
-
-* fix(figure): subplot methods consolidated; added subplot factory ([`4a97105`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a97105e4bd2ce77d72dfe5f8307dd9ee65b21b0))
-
-* fix(image): image can be fully reconstructed from config ([`797f73c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/797f73c39aa73e07d6311f3de4baea53f6c380e0))
-
-* fix(image_item): vrange added int for pydantic model check ([`b8f796f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8f796fd3fcc15641e8fc6a3ca75c344ce90fc45))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.82.0
+Version: 0.82.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

bec_widgets/cli/client_utils.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import importlib
 import importlib.metadata as imd
+import json
 import os
 import select
 import subprocess
@@ -87,7 +88,7 @@ def _get_output(process, logger) -> None:
         print(f"Error reading process output: {str(e)}")
 
 
-def _start_plot_process(gui_id, gui_class, config, logger=None) -> None:
+def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger=None) -> None:
     """
     Start the plot in a new process.
 
@@ -98,6 +99,8 @@ def _start_plot_process(gui_id, gui_class, config, logger=None) -> None:
     # pylint: disable=subprocess-run-check
     command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__]
     if config:
+        if isinstance(config, dict):
+            config = json.dumps(config)
         command.extend(["--config", config])
 
     env_dict = os.environ.copy()
@@ -190,7 +193,7 @@ class BECGuiClientMixin:
         if self._process is None or self._process.poll() is not None:
             self._start_update_script()
             self._process, self._process_output_processing_thread = _start_plot_process(
-                self._gui_id, self.__class__, self._client._service_config.config_path
+                self._gui_id, self.__class__, self._client._service_config.config
             )
         while not self.gui_is_alive():
             print("Waiting for GUI to start...")

bec_widgets/cli/server.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import inspect
+import json
 import signal
 import sys
 from contextlib import redirect_stderr, redirect_stdout
@@ -141,10 +142,30 @@ class SimpleFileLikeFromLogOutputFunc:
         return
 
 
+def _start_server(gui_id: str, gui_class: Union[BECFigure, BECDockArea], config: str | None = None):
+    if config:
+        try:
+            config = json.loads(config)
+            service_config = ServiceConfig(config=config)
+        except (json.JSONDecodeError, TypeError):
+            service_config = ServiceConfig(config_path=config)
+    else:
+        # if no config is provided, use the default config
+        service_config = ServiceConfig()
+
+    bec_logger.configure(
+        service_config.redis,
+        QtRedisConnector,
+        service_name="BECWidgetsCLIServer",
+        service_config=service_config.service_config,
+    )
+    server = BECWidgetsCLIServer(gui_id=gui_id, config=service_config, gui_class=gui_class)
+    return server
+
+
 def main():
     import argparse
     import os
-    import sys
 
     from qtpy.QtCore import QSize
     from qtpy.QtGui import QIcon
@@ -159,7 +180,7 @@ def main():
         type=str,
         help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
     )
-    parser.add_argument("--config", type=str, help="Config file")
+    parser.add_argument("--config", type=str, help="Config file or config string.")
 
     args = parser.parse_args()
 
@@ -188,14 +209,7 @@ def main():
             win = QMainWindow()
             win.setWindowTitle("BEC Widgets")
 
-            service_config = ServiceConfig(args.config)
-            bec_logger.configure(
-                service_config.redis,
-                QtRedisConnector,
-                service_name="BECWidgetsCLIServer",
-                service_config=service_config.service_config,
-            )
-            server = BECWidgetsCLIServer(gui_id=args.id, config=service_config, gui_class=gui_class)
+            server = _start_server(args.id, gui_class, args.config)
 
             gui = server.gui
             win.setCentralWidget(gui)

bec_widgets/qt_utils/settings_dialog.py

@@ -0,0 +1,107 @@
+from qtpy.QtCore import Slot
+from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
+
+
+class SettingWidget(QWidget):
+    """
+    Abstract class for a settings widget to enforce the implementation of the accept_changes and display_current_settings.
+    Can be used for toolbar actions to display the settings of a widget.
+
+    Args:
+        target_widget (QWidget): The widget that the settings will be taken from and applied to.
+    """
+
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+
+        self.target_widget = None
+
+    def set_target_widget(self, target_widget: QWidget):
+        self.target_widget = target_widget
+
+    @Slot()
+    def accept_changes(self):
+        """
+        Accepts the changes made in the settings widget and applies them to the target widget.
+        """
+        pass
+
+    @Slot(dict)
+    def display_current_settings(self, config_dict: dict):
+        """
+        Displays the current settings of the target widget in the settings widget.
+
+        Args:
+            config_dict(dict): The current settings of the target widget.
+        """
+        pass
+
+
+class SettingsDialog(QDialog):
+    """
+    Dialog to display and edit the settings of a widget with accept and cancel buttons.
+
+    Args:
+        parent (QWidget): The parent widget of the dialog.
+        target_widget (QWidget): The widget that the settings will be taken from and applied to.
+        settings_widget (SettingWidget): The widget that will display the settings.
+    """
+
+    def __init__(
+        self,
+        parent=None,
+        settings_widget: SettingWidget = None,
+        window_title: str = "Settings",
+        config: dict = None,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(parent, *args, **kwargs)
+
+        self.setModal(False)
+
+        self.setWindowTitle(window_title)
+
+        self.widget = settings_widget
+        self.widget.set_target_widget(parent)
+        if config is None:
+            config = parent.get_config()
+
+        self.widget.display_current_settings(config)
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+
+        self.apply_button = QPushButton("Apply")
+
+        button_layout = QHBoxLayout()
+        button_layout.addWidget(self.button_box.button(QDialogButtonBox.Cancel))
+        button_layout.addWidget(self.apply_button)
+        button_layout.addWidget(self.button_box.button(QDialogButtonBox.Ok))
+
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        self.apply_button.clicked.connect(self.apply_changes)
+
+        self.layout = QVBoxLayout(self)
+        self.layout.setContentsMargins(5, 5, 5, 5)
+        self.layout.addWidget(self.widget)
+        self.layout.addLayout(button_layout)
+
+        ok_button = self.button_box.button(QDialogButtonBox.Ok)
+        ok_button.setDefault(True)
+        ok_button.setAutoDefault(True)
+
+    @Slot()
+    def accept(self):
+        """
+        Accept the changes made in the settings widget and close the dialog.
+        """
+        self.widget.accept_changes()
+        super().accept()
+
+    @Slot()
+    def apply_changes(self):
+        """
+        Apply the changes made in the settings widget without closing the dialog.
+        """
+        self.widget.accept_changes()

bec_widgets/{widgets/toolbar → qt_utils}/toolbar.py

@@ -3,8 +3,7 @@ from collections import defaultdict
 
 # pylint: disable=no-name-in-module
 from qtpy.QtCore import QSize
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QHBoxLayout, QLabel, QSpinBox, QToolBar, QWidget
+from qtpy.QtWidgets import QToolBar, QWidget
 
 
 class ToolBarAction(ABC):
@@ -18,34 +17,6 @@ class ToolBarAction(ABC):
         """
 
 
-class ColumnAdjustAction(ToolBarAction):
-    """Toolbar spinbox to adjust number of columns in the plot layout"""
-
-    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
-        """Creates a access history button for the toolbar.
-
-        Args:
-            toolbar (QToolBar): The toolbar to add the action to.
-            target (QWidget): The widget that the 'Access Scan History' action will be targeted.
-
-        Returns:
-            QAction: The 'Access Scan History' action created for the toolbar.
-        """
-        widget = QWidget()
-        layout = QHBoxLayout(widget)
-
-        label = QLabel("Columns:")
-        spin_box = QSpinBox()
-        spin_box.setMinimum(1)  # Set minimum value
-        spin_box.setMaximum(10)  # Set maximum value
-        spin_box.setValue(target.get_column_count())  # Initial value
-        spin_box.valueChanged.connect(lambda value: target.set_column_count(value))
-
-        layout.addWidget(label)
-        layout.addWidget(spin_box)
-        toolbar.addWidget(widget)
-
-
 class ModularToolBar(QToolBar):
     """Modular toolbar with optional automatic initialization.
     Args:

bec_widgets/widgets/figure/plots/motor_map/motor_map.py

@@ -271,11 +271,12 @@ class BECMotorMap(BECPlotBase):
     def _swap_limit_map(self):
         """Swap the limit map."""
         self.plot_item.removeItem(self.plot_components["limit_map"])
-        self.plot_components["limit_map"] = self._make_limit_map(
-            self.config.signals.x.limits, self.config.signals.y.limits
-        )
-        self.plot_components["limit_map"].setZValue(-1)
-        self.plot_item.addItem(self.plot_components["limit_map"])
+        if self.config.signals.x.limits is not None and self.config.signals.y.limits is not None:
+            self.plot_components["limit_map"] = self._make_limit_map(
+                self.config.signals.x.limits, self.config.signals.y.limits
+            )
+            self.plot_components["limit_map"].setZValue(-1)
+            self.plot_item.addItem(self.plot_components["limit_map"])
 
     def _make_motor_map(self):
         """
@@ -284,9 +285,10 @@ class BECMotorMap(BECPlotBase):
         # Create limit map
         motor_x_limit = self.config.signals.x.limits
         motor_y_limit = self.config.signals.y.limits
-        self.plot_components["limit_map"] = self._make_limit_map(motor_x_limit, motor_y_limit)
-        self.plot_item.addItem(self.plot_components["limit_map"])
-        self.plot_components["limit_map"].setZValue(-1)
+        if motor_x_limit is not None or motor_y_limit is not None:
+            self.plot_components["limit_map"] = self._make_limit_map(motor_x_limit, motor_y_limit)
+            self.plot_item.addItem(self.plot_components["limit_map"])
+            self.plot_components["limit_map"].setZValue(-1)
 
         # Create scatter plot
         scatter_size = self.config.scatter_size

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -1,19 +1,19 @@
 import os
 
 from qtpy.QtCore import Slot
-from qtpy.QtWidgets import QDialog, QDialogButtonBox, QLabel, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QVBoxLayout
 
+from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 
-class MotorMapSettings(QWidget):
-    def __init__(self, parent=None, target_widget: QWidget = None, *args, **kwargs):
+class MotorMapSettings(SettingWidget):
+    def __init__(self, parent=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
         current_path = os.path.dirname(__file__)
 
         self.ui = UILoader(self).loader(os.path.join(current_path, "motor_map_settings.ui"))
-        self.target_widget = target_widget
 
         self.layout = QVBoxLayout(self)
         self.layout.addWidget(self.ui)
@@ -45,29 +45,3 @@ class MotorMapSettings(QWidget):
             self.target_widget.set_scatter_size(scatter_size)
             self.target_widget.set_background_value(background_intensity)
             self.target_widget.set_color(color)
-
-
-class MotorMapDialog(QDialog):
-    def __init__(self, parent=None, target_widget: QWidget = None, *args, **kwargs):
-        super().__init__(parent, *args, **kwargs)
-
-        self.setModal(False)
-
-        self.setWindowTitle("Motor Map Settings")
-
-        self.target_widget = target_widget
-        self.widget = MotorMapSettings(target_widget=self.target_widget)
-        self.widget.display_current_settings(self.target_widget._config_dict)
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-
-        self.button_box.accepted.connect(self.accept)
-        self.button_box.rejected.connect(self.reject)
-
-        self.layout = QVBoxLayout(self)
-        self.layout.addWidget(self.widget)
-        self.layout.addWidget(self.button_box)
-
-    @Slot()
-    def accept(self):
-        self.widget.accept_changes()
-        super().accept()

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py

@@ -4,8 +4,8 @@ from qtpy.QtCore import QSize
 from qtpy.QtGui import QAction, QIcon
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
 
+from bec_widgets.qt_utils.toolbar import ToolBarAction
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
-from bec_widgets.widgets.toolbar.toolbar import ToolBarAction
 
 
 class DeviceSelectionAction(ToolBarAction):

bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -4,17 +4,18 @@ import sys
 
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.settings_dialog import SettingsDialog
+from bec_widgets.qt_utils.toolbar import ModularToolBar
 from bec_widgets.utils import BECConnector
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import MotorMapConfig
-from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapDialog
+from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
 from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_toolbar import (
     ConnectAction,
     DeviceSelectionAction,
     ResetHistoryAction,
     SettingsAction,
 )
-from bec_widgets.widgets.toolbar import ModularToolBar
 
 
 class BECMotorMapWidget(BECConnector, QWidget):
@@ -92,7 +93,9 @@ class BECMotorMapWidget(BECConnector, QWidget):
         toolbar_y.setStyleSheet("QComboBox {{ background-color: " "; }}")
 
     def show_settings(self) -> None:
-        dialog = MotorMapDialog(self, target_widget=self)
+        dialog = SettingsDialog(
+            self, settings_widget=MotorMapSettings(), window_title="Motor Map Settings"
+        )
         dialog.exec()
 
     ###################################

{bec_widgets-0.82.0.dist-info → bec_widgets-0.82.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.82.0
+Version: 0.82.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-0.82.0.dist-info → bec_widgets-0.82.2.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=vuDJPAYOK0995_H6fu0N5dIgIrOJgTvKr0HZkNWlxMw,8142
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=k2WtOtHgXemiWHWfpEiNOVE8J8rSXScPG5bnccZKTtw,6798
+CHANGELOG.md,sha256=7VVqe14x1w6butWm_Du8rzXRFtf3RQYV3CsURU1-uT0,6428
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=LT1qiOoINPiD0fx8bR3xpuvsb8e3_dscPXfGK1NVQNs,1309
+PKG-INFO,sha256=9lGCW5x2H2CEYe7DJsHs1LlXB0Pn_hr7efNeRFUGzgo,1309
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=wcznXGDLca8bvxpzz4gq3qCV0D7E9st-N9uyKRSo028,2358
+pyproject.toml,sha256=Jsa50E-GnKAaTBdJplPyg-B7sHQsIPL2GS-IHwugDFA,2358
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -18,11 +18,11 @@ bec_widgets/assets/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uf
 bec_widgets/cli/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 bec_widgets/cli/auto_updates.py,sha256=DyBV3HnjMSH-cvVkYNcDiYKVf0Xut4Qy2qGQqkW47Bw,4833
 bec_widgets/cli/client.py,sha256=MMDy1edr1j9klgVGZZmD1dzLxi74gp75Jf4FNed9al8,60084
-bec_widgets/cli/client_utils.py,sha256=zq1gPW7t4n9Nsn4MLkdUeKwwl-9nUcf5UjuN8lZr9iY,12281
+bec_widgets/cli/client_utils.py,sha256=cDhabblwaP88a0jlVpbn_RWWKVbsyjhmmGtMh9gesEw,12388
 bec_widgets/cli/generate_cli.py,sha256=Ea5px9KblUlcGg-1JbJBTIU7laGg2n8PM7Efw9WVVzM,5889
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
 bec_widgets/cli/rpc_wigdet_handler.py,sha256=6kQng2DyS6rhLJqSJ7xa0kdgSxp-35A2upcf833dJRE,1483
-bec_widgets/cli/server.py,sha256=2EJvkQDzrDTsZjRPs7g2v_iPTspGqxzY34tRAnvjxjY,7281
+bec_widgets/cli/server.py,sha256=FZkqsjUHIkCUFMKUFm7ls_eslXvhIFzLpINEYxeWP5s,7722
 bec_widgets/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=oOVCTY68bAn9HDFd5W_xNqQhI7Nsm7TaqYYLqLWXo2w,5520
@@ -34,6 +34,9 @@ bec_widgets/examples/plugin_example_pyside/taskmenuextension.pyproject,sha256=O_
 bec_widgets/examples/plugin_example_pyside/tictactoe.py,sha256=s3rCurXloVcmMdzZiSzDS7Lgj0Qe6x8-wkxCeiXYX80,4904
 bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py,sha256=BBt3MD8oDLUMCCY3mioJa1QRR0WQdW6DuvVmK1Taovk,1734
 bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py,sha256=LNwplI6deUdKY6FOhUuWBanotxk9asF2G-6k7lFfA8Y,2301
+bec_widgets/qt_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/qt_utils/settings_dialog.py,sha256=rR_Zk4RGTnI4dz5OEzCc13lVpxlOKuwOf4_7wqXSbRw,3373
+bec_widgets/qt_utils/toolbar.py,sha256=r6H4A8_3s2AItmdV8JS9UMSM4hV8Fx_162grYL2Pwzw,2111
 bec_widgets/utils/__init__.py,sha256=1930ji1Jj6dVuY81Wd2kYBhHYNV-2R0bN_L4o9zBj1U,533
 bec_widgets/utils/bec_connector.py,sha256=JScGWHEt4kh6C-C0O_JV_bOuiQlBjYTAPJktqgeAj70,9534
 bec_widgets/utils/bec_designer.py,sha256=ak3G8FdojUPjVBBwdPXw7tN5P2Uxr-SSoQt394jXeAA,4308
@@ -102,7 +105,7 @@ bec_widgets/widgets/figure/plots/image/image.py,sha256=8J-20r12FD9_Wtv-YSzJsWdq3
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=TyarahdWEn0jgalj5fqSAmcznXSbENkqHrrlL2GVdU4,10558
 bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejMwPGQgM-o3d6bmLglCjdoktu19xfA,5262
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=QYeXKcb87DPti19MaAFFr6LGma4F7GijaxnC1vx8Kng,18013
+bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=FH3ZSYThGco98jS29r9EGcIh5fYx8e5eOs_nYJNrr48,18210
 bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=e401GGvUF11rZKf4onB4zYlcUWIv8Zsnm4GcysaXi6U,29226
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=yQZGPKs--3X_9Qg2pv0GUiL5WLBQVC3z_PJKRnsHqPU,8293
@@ -111,16 +114,16 @@ bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=ioLYJL31RdBoAOGFSS
 bec_widgets/widgets/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject,sha256=NAI8s5gRKz80ED4KY7OgD2OgSH5HEsjt2ux2BYp66yg,63
 bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=PIfDE78Zqvsu7-xwoh9DdYkH8a7eOUFSaEl0bNrHYHc,1292
-bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=bmXNRlEZfDC-YMxeC2QwmWX3ftESg4KQpOSxVnOYy1Q,7103
+bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=92v90z6IrxORzxYrPIt1dFXZL8cJg9viFcGzNHGOeBw,7243
 bec_widgets/widgets/motor_map/register_bec_motor_map_widget.py,sha256=qRG8PtWGjso0pWbvj_DXKnbUfmQzfGqPSrnAozXfM7o,492
 bec_widgets/widgets/motor_map/assets/connection.svg,sha256=czIb1BnshmxJnER8ssU3WcLENrFSIUfMwberajWOGAk,341
 bec_widgets/widgets/motor_map/assets/history.svg,sha256=bd6p5saxRiNRpd5OsSwIOvRWvel0WFEHul9zw4y9vH0,392
 bec_widgets/widgets/motor_map/assets/motor_map.png,sha256=xd6GFBM8gAb5c-xRgswxTZFtvo449yK57-EbkFvidOI,9746
 bec_widgets/widgets/motor_map/assets/settings.svg,sha256=ro30oa9CF1YijOXoUl-hz2DilJcqTy4rlTrMYhggumQ,1473
 bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=Y6ZkBGxsBy_cQ24K9YO8NbOZWpbJqAGC1H2-kDPdMfM,2931
+bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=terJ5NHRzAsiUwdqg-hTbkQ5gadnRT0Ol0_Fm66kPF4,2011
 bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui,sha256=nv5vPftt6vcIl60OOZLRvwD29rdHVWOoGmz168BnwKw,2685
-bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py,sha256=qVvNgGVPTbJ4j6GDWsdV61I__t5rcuiv-818I0Yc9XU,2201
+bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py,sha256=R6pmxhB_1ouc6f6cNQQvbxTHb3Ko3K_gTGs5WIYgnRI,2194
 bec_widgets/widgets/ring_progress_bar/__init__.py,sha256=_uoJKnDM2YAeUBfwc5WLbIHSJj7zm_FAurSKP3WRaCw,47
 bec_widgets/widgets/ring_progress_bar/ring.py,sha256=19zFj-6ZrIPLXYqvs5EPcrmDWnfnSLlEOmzJffL4d3A,11241
 bec_widgets/widgets/ring_progress_bar/ring_progress_bar.py,sha256=sU4Dur2XzBVfDYAYazI6pjOZOhzggoQIuc9VD3PWgac,24073
@@ -140,8 +143,6 @@ bec_widgets/widgets/toggle/register_toggle_switch.py,sha256=8pVtkeEeiDOjV4OPoZq1
 bec_widgets/widgets/toggle/toggle.py,sha256=JzCGYoyHBrlBWCoyL94QX4zSLyEwWbCNHMegjlnSy2E,4442
 bec_widgets/widgets/toggle/toggle_switch.pyproject,sha256=Msa-AS5H5XlqW65r8GlX2AxD8FnFnDyDgGnbKcXqKOw,24
 bec_widgets/widgets/toggle/toggle_switch_plugin.py,sha256=8e8JjUx6T5CIx7ixWLwVdT9JOJTbQ8aWwd3_9VAc_Mw,1177
-bec_widgets/widgets/toolbar/__init__.py,sha256=d-TP4_cr_VbpwreMM4ePnfZ5YXsEPQ45ibEf75nuGoE,36
-bec_widgets/widgets/toolbar/toolbar.py,sha256=rloOsr3TVGHLI4OJNKYWEBb1Z9_yJ0ZYIyf9RlPlxwY,3194
 bec_widgets/widgets/vscode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/vscode/vscode.py,sha256=ZyJJCJapYrGhqgudEt8JQn723DDqLdwjsXxXa5q3EkU,2544
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -202,7 +203,7 @@ tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=mjg29huqTivLnukG_XyoMtjOy2P_7J
 tests/end-2-end/test_rpc_register_e2e.py,sha256=blhMiW7HVHX1kGm5dg8Sv0PeCuJ0gnBz3evznQFz_B8,1619
 tests/end-2-end/test_scan_control_e2e.py,sha256=u7oLgFyltkMW2apSZKDukMIXvYrbhHrU32p4mBdn8VE,2276
 tests/unit_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/unit_tests/client_mocks.py,sha256=FEb875yuDu-LGvWsyzqCSruqVV63d4TTjovvJpKcvwA,4255
+tests/unit_tests/client_mocks.py,sha256=BTBpA75CqeJhqYCI5M5XSX2-e4wMoHxi2rnc1PnmsuE,4549
 tests/unit_tests/conftest.py,sha256=KrnktXPWmZhnKNue-xGWOLD1XGEvdz9Vf7V2eO3XQ3A,596
 tests/unit_tests/test_bec_connector.py,sha256=zGDfNHwLFZTbpyX6-yc7Pwzr2jWO_HGZ8T4NFCNo4IE,2444
 tests/unit_tests/test_bec_dispatcher.py,sha256=rYPiRizHaswhGZw55IBMneDFxmPiCCLAZQBqjEkpdyY,3992
@@ -212,20 +213,23 @@ tests/unit_tests/test_bec_image.py,sha256=mjvcrHgOF_FCj6WbUyxvZH9HL63QGA5C0PNZ5d
 tests/unit_tests/test_bec_motor_map.py,sha256=dSYopbZS8lGD9cB26Kwmqw5zBoKCZs8t7DEEr50ug-g,8532
 tests/unit_tests/test_bec_queue.py,sha256=u-uc-iZeGAS8P90o6Cxy5oz_60zHpirGAu04OgQPDXw,4598
 tests/unit_tests/test_bec_status_box.py,sha256=gZdjyy9DNuUP9UwleTLj2Dp5HUImiqnkHjXWiqL0Q-o,4868
-tests/unit_tests/test_client_utils.py,sha256=eViJ1Tz-HX9TkMvQH6W8cO-c3_1I8bUc4_Yen6LOc0E,830
+tests/unit_tests/test_client_utils.py,sha256=CBdWIVJ_UiyFzTJnX3XJm4PGw2uXhFvRCP_Y9ifckbw,2630
 tests/unit_tests/test_color_validation.py,sha256=xbFbtFDia36XLgaNrX2IwvAX3IDC_Odpj5BGoJSgiIE,2389
 tests/unit_tests/test_crosshair.py,sha256=3OMAJ2ZaISYXMOtkXf1rPdy94vCr8njeLi6uHblBL9Q,5045
-tests/unit_tests/test_device_input_base.py,sha256=ooA7lL-tqW-Cvd6mMx_xlupunsGw93PYFDc6CgiQPgg,2430
-tests/unit_tests/test_device_input_widgets.py,sha256=4zbN64p4BZcAGGc1gTB3QhFGYeBU7lQ6MtTblu1ZXrQ,5809
+tests/unit_tests/test_device_input_base.py,sha256=r1tI7BFAhpv7V7gf_n5gjusyrBFOfuCqIkdVg7YA7vY,2444
+tests/unit_tests/test_device_input_widgets.py,sha256=Q40xNKGvJT2dvNttRH68WZi0au8PwpUgBi2EB4LXfC8,5841
 tests/unit_tests/test_generate_cli_client.py,sha256=ng-eV5iF7Dhm-6YpxYo99CMY0KgqoaZBQNkMeKULDBU,3355
 tests/unit_tests/test_generate_plugin.py,sha256=9603ucZChM-pYpHadzsR94U1Zec1KZT34WedX9qzgMo,4464
+tests/unit_tests/test_motor_map_widget.py,sha256=3nbINg3NYvWUrrGGMRPs8SDtePjXhoehSY_CShFGvEI,7507
 tests/unit_tests/test_plot_base.py,sha256=vWbt-QO5blSoE5C1392MIFha9A9JnUsx_D_9yTqhcRo,3845
 tests/unit_tests/test_plugin_utils.py,sha256=ayksWdrFY7kOiA0wVEjKFmFCF3UhH3lG8tzPVOpwysk,528
 tests/unit_tests/test_ring_progress_bar.py,sha256=hDlqkQho7FR7HAfM4Zrr4q1m773a3_rQ8CbM1GqDDSE,12252
 tests/unit_tests/test_rpc_register.py,sha256=hECjZEimd440mwRrO0rg7L3PKN7__3DgjmESN6wx3bo,1179
+tests/unit_tests/test_rpc_server.py,sha256=MvstcvqUsnGAzUxw8Et1xXXikk_VIxFPwDZD0v1QGkg,1500
 tests/unit_tests/test_rpc_widget_handler.py,sha256=ceQ3BPnBIFY2Hy-sDPw0wxxREVTTphILts0gvX9qoUw,234
 tests/unit_tests/test_scan_control.py,sha256=Wr6KcE8av4sEIOx5VgYbzVCem3Jgb4Kzx_oOuvwlmkE,13459
 tests/unit_tests/test_scan_control_group_box.py,sha256=HNqjP10B_NonikspNwKz9upJU-t7xf6hwBerNhbC-uo,5563
+tests/unit_tests/test_setting_dialog.py,sha256=QbHWwLa1VGFwYie-SN3rjS3ICo7A44S4AKN2qeNvIKY,3137
 tests/unit_tests/test_stop_button.py,sha256=tpQanzBUyl7qLXjbMUQqm3U3vShbKKARcnLpgsu3P0E,789
 tests/unit_tests/test_text_box_widget.py,sha256=cT0uEHt_6d-FwST0A_wE9sFW9E3F_nJbKhuBAeU4yHg,1862
 tests/unit_tests/test_toggle.py,sha256=Amzgres7te0tTQIDR2WMKSx9Kce44TxMpIPR6HZygXQ,832
@@ -239,8 +243,8 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.82.0.dist-info/METADATA,sha256=LT1qiOoINPiD0fx8bR3xpuvsb8e3_dscPXfGK1NVQNs,1309
-bec_widgets-0.82.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.82.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.82.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.82.0.dist-info/RECORD,,
+bec_widgets-0.82.2.dist-info/METADATA,sha256=9lGCW5x2H2CEYe7DJsHs1LlXB0Pn_hr7efNeRFUGzgo,1309
+bec_widgets-0.82.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.82.2.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.82.2.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.82.2.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.82.0"
+version = "0.82.2"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [

tests/unit_tests/client_mocks.py

@@ -72,6 +72,13 @@ class FakePositioner(FakeDevice):
         return MagicMock(get=MagicMock(return_value=self.read_value))
 
 
+class Positioner(FakePositioner):
+    """just placeholder for testing embeded isinstance check in DeviceCombobox"""
+
+    def __init__(self, name="test", limits=None, read_value=1.0):
+        super().__init__(name, limits, read_value)
+
+
 class DMMock:
     def __init__(self):
         self.devices = DeviceContainer()
@@ -95,6 +102,7 @@ DEVICES = [
     FakeDevice("bpm3a"),
     FakeDevice("bpm3i"),
     FakeDevice("eiger"),
+    Positioner("test", limits=[-10, 10], read_value=2.0),
 ]
 
 

tests/unit_tests/test_client_utils.py

@@ -3,6 +3,7 @@ from unittest import mock
 import pytest
 
 from bec_widgets.cli.client import BECFigure
+from bec_widgets.cli.client_utils import BECGuiClientMixin, _start_plot_process
 
 from .client_mocks import FakeDevice
 
@@ -27,3 +28,49 @@ def test_rpc_call_accepts_device_as_input(cli_figure):
     fig, mock_rpc_call = cli_figure
     fig.plot(x_name=dev1, y_name=dev2)
     mock_rpc_call.assert_called_with("plot", x_name="samx", y_name="bpm4i")
+
+
+@pytest.mark.parametrize(
+    "config, call_config",
+    [
+        (None, None),
+        ("/path/to/config.yml", "/path/to/config.yml"),
+        ({"key": "value"}, '{"key": "value"}'),
+    ],
+)
+def test_client_utils_start_plot_process(config, call_config):
+    with mock.patch("bec_widgets.cli.client_utils.subprocess.Popen") as mock_popen:
+        _start_plot_process("gui_id", BECFigure, config)
+        command = ["bec-gui-server", "--id", "gui_id", "--gui_class", "BECFigure"]
+        if call_config:
+            command.extend(["--config", call_config])
+        mock_popen.assert_called_once_with(
+            command,
+            text=True,
+            start_new_session=True,
+            stdout=mock.ANY,
+            stderr=mock.ANY,
+            env=mock.ANY,
+        )
+
+
+def test_client_utils_passes_client_config_to_server(bec_dispatcher):
+    """
+    Test that the client config is passed to the server. This ensures that
+    changes to the client config (either through config files or plugins) are
+    reflected in the server.
+    """
+    mixin = BECGuiClientMixin()
+    mixin._client = bec_dispatcher.client
+    mixin._gui_id = "gui_id"
+    mixin.gui_is_alive = mock.MagicMock()
+    mixin.gui_is_alive.side_effect = [True]
+
+    with mock.patch("bec_widgets.cli.client_utils._start_plot_process") as mock_start_plot:
+        with mock.patch.object(mixin, "_start_update_script") as mock_start_update:
+            mock_start_plot.return_value = [mock.MagicMock(), mock.MagicMock()]
+            mixin.show()
+            mock_start_plot.assert_called_once_with(
+                "gui_id", BECGuiClientMixin, mixin._client._service_config.config
+            )
+            mock_start_update.assert_called_once()

tests/unit_tests/test_device_input_base.py

@@ -63,4 +63,4 @@ def test_device_input_base_get_device_list(device_input_base):
 
 def test_device_input_base_get_filters(device_input_base):
     filters = device_input_base.get_available_filters()
-    assert filters == {"FakePositioner", "FakeDevice"}
+    assert filters == {"FakePositioner", "FakeDevice", "Positioner"}

tests/unit_tests/test_device_input_widgets.py

@@ -67,6 +67,7 @@ def test_device_input_combobox_init(device_input_combobox):
         "bpm3a",
         "bpm3i",
         "eiger",
+        "test",
     ]
 
 
@@ -153,6 +154,7 @@ def test_device_input_line_edit_init(device_input_line_edit):
         "bpm3a",
         "bpm3i",
         "eiger",
+        "test",
     ]
 
 

tests/unit_tests/test_motor_map_widget.py

@@ -0,0 +1,196 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
+from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
+
+from .client_mocks import mocked_client
+
+
+@pytest.fixture
+def motor_map_widget(qtbot, mocked_client):
+    widget = BECMotorMapWidget(client=mocked_client())
+    widget.toolbar.widgets["motor_x"].device_combobox.set_device_filter("FakePositioner")
+    widget.toolbar.widgets["motor_y"].device_combobox.set_device_filter("FakePositioner")
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
+    yield widget
+    widget.close()
+
+
+@pytest.fixture
+def mock_motor_map(motor_map_widget):
+    motor_map_mock = MagicMock()
+    motor_map_widget.map = motor_map_mock
+    return motor_map_mock
+
+
+def test_motor_map_widget_init(motor_map_widget):
+    assert motor_map_widget is not None
+    assert motor_map_widget.client is not None
+    assert isinstance(motor_map_widget, BECMotorMapWidget)
+    assert motor_map_widget.config.widget_class == "BECMotorMapWidget"
+
+    # check initial state of toolbar actions
+    assert motor_map_widget.toolbar.widgets["connect"].action.isEnabled() == True
+    assert motor_map_widget.toolbar.widgets["config"].action.isEnabled() == False
+    assert motor_map_widget.toolbar.widgets["history"].action.isEnabled() == False
+    assert (
+        motor_map_widget.toolbar.widgets["motor_x"].device_combobox.config.device_filter
+        == "FakePositioner"
+    )
+    assert (
+        motor_map_widget.toolbar.widgets["motor_y"].device_combobox.config.device_filter
+        == "FakePositioner"
+    )
+    assert motor_map_widget.map.motor_x is None
+    assert motor_map_widget.map.motor_y is None
+
+
+###################################
+# Toolbar Actions
+###################################
+
+
+def test_motor_map_widget_change_motors_enable_toolbar(motor_map_widget):
+    motor_map_widget.change_motors("samx", "samy")
+    assert motor_map_widget.map.motor_x == "samx"
+    assert motor_map_widget.map.motor_y == "samy"
+    assert motor_map_widget.toolbar.widgets["motor_x"].device_combobox.currentText() == "samx"
+    assert motor_map_widget.toolbar.widgets["motor_y"].device_combobox.currentText() == "samy"
+    assert motor_map_widget.toolbar.widgets["config"].action.isEnabled() == True
+    assert motor_map_widget.toolbar.widgets["history"].action.isEnabled() == True
+
+
+###################################
+# Wrapper methods for MotorMap
+###################################
+
+
+def test_change_motors(motor_map_widget, mock_motor_map):
+    motor_map_widget.change_motors("motor_x", "motor_y", "motor_x_entry", "motor_y_entry", True)
+    mock_motor_map.change_motors.assert_called_once_with(
+        "motor_x", "motor_y", "motor_x_entry", "motor_y_entry", True
+    )
+
+
+def test_get_data(motor_map_widget, mock_motor_map):
+    motor_map_widget.get_data()
+    mock_motor_map.get_data.assert_called_once()
+
+
+def test_reset_history(motor_map_widget, mock_motor_map):
+    motor_map_widget.reset_history()
+    mock_motor_map.reset_history.assert_called_once()
+
+
+def test_set_color(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_color("blue")
+    mock_motor_map.set_color.assert_called_once_with("blue")
+
+
+def test_set_max_points(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_max_points(100)
+    mock_motor_map.set_max_points.assert_called_once_with(100)
+
+
+def test_set_precision(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_precision(2)
+    mock_motor_map.set_precision.assert_called_once_with(2)
+
+
+def test_set_num_dim_points(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_num_dim_points(50)
+    mock_motor_map.set_num_dim_points.assert_called_once_with(50)
+
+
+def test_set_background_value(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_background_value(128)
+    mock_motor_map.set_background_value.assert_called_once_with(128)
+
+
+def test_set_scatter_size(motor_map_widget, mock_motor_map):
+    motor_map_widget.set_scatter_size(10)
+    mock_motor_map.set_scatter_size.assert_called_once_with(10)
+
+
+###################################
+# MotorMap Dialog
+###################################
+
+
+def test_motor_map_widget_clicked(motor_map_widget, qtbot):
+    motor_map_widget.toolbar.widgets["motor_x"].device_combobox.setCurrentText("samx")
+    motor_map_widget.toolbar.widgets["motor_y"].device_combobox.setCurrentText("samy")
+    motor_map_widget.toolbar.widgets["connect"].action.trigger()
+
+    qtbot.wait(200)
+
+    assert motor_map_widget.map.motor_x == "samx"
+    assert motor_map_widget.map.motor_y == "samy"
+    assert motor_map_widget.toolbar.widgets["config"].action.isEnabled() == True
+    assert motor_map_widget.toolbar.widgets["history"].action.isEnabled() == True
+
+
+@pytest.fixture
+def motor_map_settings(qtbot):
+    widget = MotorMapSettings()
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
+    yield widget
+    widget.close()
+
+
+def test_display_current_settings(motor_map_settings):
+    config = {
+        "max_points": 100,
+        "num_dim_points": 50,
+        "precision": 2,
+        "scatter_size": 10,
+        "background_value": 128,
+        "color": (255, 0, 0, 255),
+    }
+
+    with patch("bec_widgets.utils.widget_io.WidgetIO.set_value") as mock_set_value:
+        with patch.object(motor_map_settings.ui.color, "setColor") as mock_set_color:
+            motor_map_settings.display_current_settings(config)
+            mock_set_value.assert_any_call(motor_map_settings.ui.max_points, config["max_points"])
+            mock_set_value.assert_any_call(
+                motor_map_settings.ui.trace_dim, config["num_dim_points"]
+            )
+            mock_set_value.assert_any_call(motor_map_settings.ui.precision, config["precision"])
+            mock_set_value.assert_any_call(
+                motor_map_settings.ui.scatter_size, config["scatter_size"]
+            )
+            mock_set_value.assert_any_call(
+                motor_map_settings.ui.background_value, 50
+            )  # 128/255*100 = 50
+            mock_set_color.assert_called_once_with(config["color"])
+
+
+def test_accept_changes(motor_map_settings):
+    with patch(
+        "bec_widgets.utils.widget_io.WidgetIO.get_value", side_effect=[100, 50, 2, 10, 50]
+    ) as mock_get_value:
+        with patch.object(
+            motor_map_settings.ui.color, "get_color", return_value=(255, 0, 0, 255)
+        ) as mock_get_color:
+            mock_target_widget = MagicMock()
+            motor_map_settings.set_target_widget(mock_target_widget)
+
+            motor_map_settings.accept_changes()
+
+            mock_get_value.assert_any_call(motor_map_settings.ui.max_points)
+            mock_get_value.assert_any_call(motor_map_settings.ui.trace_dim)
+            mock_get_value.assert_any_call(motor_map_settings.ui.precision)
+            mock_get_value.assert_any_call(motor_map_settings.ui.scatter_size)
+            mock_get_value.assert_any_call(motor_map_settings.ui.background_value)
+            mock_get_color.assert_called_once()
+
+            mock_target_widget.set_max_points.assert_called_once_with(100)
+            mock_target_widget.set_num_dim_points.assert_called_once_with(50)
+            mock_target_widget.set_precision.assert_called_once_with(2)
+            mock_target_widget.set_scatter_size.assert_called_once_with(10)
+            mock_target_widget.set_background_value.assert_called_once_with(127)
+            mock_target_widget.set_color.assert_called_once_with((255, 0, 0, 255))

tests/unit_tests/test_rpc_server.py

@@ -0,0 +1,42 @@
+from unittest import mock
+
+import pytest
+from bec_lib.service_config import ServiceConfig
+
+from bec_widgets.cli.server import _start_server
+from bec_widgets.widgets.figure import BECFigure
+
+
+@pytest.fixture
+def mocked_cli_server():
+    with mock.patch("bec_widgets.cli.server.BECWidgetsCLIServer") as mock_server:
+        with mock.patch("bec_widgets.cli.server.ServiceConfig") as mock_config:
+            with mock.patch("bec_lib.logger.bec_logger.configure") as mock_logger:
+                yield mock_server, mock_config, mock_logger
+
+
+def test_rpc_server_start_server_without_service_config(mocked_cli_server):
+    """
+    Test that the server is started with the correct arguments.
+    """
+    mock_server, mock_config, _ = mocked_cli_server
+
+    _start_server("gui_id", BECFigure, None)
+    mock_server.assert_called_once_with(gui_id="gui_id", config=mock_config(), gui_class=BECFigure)
+
+
+@pytest.mark.parametrize(
+    "config, call_config",
+    [
+        ("/path/to/config.yml", {"config_path": "/path/to/config.yml"}),
+        ({"key": "value"}, {"config": {"key": "value"}}),
+    ],
+)
+def test_rpc_server_start_server_with_service_config(mocked_cli_server, config, call_config):
+    """
+    Test that the server is started with the correct arguments.
+    """
+    mock_server, mock_config, _ = mocked_cli_server
+    config = mock_config(**call_config)
+    _start_server("gui_id", BECFigure, config)
+    mock_server.assert_called_once_with(gui_id="gui_id", config=config, gui_class=BECFigure)

tests/unit_tests/test_setting_dialog.py

@@ -0,0 +1,97 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from qtpy.QtWidgets import QWidget
+
+from bec_widgets.qt_utils.settings_dialog import SettingsDialog, SettingWidget
+
+###################################
+# SettingWidget base class tests
+###################################
+
+
+@pytest.fixture
+def setting_widget(qtbot):
+    widget = SettingWidget()
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
+    yield widget
+    widget.close()
+
+
+def test_setting_widget_initialization(setting_widget):
+    assert setting_widget.target_widget is None
+
+
+def test_setting_widget_set_target_widget(setting_widget):
+    mock_target = MagicMock(spec=QWidget)
+    setting_widget.set_target_widget(mock_target)
+    assert setting_widget.target_widget == mock_target
+
+
+def test_setting_widget_accept_changes(setting_widget):
+    with patch.object(setting_widget, "accept_changes") as mock_accept_changes:
+        setting_widget.accept_changes()
+        mock_accept_changes.assert_called_once()
+
+
+def test_setting_widget_display_current_settings(setting_widget):
+    config_dict = {"setting1": "value1", "setting2": "value2"}
+    with patch.object(setting_widget, "display_current_settings") as mock_display_current_settings:
+        setting_widget.display_current_settings(config_dict)
+        mock_display_current_settings.assert_called_once_with(config_dict)
+
+
+###################################
+# SettingsDialog tests
+###################################
+@pytest.fixture
+def settings_dialog(qtbot):
+    parent_widget = QWidget()
+    settings_widget = SettingWidget()
+    settings_widget.set_target_widget = MagicMock()
+    settings_widget.display_current_settings = MagicMock()
+    settings_widget.accept_changes = MagicMock()
+
+    dialog = SettingsDialog(
+        parent=parent_widget,
+        settings_widget=settings_widget,
+        window_title="Test Settings",
+        config={"setting1": "value1", "setting2": "value2"},
+    )
+    qtbot.addWidget(dialog)
+    qtbot.waitExposed(dialog)
+    yield dialog, parent_widget, settings_widget
+    dialog.close()
+
+
+def test_settings_dialog_initialization(settings_dialog):
+    dialog, parent_widget, settings_widget = settings_dialog
+
+    assert dialog.windowTitle() == "Test Settings"
+    settings_widget.set_target_widget.assert_called_once_with(parent_widget)
+    settings_widget.display_current_settings.assert_called_once_with(
+        {"setting1": "value1", "setting2": "value2"}
+    )
+
+
+def test_settings_dialog_accept(settings_dialog, qtbot):
+    dialog, _, settings_widget = settings_dialog
+
+    dialog.button_box.buttons()[0].click()  # OK Button
+    settings_widget.accept_changes.assert_called_once()
+
+
+def test_settings_dialog_reject(settings_dialog, qtbot):
+    dialog, _, _ = settings_dialog
+
+    with patch.object(dialog, "reject", wraps=dialog.reject) as mock_reject:
+        dialog.button_box.buttons()[1].click()  # Cancel Button
+        mock_reject.assert_called_once()
+
+
+def test_settings_dialog_apply_changes(settings_dialog, qtbot):
+    dialog, _, settings_widget = settings_dialog
+
+    dialog.apply_button.click()
+    settings_widget.accept_changes.assert_called_once()

bec_widgets/widgets/toolbar/__init__.py

@@ -1 +0,0 @@
-from .toolbar import ModularToolBar