feat:added launch script

Automatically generated by python-semantic-release

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 # This file is a template, and might need editing before it works on your project.
 # Official language image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/python/tags/
-image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
 #commands to run in the Docker container before starting each job.
 variables:
   DOCKER_TLS_CERTDIR: ""
@@ -23,7 +23,6 @@ workflow:
 include:
   - template: Security/Secret-Detection.gitlab-ci.yml
 
-
 # different stages in the pipeline
 stages:
   - Formatter
@@ -65,7 +64,7 @@ pylint:
       - ./pylint/
     expire_in: 1 week
   rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    
+    - if: $CI_PROJECT_PATH == "bec/bec_widgets"
 
 pylint-check:
   stage: Formatter
@@ -98,7 +97,7 @@ pylint-check:
       - ./pylint/
     expire_in: 1 week
   rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    
+    - if: $CI_PROJECT_PATH == "bec/bec_widgets"
 
 tests:
   stage: test
@@ -112,7 +111,7 @@ tests:
     - apt-get update
     - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
     - pip install -e ./bec/bec_lib[dev]
-    - pip install -e .[dev,pyqt6]
+    - pip install -e .[dev,pyside6]
     - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
     - coverage report
     - coverage xml
@@ -124,17 +123,140 @@ tests:
         coverage_format: cobertura
         path: coverage.xml
 
-
-tests-3.11:
+tests-3.10-pyside6:
   extends: "tests"
   stage: AdditionalTests
-  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyside6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
   allow_failure: true
 
-tests-3.12:
+tests-3.12-pyside6:
   extends: "tests"
   stage: AdditionalTests
   image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyside6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.10-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.11-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.12-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.10-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.11-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+tests-3.12-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
   allow_failure: true
 
 end-2-end-conda:
@@ -165,7 +287,7 @@ end-2-end-conda:
     - pip install -e ./bec_lib[dev]
     - pip install -e ./bec_ipython_client[dev]
     - cd ../
-    - pip install -e .[dev,pyqt6]
+    - pip install -e .[dev,pyside6]
     - cd ./tests/end-2-end
     - pytest --start-servers --flush-redis --random-order
 
@@ -183,7 +305,6 @@ end-2-end-conda:
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
 
-
 semver:
   stage: Deploy
   needs: ["tests"]

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 
 
+## v0.55.0 (2024-05-24)
+
+### Feature
+
+* feat(widgets/progressbar): SpiralProgressBar added with rpc interface ([`76bd0d3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/76bd0d339ac9ae9e8a3baa0d0d4e951ec1d09670))
+
+
+## v0.54.0 (2024-05-24)
+
+### Build
+
+* build: added pyqt6 as sphinx build dependency ([`a47a8ec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a47a8ec413934cf7fce8d5b7a5913371d4b3b4a5))
+
+### Feature
+
+* feat(figure): changes to support direct plot functionality ([`fc4d0f3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc4d0f3bb2a7c2fca9c326d86eb68b305bcd548b))
+
+### Refactor
+
+* refactor(reconstruction): repository structure is changed to separate assets needed for each widget ([`3455c60`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3455c602361d3b5cc3ff9190f9d2870474becf8a))
+
+* refactor(clean-up): 1st generation widgets are removed ([`edc25fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/edc25fbf9d5a0321e5f0a80b492b6337df807849))
+
+
 ## v0.53.3 (2024-05-16)
 
 ### Fix
@@ -145,29 +169,3 @@
 
 
 ## v0.49.1 (2024-04-26)
-
-### Build
-
-* build(pyqt6): fixing PyQt6-Qt6 package to 6.6.3 ([`a222298`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a22229849cbb57c15e4c1bae02d7e52e672f8c4c))
-
-### Fix
-
-* fix(widgets/editor): qscintilla editor removed ([`ab85374`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ab8537483da6c87cb9a0b0f01706208c964f292d))
-
-
-## v0.49.0 (2024-04-24)
-
-### Feature
-
-* feat(rpc/client_utils): timeout for rpc response ([`6500a00`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6500a00682a2a7ca535a138bd9496ed8470856a8))
-
-### Fix
-
-* fix(rpc/client_utils): close clean up policy for BECFigure ([`9602085`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9602085f82cbc983f89b5bfe48bf35f08438fa87))
-
-
-## v0.48.0 (2024-04-24)
-
-### Feature
-
-* feat(cli): added auto updates plugin support ([`6238693`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6238693ffb44b47a56b969bc4129f2af7a2c04fe))

bec_widgets/cli/client.py

@@ -554,17 +554,17 @@ class BECFigure(RPCBase):
     @rpc_call
     def plot(
         self,
-        x_name: "str" = None,
-        y_name: "str" = None,
-        z_name: "str" = None,
-        x_entry: "str" = None,
-        y_entry: "str" = None,
-        z_entry: "str" = None,
-        x: "list | np.ndarray" = None,
-        y: "list | np.ndarray" = None,
-        color: "Optional[str]" = None,
-        color_map_z: "Optional[str]" = "plasma",
-        label: "Optional[str]" = None,
+        x: "list | np.ndarray | None" = None,
+        y: "list | np.ndarray | None" = None,
+        x_name: "str | None" = None,
+        y_name: "str | None" = None,
+        z_name: "str | None" = None,
+        x_entry: "str | None" = None,
+        y_entry: "str | None" = None,
+        z_entry: "str | None" = None,
+        color: "str | None" = None,
+        color_map_z: "str | None" = "plasma",
+        label: "str | None" = None,
         validate: "bool" = True,
         **axis_kwargs,
     ) -> "BECWaveform":
@@ -572,14 +572,14 @@ class BECFigure(RPCBase):
         Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure.
 
         Args:
+            x(list | np.ndarray): Custom x data to plot.
+            y(list | np.ndarray): Custom y data to plot.
             x_name(str): The name of the device for the x-axis.
             y_name(str): The name of the device for the y-axis.
             z_name(str): The name of the device for the z-axis.
             x_entry(str): The name of the entry for the x-axis.
             y_entry(str): The name of the entry for the y-axis.
             z_entry(str): The name of the entry for the z-axis.
-            x(list | np.ndarray): Custom x data to plot.
-            y(list | np.ndarray): Custom y data to plot.
             color(str): The color of the curve.
             color_map_z(str): The color map to use for the z-axis.
             label(str): The label of the curve.
@@ -1630,3 +1630,255 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
         """
         Get all registered RPC objects.
         """
+
+
+class SpiralProgressBar(RPCBase):
+    @rpc_call
+    def get_all_rpc(self) -> "dict":
+        """
+        Get all registered RPC objects.
+        """
+
+    @property
+    @rpc_call
+    def rpc_id(self) -> "str":
+        """
+        Get the RPC ID of the widget.
+        """
+
+    @property
+    @rpc_call
+    def config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
+    @property
+    @rpc_call
+    def rings(self):
+        """
+        None
+        """
+
+    @rpc_call
+    def update_config(self, config: "SpiralProgressBarConfig | dict"):
+        """
+        Update the configuration of the widget.
+
+        Args:
+            config(SpiralProgressBarConfig|dict): Configuration to update.
+        """
+
+    @rpc_call
+    def add_ring(self, **kwargs) -> "Ring":
+        """
+        Add a new progress bar.
+
+        Args:
+            **kwargs: Keyword arguments for the new progress bar.
+
+        Returns:
+            Ring: Ring object.
+        """
+
+    @rpc_call
+    def remove_ring(self, index: "int"):
+        """
+        Remove a progress bar by index.
+
+        Args:
+            index(int): Index of the progress bar to remove.
+        """
+
+    @rpc_call
+    def set_precision(self, precision: "int", bar_index: "int" = None):
+        """
+        Set the precision for the progress bars. If bar_index is not provide, the precision will be set for all progress bars.
+
+        Args:
+            precision(int): Precision for the progress bars.
+            bar_index(int): Index of the progress bar to set the precision for. If provided, only a single precision can be set.
+        """
+
+    @rpc_call
+    def set_min_max_values(
+        self,
+        min_values: "int | float | list[int | float]",
+        max_values: "int | float | list[int | float]",
+    ):
+        """
+        Set the minimum and maximum values for the progress bars.
+
+        Args:
+            min_values(int|float | list[float]): Minimum value(s) for the progress bars. If multiple progress bars are displayed, provide a list of minimum values for each progress bar.
+            max_values(int|float | list[float]): Maximum value(s) for the progress bars. If multiple progress bars are displayed, provide a list of maximum values for each progress bar.
+        """
+
+    @rpc_call
+    def set_number_of_bars(self, num_bars: "int"):
+        """
+        Set the number of progress bars to display.
+
+        Args:
+            num_bars(int): Number of progress bars to display.
+        """
+
+    @rpc_call
+    def set_value(self, values: "int | list", ring_index: "int" = None):
+        """
+        Set the values for the progress bars.
+
+        Args:
+            values(int | tuple): Value(s) for the progress bars. If multiple progress bars are displayed, provide a tuple of values for each progress bar.
+            ring_index(int): Index of the progress bar to set the value for. If provided, only a single value can be set.
+
+        Examples:
+            >>> SpiralProgressBar.set_value(50)
+            >>> SpiralProgressBar.set_value([30, 40, 50]) # (outer, middle, inner)
+            >>> SpiralProgressBar.set_value(60, bar_index=1) # Set the value for the middle progress bar.
+        """
+
+    @rpc_call
+    def set_colors_from_map(self, colormap, color_format: "Literal['RGB', 'HEX']" = "RGB"):
+        """
+        Set the colors for the progress bars from a colormap.
+
+        Args:
+            colormap(str): Name of the colormap.
+            color_format(Literal["RGB","HEX"]): Format of the returned colors ('RGB', 'HEX').
+        """
+
+    @rpc_call
+    def set_colors_directly(
+        self, colors: "list[str | tuple] | str | tuple", bar_index: "int" = None
+    ):
+        """
+        Set the colors for the progress bars directly.
+
+        Args:
+            colors(list[str | tuple] | str | tuple): Color(s) for the progress bars. If multiple progress bars are displayed, provide a list of colors for each progress bar.
+            bar_index(int): Index of the progress bar to set the color for. If provided, only a single color can be set.
+        """
+
+    @rpc_call
+    def set_line_widths(self, widths: "int | list[int]", bar_index: "int" = None):
+        """
+        Set the line widths for the progress bars.
+
+        Args:
+            widths(int | list[int]): Line width(s) for the progress bars. If multiple progress bars are displayed, provide a list of line widths for each progress bar.
+            bar_index(int): Index of the progress bar to set the line width for. If provided, only a single line width can be set.
+        """
+
+    @rpc_call
+    def set_gap(self, gap: "int"):
+        """
+        Set the gap between the progress bars.
+
+        Args:
+            gap(int): Gap between the progress bars.
+        """
+
+    @rpc_call
+    def set_diameter(self, diameter: "int"):
+        """
+        Set the diameter of the widget.
+
+        Args:
+            diameter(int): Diameter of the widget.
+        """
+
+    @rpc_call
+    def reset_diameter(self):
+        """
+        Reset the fixed size of the widget.
+        """
+
+    @rpc_call
+    def enable_auto_updates(self, enable: "bool" = True):
+        """
+        Enable or disable updates based on scan status. Overrides manual updates.
+        The behaviour of the whole progress bar widget will be driven by the scan queue status.
+
+        Args:
+            enable(bool): True or False.
+
+        Returns:
+            bool: True if scan segment updates are enabled.
+        """
+
+
+class Ring(RPCBase):
+    @rpc_call
+    def get_all_rpc(self) -> "dict":
+        """
+        Get all registered RPC objects.
+        """
+
+    @property
+    @rpc_call
+    def rpc_id(self) -> "str":
+        """
+        Get the RPC ID of the widget.
+        """
+
+    @property
+    @rpc_call
+    def config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
+    @rpc_call
+    def set_value(self, value: "int | float"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_color(self, color: "str | tuple"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_background(self, color: "str | tuple"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_line_width(self, width: "int"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_min_max_values(self, min_value: "int", max_value: "int"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_start_angle(self, start_angle: "int"):
+        """
+        None
+        """
+
+    @rpc_call
+    def set_connections(self, slot: "str", endpoint: "str | EndpointInfo"):
+        """
+        None
+        """
+
+    @rpc_call
+    def reset_connection(self):
+        """
+        None
+        """

bec_widgets/cli/client_utils.py

@@ -13,7 +13,6 @@ from functools import wraps
 from typing import TYPE_CHECKING
 
 from bec_lib.endpoints import MessageEndpoints
-from bec_lib.service_config import ServiceConfig
 from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_import, lazy_import_from
 from qtpy.QtCore import QCoreApplication
 
@@ -22,8 +21,6 @@ import bec_widgets.cli.client as client
 if TYPE_CHECKING:
     from bec_lib.device import DeviceBase
 
-    from bec_widgets.cli.client import BECDockArea, BECFigure
-
 messages = lazy_import("bec_lib.messages")
 # from bec_lib.connector import MessageObject
 MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))

bec_widgets/cli/generate_cli.py

@@ -109,11 +109,14 @@ if __name__ == "__main__":  # pragma: no cover
     import os
 
     from bec_widgets.utils import BECConnector
-    from bec_widgets.widgets.dock import BECDock, BECDockArea
-    from bec_widgets.widgets.figure import BECFigure
-    from bec_widgets.widgets.plots import BECImageShow, BECMotorMap, BECPlotBase, BECWaveform
-    from bec_widgets.widgets.plots.image import BECImageItem
-    from bec_widgets.widgets.plots.waveform import BECCurve
+    from bec_widgets.widgets import BECDock, BECDockArea, BECFigure, SpiralProgressBar
+    from bec_widgets.widgets.figure.plots.image.image import BECImageShow
+    from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem
+    from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
+    from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase
+    from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
+    from bec_widgets.widgets.figure.plots.waveform.waveform_curve import BECCurve
+    from bec_widgets.widgets.spiral_progress_bar.ring import Ring
 
     current_path = os.path.dirname(__file__)
     client_path = os.path.join(current_path, "client.py")
@@ -128,6 +131,8 @@ if __name__ == "__main__":  # pragma: no cover
         BECMotorMap,
         BECDock,
         BECDockArea,
+        SpiralProgressBar,
+        Ring,
     ]
     generator = ClientGenerator()
     generator.generate_client(clss)

bec_widgets/cli/rpc_wigdet_handler.py

@@ -1,11 +1,12 @@
 from bec_widgets.utils import BECConnector
 from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBar
 
 
 class RPCWidgetHandler:
     """Handler class for creating widgets from RPC messages."""
 
-    widget_classes = {"BECFigure": BECFigure}
+    widget_classes = {"BECFigure": BECFigure, "SpiralProgressBar": SpiralProgressBar}
 
     @staticmethod
     def create_widget(widget_type, **kwargs) -> BECConnector:

bec_widgets/cli/server.py

@@ -1,7 +1,5 @@
 import inspect
-import threading
-import time
-from typing import Literal, Union
+from typing import Union
 
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.utils.import_utils import lazy_import
@@ -12,13 +10,11 @@ from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.widgets.dock.dock_area import BECDockArea
 from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.plots import BECCurve, BECImageShow, BECWaveform
 
 messages = lazy_import("bec_lib.messages")
 
 
 class BECWidgetsCLIServer:
-    WIDGETS = [BECWaveform, BECFigure, BECCurve, BECImageShow]
 
     def __init__(
         self,
@@ -127,11 +123,13 @@ if __name__ == "__main__":  # pragma: no cover
     from qtpy.QtGui import QIcon
     from qtpy.QtWidgets import QApplication, QMainWindow
 
+    import bec_widgets
+
     app = QApplication(sys.argv)
     app.setApplicationName("BEC Figure")
-    current_path = os.path.dirname(__file__)
+    module_path = os.path.dirname(bec_widgets.__file__)
     icon = QIcon()
-    icon.addFile(os.path.join(current_path, "bec_widgets_icon.png"), size=QSize(48, 48))
+    icon.addFile(os.path.join(module_path, "assets", "bec_widgets_icon.png"), size=QSize(48, 48))
     app.setWindowIcon(icon)
 
     win = QMainWindow()

bec_widgets/examples/eiger_plot/eiger_plot.py

@@ -6,12 +6,13 @@ import h5py
 import numpy as np
 import pyqtgraph as pg
 import zmq
-from pyqtgraph.Qt import uic
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QKeySequence
 from qtpy.QtWidgets import QDialog, QFileDialog, QFrame, QLabel, QShortcut, QVBoxLayout, QWidget
 
+from bec_widgets.utils import UILoader
+
 # from scipy.stats import multivariate_normal
 
 
@@ -23,7 +24,7 @@ class EigerPlot(QWidget):
         # pg.setConfigOptions(background="w", foreground="k", antialias=True)
 
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "eiger_plot.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "eiger_plot.ui"), self)
 
         # Set widow name
         self.setWindowTitle("Eiger Plot")
@@ -60,19 +61,22 @@ class EigerPlot(QWidget):
         self.update_hist()
 
         # Adding Items to Graphical Layout
+        self.glw_layout = QVBoxLayout(self.ui.glw_placeholder)
+        self.glw = pg.GraphicsLayoutWidget()
+        self.glw_layout.addWidget(self.glw)
         self.glw.addItem(self.plot_item)
         self.glw.addItem(self.hist)
 
     def hook_signals(self):
         # Buttons
         # self.pushButton_test.clicked.connect(self.start_sim_stream)
-        self.pushButton_mask.clicked.connect(self.load_mask_dialog)
-        self.pushButton_delete_mask.clicked.connect(self.delete_mask)
-        self.pushButton_help.clicked.connect(self.show_help_dialog)
+        self.ui.pushButton_mask.clicked.connect(self.load_mask_dialog)
+        self.ui.pushButton_delete_mask.clicked.connect(self.delete_mask)
+        self.ui.pushButton_help.clicked.connect(self.show_help_dialog)
 
         # SpinBoxes
-        self.doubleSpinBox_hist_min.valueChanged.connect(self.update_hist)
-        self.doubleSpinBox_hist_max.valueChanged.connect(self.update_hist)
+        self.ui.doubleSpinBox_hist_min.valueChanged.connect(self.update_hist)
+        self.ui.doubleSpinBox_hist_max.valueChanged.connect(self.update_hist)
 
         # Signal/Slots
         self.update_signal.connect(self.on_image_update)
@@ -81,47 +85,47 @@ class EigerPlot(QWidget):
         # Key bindings for rotation
         rotate_plus = QShortcut(QKeySequence("Ctrl+A"), self)
         rotate_minus = QShortcut(QKeySequence("Ctrl+Z"), self)
-        self.comboBox_rotation.setToolTip("Increase rotation: Ctrl+A\nDecrease rotation: Ctrl+Z")
-        self.checkBox_transpose.setToolTip("Toggle transpose: Ctrl+T")
+        self.ui.comboBox_rotation.setToolTip("Increase rotation: Ctrl+A\nDecrease rotation: Ctrl+Z")
+        self.ui.checkBox_transpose.setToolTip("Toggle transpose: Ctrl+T")
 
-        max_index = self.comboBox_rotation.count() - 1  # Maximum valid index
+        max_index = self.ui.comboBox_rotation.count() - 1  # Maximum valid index
 
         rotate_plus.activated.connect(
-            lambda: self.comboBox_rotation.setCurrentIndex(
-                min(self.comboBox_rotation.currentIndex() + 1, max_index)
+            lambda: self.ui.comboBox_rotation.setCurrentIndex(
+                min(self.ui.comboBox_rotation.currentIndex() + 1, max_index)
             )
         )
 
         rotate_minus.activated.connect(
-            lambda: self.comboBox_rotation.setCurrentIndex(
-                max(self.comboBox_rotation.currentIndex() - 1, 0)
+            lambda: self.ui.comboBox_rotation.setCurrentIndex(
+                max(self.ui.comboBox_rotation.currentIndex() - 1, 0)
             )
         )
 
         # Key bindings for transpose
         transpose = QShortcut(QKeySequence("Ctrl+T"), self)
-        transpose.activated.connect(self.checkBox_transpose.toggle)
+        transpose.activated.connect(self.ui.checkBox_transpose.toggle)
 
         FFT = QShortcut(QKeySequence("Ctrl+F"), self)
-        FFT.activated.connect(self.checkBox_FFT.toggle)
-        self.checkBox_FFT.setToolTip("Toggle FFT: Ctrl+F")
+        FFT.activated.connect(self.ui.checkBox_FFT.toggle)
+        self.ui.checkBox_FFT.setToolTip("Toggle FFT: Ctrl+F")
 
         log = QShortcut(QKeySequence("Ctrl+L"), self)
-        log.activated.connect(self.checkBox_log.toggle)
-        self.checkBox_log.setToolTip("Toggle log: Ctrl+L")
+        log.activated.connect(self.ui.checkBox_log.toggle)
+        self.ui.checkBox_log.setToolTip("Toggle log: Ctrl+L")
 
         mask = QShortcut(QKeySequence("Ctrl+M"), self)
-        mask.activated.connect(self.pushButton_mask.click)
-        self.pushButton_mask.setToolTip("Load mask: Ctrl+M")
+        mask.activated.connect(self.ui.pushButton_mask.click)
+        self.ui.pushButton_mask.setToolTip("Load mask: Ctrl+M")
 
         delete_mask = QShortcut(QKeySequence("Ctrl+D"), self)
-        delete_mask.activated.connect(self.pushButton_delete_mask.click)
-        self.pushButton_delete_mask.setToolTip("Delete mask: Ctrl+D")
+        delete_mask.activated.connect(self.ui.pushButton_delete_mask.click)
+        self.ui.pushButton_delete_mask.setToolTip("Delete mask: Ctrl+D")
 
     def update_hist(self):
         self.hist_levels = [
-            self.doubleSpinBox_hist_min.value(),
-            self.doubleSpinBox_hist_max.value(),
+            self.ui.doubleSpinBox_hist_min.value(),
+            self.ui.doubleSpinBox_hist_max.value(),
         ]
         self.hist.setLevels(min=self.hist_levels[0], max=self.hist_levels[1])
         self.hist.setHistogramRange(
@@ -160,16 +164,18 @@ class EigerPlot(QWidget):
             # self.image = np.ma.masked_array(self.image, mask=self.mask) #TODO test if np works
             self.image = self.image * (1 - self.mask) + 1
 
-        if self.checkBox_FFT.isChecked():
+        if self.ui.checkBox_FFT.isChecked():
             self.image = np.abs(np.fft.fftshift(np.fft.fft2(self.image)))
 
-        if self.comboBox_rotation.currentIndex() > 0:  # rotate
-            self.image = np.rot90(self.image, k=self.comboBox_rotation.currentIndex(), axes=(0, 1))
+        if self.ui.comboBox_rotation.currentIndex() > 0:  # rotate
+            self.image = np.rot90(
+                self.image, k=self.ui.comboBox_rotation.currentIndex(), axes=(0, 1)
+            )
 
-        if self.checkBox_transpose.isChecked():  # transpose
+        if self.ui.checkBox_transpose.isChecked():  # transpose
             self.image = np.transpose(self.image)
 
-        if self.checkBox_log.isChecked():
+        if self.ui.checkBox_log.isChecked():
             self.image = np.log10(self.image)
 
         self.imageItem.setImage(self.image, autoLevels=False)

bec_widgets/examples/eiger_plot/eiger_plot.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,4">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -191,17 +191,10 @@
     </layout>
    </item>
    <item>
-    <widget class="GraphicsLayoutWidget" name="glw"/>
+    <widget class="QWidget" name="glw_placeholder" native="true"/>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>GraphicsLayoutWidget</class>
-   <extends>QGraphicsView</extends>
-   <header>pyqtgraph.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -2,7 +2,7 @@ import os
 
 import numpy as np
 import pyqtgraph as pg
-from pyqtgraph.Qt import QtWidgets, uic
+from pyqtgraph.Qt import QtWidgets
 from qtconsole.inprocess import QtInProcessKernelManager
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import QSize
@@ -10,9 +10,10 @@ from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.utils import BECDispatcher
+from bec_widgets.utils import BECDispatcher, UILoader
 from bec_widgets.widgets import BECFigure
 from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBar
 
 
 class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
@@ -39,11 +40,11 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         super().__init__(parent)
 
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "jupyter_console_window.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "jupyter_console_window.ui"), self)
 
         self._init_ui()
 
-        self.splitter.setSizes([200, 100])
+        self.ui.splitter.setSizes([200, 100])
         self.safe_close = False
         # self.figure.clean_signal.connect(self.confirm_close)
 
@@ -62,6 +63,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                 "d1": self.d1,
                 "d2": self.d2,
                 "d3": self.d3,
+                "bar": self.bar,
                 "b2a": self.button_2_a,
                 "b2b": self.button_2_b,
                 "b2c": self.button_2_c,
@@ -73,11 +75,11 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
 
     def _init_ui(self):
         # Plotting window
-        self.glw_1_layout = QVBoxLayout(self.glw)  # Create a new QVBoxLayout
+        self.glw_1_layout = QVBoxLayout(self.ui.glw)  # Create a new QVBoxLayout
         self.figure = BECFigure(parent=self, gui_id="remote")  # Create a new BECDeviceMonitor
         self.glw_1_layout.addWidget(self.figure)  # Add BECDeviceMonitor to the layout
 
-        self.dock_layout = QVBoxLayout(self.dock_placeholder)
+        self.dock_layout = QVBoxLayout(self.ui.dock_placeholder)
         self.dock = BECDockArea(gui_id="remote")
         self.dock_layout.addWidget(self.dock)
 
@@ -87,13 +89,13 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         # init dock for testing
         self._init_dock()
 
-        self.console_layout = QVBoxLayout(self.widget_console)
+        self.console_layout = QVBoxLayout(self.ui.widget_console)
         self.console = JupyterConsoleWidget()
         self.console_layout.addWidget(self.console)
         self.console.set_default_style("linux")
 
     def _init_figure(self):
-        self.figure.plot("samx", "bpm4d")
+        self.figure.plot(x_name="samx", y_name="bpm4d")
         self.figure.motor_map("samx", "samy")
         self.figure.image("eiger", color_map="viridis", vrange=(0, 100))
 
@@ -114,17 +116,17 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         self.button_2_b = QtWidgets.QPushButton("button after without postions specified")
         self.button_2_c = QtWidgets.QPushButton("button super late")
         self.button_3 = QtWidgets.QPushButton("Button above Figure ")
-        self.label_1 = QtWidgets.QLabel("some scan info label with useful information")
+        self.bar = SpiralProgressBar()
 
         self.label_2 = QtWidgets.QLabel("label which is added separately")
         self.label_3 = QtWidgets.QLabel("Label above figure")
 
         self.d1 = self.dock.add_dock(widget=self.button_1, position="left")
         self.d1.addWidget(self.label_2)
-        self.d2 = self.dock.add_dock(widget=self.label_1, position="right")
+        self.d2 = self.dock.add_dock(widget=self.bar, position="right")
         self.d3 = self.dock.add_dock(name="figure")
         self.fig_dock3 = BECFigure()
-        self.fig_dock3.plot("samx", "bpm4d")
+        self.fig_dock3.plot(x_name="samx", y_name="bpm4d")
         self.d3.add_widget(self.label_3)
         self.d3.add_widget(self.button_3)
         self.d3.add_widget(self.fig_dock3)
@@ -142,6 +144,10 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
+    import bec_widgets
+
+    module_path = os.path.dirname(bec_widgets.__file__)
+
     bec_dispatcher = BECDispatcher()
     client = bec_dispatcher.client
     client.start()
@@ -150,7 +156,7 @@ if __name__ == "__main__":  # pragma: no cover
     app.setApplicationName("Jupyter Console")
     app.setApplicationDisplayName("Jupyter Console")
     icon = QIcon()
-    icon.addFile("terminal_icon.png", size=QSize(48, 48))
+    icon.addFile(os.path.join(module_path, "assets", "terminal_icon.png"), size=QSize(48, 48))
     app.setWindowIcon(icon)
     win = JupyterConsoleWindow()
     win.show()

bec_widgets/examples/modular_app/modular.ui

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1433</width>
-    <height>689</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="2">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>Plot  Config 2</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="2">
-     <widget class="BECMonitor" name="plot_1"/>
-    </item>
-    <item row="1" column="3">
-     <widget class="QPushButton" name="pushButton_setting_2">
-      <property name="text">
-       <string>Setting Plot 2</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="2" colspan="2">
-     <widget class="BECMonitor" name="plot_2"/>
-    </item>
-    <item row="1" column="4">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Plot Scan Types = True</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="pushButton_setting_1">
-      <property name="text">
-       <string>Setting Plot 1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Plot Config 1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="5">
-     <widget class="QPushButton" name="pushButton_setting_3">
-      <property name="text">
-       <string>Setting Plot 3</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="4" colspan="2">
-     <widget class="BECMonitor" name="plot_3"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1433</width>
-     <height>37</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BECMonitor</class>
-   <extends>QGraphicsView</extends>
-   <header location="global">bec_widgets.widgets.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/examples/modular_app/modular_app.py

@@ -1,197 +0,0 @@
-import os
-
-from qtpy import uic
-from qtpy.QtWidgets import QApplication, QMainWindow
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.widgets import BECMonitor
-
-# some default configs for demonstration purposes
-CONFIG_SIMPLE = {
-    "plot_settings": {
-        "background_color": "black",
-        "num_columns": 2,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                },
-                # {
-                #     "type": "history",
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-                # {
-                #     "type": "dap",
-                #     'worker':'some_worker',
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
-                    },
-                }
-            ],
-        },
-    ],
-}
-
-
-CONFIG_SCAN_MODE = {
-    "plot_settings": {
-        "background_color": "white",
-        "num_columns": 3,
-        "colormap": "plasma",
-        "scan_types": True,
-    },
-    "plot_data": {
-        "grid_scan": [
-            {
-                "plot_name": "Grid plot 1",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 2",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 3",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "gauss_adc2"}]},
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 4",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samy", "entry": "samy"}],
-                            "y": [{"name": "gauss_adc3"}],
-                        },
-                    }
-                ],
-            },
-        ],
-        "line_scan": [
-            {
-                "plot_name": "BPM plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Gauss plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-        ],
-    },
-}
-
-
-class ModularApp(QMainWindow):
-    def __init__(self, client=None, parent=None):
-        super(ModularApp, self).__init__(parent)
-
-        # Client and device manager from BEC
-        self.client = BECDispatcher().client if client is None else client
-
-        # Loading UI
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "modular.ui"), self)
-
-        self._init_plots()
-
-    def _init_plots(self):
-        """Initialize plots and connect the buttons to the config dialogs"""
-        plots = [self.plot_1, self.plot_2, self.plot_3]
-        configs = [CONFIG_SIMPLE, CONFIG_SCAN_MODE, CONFIG_SCAN_MODE]
-        buttons = [self.pushButton_setting_1, self.pushButton_setting_2, self.pushButton_setting_3]
-
-        # hook plots, configs and buttons together
-        for plot, config, button in zip(plots, configs, buttons):
-            plot.on_config_update(config)
-            button.clicked.connect(plot.show_config_dialog)
-
-
-if __name__ == "__main__":
-    # BECclient global variables
-    client = BECDispatcher().client
-    client.start()
-
-    app = QApplication([])
-    modularApp = ModularApp(client=client)
-
-    window = modularApp
-    window.show()
-    app.exec()

bec_widgets/examples/motor_movement/motor_control_compilations.py

@@ -5,14 +5,15 @@ from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QApplication, QSplitter, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.widgets import (
+from bec_widgets.widgets.motor_control.motor_control import MotorThread
+from bec_widgets.widgets.motor_control.motor_table.motor_table import MotorCoordinateTable
+from bec_widgets.widgets.motor_control.movement_absolute.movement_absolute import (
     MotorControlAbsolute,
-    MotorControlRelative,
-    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorMap,
-    MotorThread,
 )
+from bec_widgets.widgets.motor_control.movement_relative.movement_relative import (
+    MotorControlRelative,
+)
+from bec_widgets.widgets.motor_control.selection.selection import MotorControlSelection
 
 CONFIG_DEFAULT = {
     "motor_control": {
@@ -58,13 +59,13 @@ class MotorControlApp(QWidget):
         # Widgets
         self.motor_control_panel = MotorControlPanel(client=self.client, config=self.config)
         # Create MotorMap
-        self.motion_map = MotorMap(client=self.client, config=self.config)
+        # self.motion_map = MotorMap(client=self.client, config=self.config)
         # Create MotorCoordinateTable
         self.motor_table = MotorCoordinateTable(client=self.client, config=self.config)
 
         # Create the splitter and add MotorMap and MotorControlPanel
         splitter = QSplitter(Qt.Horizontal)
-        splitter.addWidget(self.motion_map)
+        # splitter.addWidget(self.motion_map)
         splitter.addWidget(self.motor_control_panel)
         splitter.addWidget(self.motor_table)
 
@@ -74,9 +75,9 @@ class MotorControlApp(QWidget):
         self.setLayout(layout)
 
         # Connecting signals and slots
-        self.motor_control_panel.selection_widget.selected_motors_signal.connect(
-            lambda x, y: self.motion_map.change_motors(x, y, 0)
-        )
+        # self.motor_control_panel.selection_widget.selected_motors_signal.connect(
+        #     lambda x, y: self.motion_map.change_motors(x, y, 0)
+        # )
         self.motor_control_panel.absolute_widget.coordinates_signal.connect(
             self.motor_table.add_coordinate
         )
@@ -87,7 +88,7 @@ class MotorControlApp(QWidget):
             self.motor_control_panel.absolute_widget.set_precision
         )
 
-        self.motor_table.plot_coordinates_signal.connect(self.motion_map.plot_saved_coordinates)
+        # self.motor_table.plot_coordinates_signal.connect(self.motion_map.plot_saved_coordinates)
 
 
 class MotorControlMap(QWidget):
@@ -101,11 +102,11 @@ class MotorControlMap(QWidget):
         # Widgets
         self.motor_control_panel = MotorControlPanel(client=self.client, config=self.config)
         # Create MotorMap
-        self.motion_map = MotorMap(client=self.client, config=self.config)
+        # self.motion_map = MotorMap(client=self.client, config=self.config)
 
         # Create the splitter and add MotorMap and MotorControlPanel
         splitter = QSplitter(Qt.Horizontal)
-        splitter.addWidget(self.motion_map)
+        # splitter.addWidget(self.motion_map)
         splitter.addWidget(self.motor_control_panel)
 
         # Set the main layout
@@ -114,9 +115,9 @@ class MotorControlMap(QWidget):
         self.setLayout(layout)
 
         # Connecting signals and slots
-        self.motor_control_panel.selection_widget.selected_motors_signal.connect(
-            lambda x, y: self.motion_map.change_motors(x, y, 0)
-        )
+        # self.motor_control_panel.selection_widget.selected_motors_signal.connect(
+        #     lambda x, y: self.motion_map.change_motors(x, y, 0)
+        # )
 
 
 class MotorControlPanel(QWidget):
@@ -150,7 +151,7 @@ class MotorControlPanel(QWidget):
         self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
 
         # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
+        # self.layout().setSizeConstraint(layout.SetFixedSize)
 
 
 class MotorControlPanelAbsolute(QWidget):
@@ -177,9 +178,6 @@ class MotorControlPanelAbsolute(QWidget):
         # Connecting signals and slots
         self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
 
-        # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
-
 
 class MotorControlPanelRelative(QWidget):
     def __init__(self, parent=None, client=None, config=None):
@@ -205,9 +203,6 @@ class MotorControlPanelRelative(QWidget):
         # Connecting signals and slots
         self.selection_widget.selected_motors_signal.connect(self.relative_widget.change_motors)
 
-        # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
-
 
 if __name__ == "__main__":  # pragma: no cover
     import argparse

bec_widgets/examples/stream_plot/line_plot.ui

@@ -29,10 +29,10 @@
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <widget class="GraphicsLayoutWidget" name="glw_plot"/>
-      <widget class="GraphicsLayoutWidget" name="glw_image"/>
+      <widget class="QWidget" name="glw_plot_placeholder" native="true"/>
+      <widget class="QWidget" name="glw_image_placeholder" native="true"/>
      </widget>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="verticalLayout" stretch="1,1,1,15">
        <item>
         <widget class="QPushButton" name="pushButton_generate">
@@ -143,13 +143,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>GraphicsLayoutWidget</class>
-   <extends>QGraphicsView</extends>
-   <header>pyqtgraph.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

bec_widgets/examples/stream_plot/stream_plot.py

@@ -9,18 +9,17 @@ from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.redis_connector import RedisConnector
 from pyqtgraph import mkBrush, mkPen
-from pyqtgraph.Qt import QtCore, QtWidgets, uic
-from pyqtgraph.Qt.QtCore import pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QTableWidgetItem
+from pyqtgraph.Qt import QtCore, QtWidgets
+from qtpy.QtCore import Signal, Slot
+from qtpy.QtWidgets import QTableWidgetItem, QVBoxLayout
 
-from bec_widgets.utils import Colors, Crosshair
+from bec_widgets.utils import Colors, Crosshair, UILoader
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
 
 
 class StreamPlot(QtWidgets.QWidget):
-    update_signal = pyqtSignal()
-    roi_signal = pyqtSignal(tuple)
+    update_signal = Signal()
+    roi_signal = Signal(tuple)
 
     def __init__(self, name="", y_value_list=["gauss_bpm"], client=None, parent=None) -> None:
         """
@@ -39,7 +38,7 @@ class StreamPlot(QtWidgets.QWidget):
         pg.setConfigOption("background", "w")
         pg.setConfigOption("foreground", "k")
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "line_plot.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "line_plot.ui"), self)
 
         self._idle_time = 100
         self.connector = RedisConnector(["localhost:6379"])
@@ -82,6 +81,9 @@ class StreamPlot(QtWidgets.QWidget):
 
         # LabelItem for ROI
         self.label_plot = pg.LabelItem(justify="center")
+        self.glw_plot_layout = QVBoxLayout(self.ui.glw_plot_placeholder)
+        self.glw_plot = pg.GraphicsLayoutWidget()
+        self.glw_plot_layout.addWidget(self.glw_plot)
         self.glw_plot.addItem(self.label_plot)
         self.label_plot.setText("ROI region")
 
@@ -112,6 +114,9 @@ class StreamPlot(QtWidgets.QWidget):
 
         # Label for coordinates moved
         self.label_image_moved = pg.LabelItem(justify="center")
+        self.glw_image_layout = QVBoxLayout(self.ui.glw_image_placeholder)
+        self.glw_image = pg.GraphicsLayoutWidget()
+        self.glw_plot_layout.addWidget(self.glw_image)
         self.glw_image.addItem(self.label_image_moved)
         self.label_image_moved.setText("Actual coordinates (X, Y)")
 
@@ -221,10 +226,10 @@ class StreamPlot(QtWidgets.QWidget):
 
     def init_table(self):
         # Init number of rows in table according to n of devices
-        self.cursor_table.setRowCount(len(self.y_value_list))
+        self.ui.cursor_table.setRowCount(len(self.y_value_list))
         # self.table.setHorizontalHeaderLabels(["(X, Y) - Moved", "(X, Y) - Clicked"]) #TODO can be dynamic
-        self.cursor_table.setVerticalHeaderLabels(self.y_value_list)
-        self.cursor_table.resizeColumnsToContents()
+        self.ui.cursor_table.setVerticalHeaderLabels(self.y_value_list)
+        self.ui.cursor_table.resizeColumnsToContents()
 
     def update_table(self, table_widget, x, y_values):
         for i, y in enumerate(y_values):
@@ -287,13 +292,13 @@ class StreamPlot(QtWidgets.QWidget):
 
             self.update_signal.emit()
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def on_dap_update(self, data: dict, metadata: dict):
         flipped_data = self.flip_even_rows(data["data"]["z"])
 
         self.img.setImage(flipped_data)
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def new_proj(self, content: dict, _metadata: dict):
         proj_nr = content["signals"]["proj_nr"]
         endpoint = f"px_stream/projection_{proj_nr}/metadata"

bec_widgets/plugin/main.py

@@ -0,0 +1,17 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+"""PySide6 port of the Qt Designer taskmenuextension example from Qt v6.x"""
+
+import sys
+
+from bec_ipython_client.main import BECIPythonClient
+from PySide6.QtWidgets import QApplication
+from tictactoe import TicTacToe
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = TicTacToe()
+    window.state = "-X-XO----"
+    window.show()
+    sys.exit(app.exec())

bec_widgets/plugin/plugin_launch.py

@@ -0,0 +1,24 @@
+import os
+import subprocess
+import sys
+
+from PySide6.scripts.pyside_tool import designer
+
+import bec_widgets
+
+
+def main():
+    # os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.path.join(
+    #     "/Users/janwyzula/PSI/bec_widgets/bec_widgets/plugin"
+    # )
+    os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.path.join(
+        os.path.dirname(bec_widgets.__file__), "widgets/motor_control/selection"
+    )
+    # os.environ["PYTHONFRAMEWORKPREFIX"] = os.path.join(
+    #     os.path.dirname(bec_widgets.__file__), "widgets/motor_control/selection"
+    # )
+    designer()
+
+
+if __name__ == "__main__":
+    main()

bec_widgets/plugin/registertictactoe.py

@@ -0,0 +1,12 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+from tictactoe import TicTacToe
+from tictactoeplugin import TicTacToePlugin
+
+# Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
+
+
+if __name__ == "__main__":
+    QPyDesignerCustomWidgetCollection.addCustomWidget(TicTacToePlugin())

bec_widgets/plugin/taskmenuextension.pyproject

@@ -0,0 +1,4 @@
+{
+    "files": ["tictactoe.py", "main.py", "registertictactoe.py", "tictactoeplugin.py",
+    "tictactoetaskmenu.py"]
+}

bec_widgets/plugin/tictactoe.py

@@ -0,0 +1,135 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from PySide6.QtCore import Property, QPoint, QRect, QSize, Qt, Slot
+from PySide6.QtGui import QPainter, QPen
+from PySide6.QtWidgets import QWidget
+
+EMPTY = "-"
+CROSS = "X"
+NOUGHT = "O"
+DEFAULT_STATE = "---------"
+
+
+class TicTacToe(QWidget):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self._state = DEFAULT_STATE
+        self._turn_number = 0
+
+    def minimumSizeHint(self):
+        return QSize(200, 200)
+
+    def sizeHint(self):
+        return QSize(200, 200)
+
+    def setState(self, new_state):
+        self._turn_number = 0
+        self._state = DEFAULT_STATE
+        for position in range(min(9, len(new_state))):
+            mark = new_state[position]
+            if mark == CROSS or mark == NOUGHT:
+                self._turn_number += 1
+                self._change_state_at(position, mark)
+            position += 1
+        self.update()
+
+    def state(self):
+        return self._state
+
+    @Slot()
+    def clear_board(self):
+        self._state = DEFAULT_STATE
+        self._turn_number = 0
+        self.update()
+
+    def _change_state_at(self, pos, new_state):
+        self._state = self._state[:pos] + new_state + self._state[pos + 1 :]
+
+    def mousePressEvent(self, event):
+        if self._turn_number == 9:
+            self.clear_board()
+            return
+        for position in range(9):
+            cell = self._cell_rect(position)
+            if cell.contains(event.position().toPoint()):
+                if self._state[position] == EMPTY:
+                    new_state = CROSS if self._turn_number % 2 == 0 else NOUGHT
+                    self._change_state_at(position, new_state)
+                    self._turn_number += 1
+                    self.update()
+
+    def paintEvent(self, event):
+        with QPainter(self) as painter:
+            painter.setRenderHint(QPainter.Antialiasing)
+
+            painter.setPen(QPen(Qt.darkGreen, 1))
+            painter.drawLine(self._cell_width(), 0, self._cell_width(), self.height())
+            painter.drawLine(2 * self._cell_width(), 0, 2 * self._cell_width(), self.height())
+            painter.drawLine(0, self._cell_height(), self.width(), self._cell_height())
+            painter.drawLine(0, 2 * self._cell_height(), self.width(), 2 * self._cell_height())
+
+            painter.setPen(QPen(Qt.darkBlue, 2))
+
+            for position in range(9):
+                cell = self._cell_rect(position)
+                if self._state[position] == CROSS:
+                    painter.drawLine(cell.topLeft(), cell.bottomRight())
+                    painter.drawLine(cell.topRight(), cell.bottomLeft())
+                elif self._state[position] == NOUGHT:
+                    painter.drawEllipse(cell)
+
+            painter.setPen(QPen(Qt.yellow, 3))
+
+            for position in range(0, 8, 3):
+                if (
+                    self._state[position] != EMPTY
+                    and self._state[position + 1] == self._state[position]
+                    and self._state[position + 2] == self._state[position]
+                ):
+                    y = self._cell_rect(position).center().y()
+                    painter.drawLine(0, y, self.width(), y)
+                    self._turn_number = 9
+
+            for position in range(3):
+                if (
+                    self._state[position] != EMPTY
+                    and self._state[position + 3] == self._state[position]
+                    and self._state[position + 6] == self._state[position]
+                ):
+                    x = self._cell_rect(position).center().x()
+                    painter.drawLine(x, 0, x, self.height())
+                    self._turn_number = 9
+
+            if (
+                self._state[0] != EMPTY
+                and self._state[4] == self._state[0]
+                and self._state[8] == self._state[0]
+            ):
+                painter.drawLine(0, 0, self.width(), self.height())
+                self._turn_number = 9
+
+            if (
+                self._state[2] != EMPTY
+                and self._state[4] == self._state[2]
+                and self._state[6] == self._state[2]
+            ):
+                painter.drawLine(0, self.height(), self.width(), 0)
+                self._turn_number = 9
+
+    def _cell_rect(self, position):
+        h_margin = self.width() / 30
+        v_margin = self.height() / 30
+        row = int(position / 3)
+        column = position - 3 * row
+        pos = QPoint(column * self._cell_width() + h_margin, row * self._cell_height() + v_margin)
+        size = QSize(self._cell_width() - 2 * h_margin, self._cell_height() - 2 * v_margin)
+        return QRect(pos, size)
+
+    def _cell_width(self):
+        return self.width() / 3
+
+    def _cell_height(self):
+        return self.height() / 3
+
+    state = Property(str, state, setState)

bec_widgets/plugin/tictactoeplugin.py

@@ -0,0 +1,68 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from PySide6.QtDesigner import QDesignerCustomWidgetInterface
+from PySide6.QtGui import QIcon
+from tictactoe import TicTacToe
+from tictactoetaskmenu import TicTacToeTaskMenuFactory
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='TicTacToe' name='ticTacToe'>
+        <property name='geometry'>
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>200</width>
+                <height>200</height>
+            </rect>
+        </property>
+        <property name='state'>
+            <string>-X-XO----</string>
+        </property>
+    </widget>
+</ui>
+"""
+
+
+class TicTacToePlugin(QDesignerCustomWidgetInterface):
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = TicTacToe(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return ""
+
+    def icon(self):
+        return QIcon()
+
+    def includeFile(self):
+        return "tictactoe"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+        manager = form_editor.extensionManager()
+        iid = TicTacToeTaskMenuFactory.task_menu_iid()
+        manager.registerExtensions(TicTacToeTaskMenuFactory(manager), iid)
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "TicTacToe"
+
+    def toolTip(self):
+        return "Tic Tac Toe Example, demonstrating class QDesignerTaskMenuExtension (Python)"
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/plugin/tictactoetaskmenu.py

@@ -0,0 +1,67 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from PySide6.QtCore import Slot
+from PySide6.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
+from tictactoe import TicTacToe
+
+
+class TicTacToeDialog(QDialog):
+    def __init__(self, parent):
+        super().__init__(parent)
+        layout = QVBoxLayout(self)
+        self._ticTacToe = TicTacToe(self)
+        layout.addWidget(self._ticTacToe)
+        button_box = QDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel | QDialogButtonBox.Reset
+        )
+        button_box.accepted.connect(self.accept)
+        button_box.rejected.connect(self.reject)
+        reset_button = button_box.button(QDialogButtonBox.Reset)
+        reset_button.clicked.connect(self._ticTacToe.clear_board)
+        layout.addWidget(button_box)
+
+    def set_state(self, new_state):
+        self._ticTacToe.setState(new_state)
+
+    def state(self):
+        return self._ticTacToe.state
+
+
+class TicTacToeTaskMenu(QPyDesignerTaskMenuExtension):
+    def __init__(self, ticTacToe, parent):
+        super().__init__(parent)
+        self._ticTacToe = ticTacToe
+        self._edit_state_action = QAction("Edit State...", None)
+        self._edit_state_action.triggered.connect(self._edit_state)
+
+    def taskActions(self):
+        return [self._edit_state_action]
+
+    def preferredEditAction(self):
+        return self._edit_state_action
+
+    @Slot()
+    def _edit_state(self):
+        dialog = TicTacToeDialog(self._ticTacToe)
+        dialog.set_state(self._ticTacToe.state)
+        if dialog.exec() == QDialog.Accepted:
+            self._ticTacToe.state = dialog.state()
+
+
+class TicTacToeTaskMenuFactory(QExtensionFactory):
+    def __init__(self, extension_manager):
+        super().__init__(extension_manager)
+
+    @staticmethod
+    def task_menu_iid():
+        return "org.qt-project.Qt.Designer.TaskMenu"
+
+    def createExtension(self, object, iid, parent):
+        if iid != TicTacToeTaskMenuFactory.task_menu_iid():
+            return None
+        if object.__class__.__name__ != "TicTacToe":
+            return None
+        return TicTacToeTaskMenu(object, parent)

bec_widgets/utils/__init__.py

@@ -7,4 +7,5 @@ from .crosshair import Crosshair
 from .entry_validator import EntryValidator
 from .layout_manager import GridLayoutManager
 from .rpc_decorator import register_rpc_methods, rpc_public
+from .ui_loader import UILoader
 from .validator_delegate import DoubleValidationDelegate

bec_widgets/utils/crosshair.py

@@ -8,13 +8,13 @@ from qtpy.QtCore import Signal as pyqtSignal
 
 class Crosshair(QObject):
     # Signal for 1D plot
-    coordinatesChanged1D = pyqtSignal(float, list)
-    coordinatesClicked1D = pyqtSignal(float, list)
+    coordinatesChanged1D = pyqtSignal(tuple)
+    coordinatesClicked1D = pyqtSignal(tuple)
     # Signal for 2D plot
-    coordinatesChanged2D = pyqtSignal(float, float)
-    coordinatesClicked2D = pyqtSignal(float, float)
+    coordinatesChanged2D = pyqtSignal(tuple)
+    coordinatesClicked2D = pyqtSignal(tuple)
 
-    def __init__(self, plot_item: pg.PlotItem, precision: int = None, parent=None):
+    def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None):
         """
         Crosshair for 1D and 2D plots.
 
@@ -174,10 +174,11 @@ class Crosshair(QObject):
                 if isinstance(item, pg.PlotDataItem):
                     if x is None or all(v is None for v in y_values):
                         return
-                    self.coordinatesChanged1D.emit(
+                    coordinance_to_emit = (
                         round(x, self.precision),
                         [round(y_val, self.precision) for y_val in y_values],
                     )
+                    self.coordinatesChanged1D.emit(coordinance_to_emit)
                     for i, y_val in enumerate(y_values):
                         self.marker_moved_1d[i].setData(
                             [x if not self.is_log_x else np.log10(x)],
@@ -186,7 +187,8 @@ class Crosshair(QObject):
                 elif isinstance(item, pg.ImageItem):
                     if x is None or y_values is None:
                         return
-                    self.coordinatesChanged2D.emit(x, y_values)
+                    coordinance_to_emit = (x, y_values)
+                    self.coordinatesChanged2D.emit(coordinance_to_emit)
 
     def mouse_clicked(self, event):
         """Handles the mouse clicked event, updating the crosshair position and emitting signals.
@@ -209,10 +211,11 @@ class Crosshair(QObject):
                 if isinstance(item, pg.PlotDataItem):
                     if x is None or all(v is None for v in y_values):
                         return
-                    self.coordinatesClicked1D.emit(
+                    coordinate_to_emit = (
                         round(x, self.precision),
                         [round(y_val, self.precision) for y_val in y_values],
                     )
+                    self.coordinatesClicked1D.emit(coordinate_to_emit)
                     for i, y_val in enumerate(y_values):
                         for marker in self.marker_clicked_1d[i]:
                             marker.setData(
@@ -222,7 +225,8 @@ class Crosshair(QObject):
                 elif isinstance(item, pg.ImageItem):
                     if x is None or y_values is None:
                         return
-                    self.coordinatesClicked2D.emit(x, y_values)
+                    coordinate_to_emit = (x, y_values)
+                    self.coordinatesClicked2D.emit(coordinate_to_emit)
                     self.marker_2d.setPos([x, y_values])
 
     def check_log(self):

bec_widgets/utils/ui_loader.py

@@ -0,0 +1,58 @@
+from qtpy import QT_VERSION
+from qtpy.QtCore import QFile, QIODevice
+
+
+class UILoader:
+    """Universal UI loader for PyQt5, PyQt6, PySide2, and PySide6."""
+
+    def __init__(self, parent=None):
+        self.parent = parent
+        if QT_VERSION.startswith("5"):
+            # PyQt5 or PySide2
+            from qtpy import uic
+
+            self.loader = uic.loadUi
+        elif QT_VERSION.startswith("6"):
+            # PyQt6 or PySide6
+            try:
+                from PySide6.QtUiTools import QUiLoader
+
+                self.loader = self.load_ui_pyside6
+            except ImportError:
+                from PyQt6.uic import loadUi
+
+                self.loader = loadUi
+
+    def load_ui_pyside6(self, ui_file, parent=None):
+        """
+        Specific loader for PySide6 using QUiLoader.
+        Args:
+            ui_file(str): Path to the .ui file.
+            parent(QWidget): Parent widget.
+
+        Returns:
+            QWidget: The loaded widget.
+        """
+        from PySide6.QtUiTools import QUiLoader
+
+        loader = QUiLoader(parent)
+        file = QFile(ui_file)
+        if not file.open(QIODevice.ReadOnly):
+            raise IOError(f"Cannot open file: {ui_file}")
+        widget = loader.load(file, parent)
+        file.close()
+        return widget
+
+    def load_ui(self, ui_file, parent=None):
+        """
+        Universal UI loader method.
+        Args:
+            ui_file(str): Path to the .ui file.
+            parent(QWidget): Parent widget.
+
+        Returns:
+            QWidget: The loaded widget.
+        """
+        if parent is None:
+            parent = self.parent
+        return self.loader(ui_file, parent)

bec_widgets/validation/__init__.py

@@ -1,2 +0,0 @@
-# from .monitor_config import validate_monitor_config, ValidationError
-from .monitor_config_validator import MonitorConfigValidator

bec_widgets/validation/monitor_config_validator.py

@@ -1,258 +0,0 @@
-from typing import Literal, Optional, Union
-
-from pydantic import BaseModel, Field, ValidationError, field_validator, model_validator
-from pydantic_core import PydanticCustomError
-
-
-class Signal(BaseModel):
-    """
-    Represents a signal in a plot configuration.
-
-    Args:
-        name (str): The name of the signal.
-        entry (Optional[str]): The entry point of the signal, optional.
-    """
-
-    name: str
-    entry: Optional[str] = Field(None, validate_default=True)
-
-    @model_validator(mode="before")
-    @classmethod
-    def validate_fields(cls, values):
-        """Validate the fields of the model.
-        First validate the 'name' field, then validate the 'entry' field.
-
-        Args:
-            values (dict): The values to be validated."""
-        devices = MonitorConfigValidator.devices
-
-        # Validate 'name'
-        name = values.get("name")
-
-        # Check if device name provided
-        if name is None:
-            raise PydanticCustomError(
-                "no_device_name", "Device name must be provided", {"wrong_value": name}
-            )
-        # Check if device exists in BEC
-        if name not in devices:
-            raise PydanticCustomError(
-                "no_device_bec",
-                'Device "{wrong_value}" not found in current BEC session',
-                {"wrong_value": name},
-            )
-
-        device = devices[name]  # get the device to check if it has signals
-
-        # Get device description
-        description = device.describe()
-
-        # Validate 'entry'
-        entry = values.get("entry")
-
-        # Set entry based on hints if not provided
-        if entry is None:
-            entry = next(iter(device._hints), name) if hasattr(device, "_hints") else name
-        if entry not in description:
-            raise PydanticCustomError(
-                "no_entry_for_device",
-                'Entry "{wrong_value}" not found in device "{device_name}" signals',
-                {"wrong_value": entry, "device_name": name},
-            )
-
-        values["entry"] = entry
-        return values
-
-
-class AxisSignal(BaseModel):
-    """
-    Configuration signal axis for a single plot.
-    Attributes:
-        x (list): Signal for the X axis.
-        y (list): Signals for the Y axis.
-    """
-
-    x: list[Signal] = Field(default_factory=list)
-    y: list[Signal] = Field(default_factory=list)
-
-    @field_validator("x")
-    @classmethod
-    def validate_x_signals(cls, v):
-        """Ensure that there is only one signal for x-axis."""
-        if len(v) != 1:
-            raise PydanticCustomError(
-                "x_axis_multiple_signals",
-                'There must be exactly one signal for x axis. Number of x signals: "{wrong_value}"',
-                {"wrong_value": v},
-            )
-
-        return v
-
-
-class SourceHistoryValidator(BaseModel):
-    """History source validator
-    Attributes:
-        type (str): type of source - history
-        scan_id (str): Scan ID for history source.
-        signals (list): Signal for the source.
-    """
-
-    type: Literal["history"]
-    scan_id: str  # TODO can be validated if it is a valid scan_id
-    signals: AxisSignal
-
-
-class SourceSegmentValidator(BaseModel):
-    """Scan Segment source validator
-    Attributes:
-        type (str): type of source - scan_segment
-        signals (AxisSignal): Signal for the source.
-    """
-
-    type: Literal["scan_segment"]
-    signals: AxisSignal
-
-
-class SourceRedisValidator(BaseModel):
-    """Scan Segment source validator
-    Attributes:
-        type (str): type of source - scan_segment
-        endpoint (str): Endpoint reference in redis.
-        update (str): Update type.
-    """
-
-    type: Literal["redis"]
-    endpoint: str
-    update: str
-    signals: dict
-
-
-class Source(BaseModel):  # TODO decide if it should stay for general Source validation
-    """
-    General source validation, includes all Optional arguments of all other sources.
-    Attributes:
-        type (list): type of source (scan_segment, history)
-        scan_id (Optional[str]): Scan ID for history source.
-        signals (Optional[AxisSignal]): Signal for the source.
-    """
-
-    type: Literal["scan_segment", "history", "redis"]
-    scan_id: Optional[str] = None
-    signals: Optional[dict] = None
-
-
-class PlotConfig(BaseModel):
-    """
-    Configuration for a single plot.
-
-    Attributes:
-        plot_name (Optional[str]): Name of the plot.
-        x_label (Optional[str]): The label for the x-axis.
-        y_label (Optional[str]): The label for the y-axis.
-        sources (list): A list of sources to be plotted on this axis.
-    """
-
-    plot_name: Optional[str] = None
-    x_label: Optional[str] = None
-    y_label: Optional[str] = None
-    sources: list = Field(default_factory=list)
-
-    @field_validator("sources")
-    @classmethod
-    def validate_sources(cls, values):
-        """Validate the sources of the plot configuration, based on the type of source."""
-        validated_sources = []
-        for source in values:
-            # Check if source type is supported
-            Source(**source)
-            source_type = source.get("type", None)
-
-            # Validate source based on type
-            if source_type == "scan_segment":
-                validated_sources.append(SourceSegmentValidator(**source))
-            elif source_type == "history":
-                validated_sources.append(SourceHistoryValidator(**source))
-            elif source_type == "redis":
-                validated_sources.append(SourceRedisValidator(**source))
-        return validated_sources
-
-
-class PlotSettings(BaseModel):
-    """
-    Global settings for plotting affecting mostly visuals.
-
-    Attributes:
-        background_color (str): Color of the plot background. Default is black.
-        axis_width (Optional[int]): Width of the plot axes. Default is 2.
-        axis_color (Optional[str]): Color of the plot axes. Default is None.
-        num_columns (int): Number of columns in the plot layout. Default is 1.
-        colormap (str): Colormap to be used. Default is magma.
-        scan_types (bool): Indicates if the configuration is for different scan types. Default is False.
-    """
-
-    background_color: Literal["black", "white"] = "black"
-    axis_width: Optional[int] = 2
-    axis_color: Optional[str] = None
-    num_columns: Optional[int] = 1
-    colormap: Optional[str] = "magma"
-    scan_types: Optional[bool] = False
-
-
-class DeviceMonitorConfig(BaseModel):
-    """
-    Configuration model for the device monitor mode.
-
-    Attributes:
-        plot_settings (PlotSettings): Global settings for plotting.
-        plot_data (list[PlotConfig]): List of plot configurations.
-    """
-
-    plot_settings: PlotSettings
-    plot_data: list[PlotConfig]
-
-
-class ScanModeConfig(BaseModel):
-    """
-    Configuration model for scan mode.
-
-    Attributes:
-        plot_settings (PlotSettings): Global settings for plotting.
-        plot_data (dict[str, list[PlotConfig]]): Dictionary of plot configurations,
-                                                 keyed by scan type.
-    """
-
-    plot_settings: PlotSettings
-    plot_data: dict[str, list[PlotConfig]]
-
-
-class MonitorConfigValidator:
-    """Validates the configuration data for the BECMonitor."""
-
-    devices = None
-
-    def __init__(self, devices):
-        # self.device_manager = device_manager
-        MonitorConfigValidator.devices = devices
-
-    def validate_monitor_config(
-        self, config_data: dict
-    ) -> Union[DeviceMonitorConfig, ScanModeConfig]:
-        """
-        Validates the configuration data based on the provided schema.
-
-        Args:
-            config_data (dict): Configuration data to be validated.
-
-        Returns:
-            Union[DeviceMonitorConfig, ScanModeConfig]: Validated configuration object.
-
-        Raises:
-            ValidationError: If the configuration data does not conform to the schema.
-        """
-        config_type = config_data.get("plot_settings", {}).get("scan_types", False)
-        if config_type:
-            validated_config = ScanModeConfig(**config_data)
-        else:
-            validated_config = DeviceMonitorConfig(**config_data)
-
-        return validated_config

bec_widgets/widgets/__init__.py

@@ -1,13 +1,4 @@
 from .dock import BECDock, BECDockArea
 from .figure import BECFigure, FigureConfig
-from .monitor import BECMonitor
-from .motor_control import (
-    MotorControlAbsolute,
-    MotorControlRelative,
-    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorThread,
-)
-from .motor_map import MotorMap
-from .plots import BECCurve, BECMotorMap, BECWaveform
 from .scan_control import ScanControl
+from .spiral_progress_bar import SpiralProgressBar

bec_widgets/widgets/device_selection/device_combobox.py

@@ -0,0 +1,14 @@
+from qtpy.QtWidgets import QComboBox
+
+from bec_widgets.utils import BECConnector, ConnectionConfig
+
+
+class DeviceCombobox(BECConnector, QComboBox):
+    def __init__(self, parent=None, client=None, config=None, gui_id=None):
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QComboBox.__init__(self, parent=parent)
+
+        self.get_bec_shortcuts()
+
+        def get_device(self):
+            return getattr(self.dev, self.text().lower())

bec_widgets/widgets/figure/figure.py

@@ -11,18 +11,13 @@ import qdarktheme
 from pydantic import Field
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtWidgets import QWidget
+from typeguard import typechecked
 
 from bec_widgets.utils import BECConnector, ConnectionConfig, WidgetContainerUtils
-from bec_widgets.widgets.plots import (
-    BECImageShow,
-    BECMotorMap,
-    BECPlotBase,
-    BECWaveform,
-    SubplotConfig,
-    Waveform1DConfig,
-)
-from bec_widgets.widgets.plots.image import ImageConfig
-from bec_widgets.widgets.plots.motor_map import MotorMapConfig
+from bec_widgets.widgets.figure.plots.image.image import BECImageShow, ImageConfig
+from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
+from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
+from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform, Waveform1DConfig
 
 
 class FigureConfig(ConnectionConfig):
@@ -267,19 +262,20 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
 
         return waveform
 
+    @typechecked
     def plot(
         self,
-        x_name: str = None,
-        y_name: str = None,
-        z_name: str = None,
-        x_entry: str = None,
-        y_entry: str = None,
-        z_entry: str = None,
-        x: list | np.ndarray = None,
-        y: list | np.ndarray = None,
-        color: Optional[str] = None,
-        color_map_z: Optional[str] = "plasma",
-        label: Optional[str] = None,
+        x: list | np.ndarray | None = None,
+        y: list | np.ndarray | None = None,
+        x_name: str | None = None,
+        y_name: str | None = None,
+        z_name: str | None = None,
+        x_entry: str | None = None,
+        y_entry: str | None = None,
+        z_entry: str | None = None,
+        color: str | None = None,
+        color_map_z: str | None = "plasma",
+        label: str | None = None,
         validate: bool = True,
         **axis_kwargs,
     ) -> BECWaveform:
@@ -287,14 +283,14 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         Add a 1D waveform plot to the figure. Always access the first waveform widget in the figure.
 
         Args:
+            x(list | np.ndarray): Custom x data to plot.
+            y(list | np.ndarray): Custom y data to plot.
             x_name(str): The name of the device for the x-axis.
             y_name(str): The name of the device for the y-axis.
             z_name(str): The name of the device for the z-axis.
             x_entry(str): The name of the entry for the x-axis.
             y_entry(str): The name of the entry for the y-axis.
             z_entry(str): The name of the entry for the z-axis.
-            x(list | np.ndarray): Custom x data to plot.
-            y(list | np.ndarray): Custom y data to plot.
             color(str): The color of the curve.
             color_map_z(str): The color map to use for the z-axis.
             label(str): The label of the curve.
@@ -313,6 +309,27 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         else:
             waveform = self.add_plot(**axis_kwargs)
 
+        if x is not None and y is None:
+            if isinstance(x, np.ndarray):
+                if x.ndim == 1:
+                    y = np.arange(x.size)
+                    waveform.add_curve_custom(x=np.arange(x.size), y=x, color=color, label=label)
+                    return waveform
+                if x.ndim == 2:
+                    waveform.add_curve_custom(x=x[:, 0], y=x[:, 1], color=color, label=label)
+                    return waveform
+            elif isinstance(x, list):
+                y = np.arange(len(x))
+                waveform.add_curve_custom(x=np.arange(len(x)), y=x, color=color, label=label)
+                return waveform
+            else:
+                raise ValueError(
+                    "Invalid input. Provide either device names (x_name, y_name) or custom data."
+                )
+        if x is not None and y is not None:
+            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
+            return waveform
+
         # User wants to add scan curve -> 1D Waveform
         if x_name is not None and y_name is not None and z_name is None and x is None and y is None:
             waveform.add_curve_scan(

bec_widgets/widgets/figure/plots/image/image.py

@@ -4,50 +4,16 @@ from collections import defaultdict
 from typing import Any, Literal, Optional
 
 import numpy as np
-import pyqtgraph as pg
 from bec_lib.endpoints import MessageEndpoints
-from pydantic import BaseModel, Field, ValidationError
-from qtpy.QtCore import QObject, QThread
-from qtpy.QtCore import Signal as pyqtSignal
+from pydantic import Field, ValidationError
+from qtpy.QtCore import QThread
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils import BECConnector, ConnectionConfig, EntryValidator
-
-from .plot_base import BECPlotBase, SubplotConfig
-
-
-class ProcessingConfig(BaseModel):
-    fft: Optional[bool] = Field(False, description="Whether to perform FFT on the monitor data.")
-    log: Optional[bool] = Field(False, description="Whether to perform log on the monitor data.")
-    center_of_mass: Optional[bool] = Field(
-        False, description="Whether to calculate the center of mass of the monitor data."
-    )
-    transpose: Optional[bool] = Field(
-        False, description="Whether to transpose the monitor data before displaying."
-    )
-    rotation: Optional[int] = Field(
-        None, description="The rotation angle of the monitor data before displaying."
-    )
-
-
-class ImageItemConfig(ConnectionConfig):
-    parent_id: Optional[str] = Field(None, description="The parent plot of the image.")
-    monitor: Optional[str] = Field(None, description="The name of the monitor.")
-    source: Optional[str] = Field(None, description="The source of the curve.")
-    color_map: Optional[str] = Field("magma", description="The color map of the image.")
-    downsample: Optional[bool] = Field(True, description="Whether to downsample the image.")
-    opacity: Optional[float] = Field(1.0, description="The opacity of the image.")
-    vrange: Optional[tuple[int, int]] = Field(
-        None, description="The range of the color bar. If None, the range is automatically set."
-    )
-    color_bar: Optional[Literal["simple", "full"]] = Field(
-        "simple", description="The type of the color bar."
-    )
-    autorange: Optional[bool] = Field(True, description="Whether to autorange the color bar.")
-    processing: ProcessingConfig = Field(
-        default_factory=ProcessingConfig, description="The post processing of the image."
-    )
+from bec_widgets.utils import EntryValidator
+from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
+from bec_widgets.widgets.figure.plots.image.image_processor import ImageProcessor, ProcessorWorker
+from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 
 
 class ImageConfig(SubplotConfig):
@@ -57,251 +23,6 @@ class ImageConfig(SubplotConfig):
     )
 
 
-class BECImageItem(BECConnector, pg.ImageItem):
-    USER_ACCESS = [
-        "rpc_id",
-        "config_dict",
-        "set",
-        "set_fft",
-        "set_log",
-        "set_rotation",
-        "set_transpose",
-        "set_opacity",
-        "set_autorange",
-        "set_color_map",
-        "set_auto_downsample",
-        "set_monitor",
-        "set_vrange",
-        "get_data",
-    ]
-
-    def __init__(
-        self,
-        config: Optional[ImageItemConfig] = None,
-        gui_id: Optional[str] = None,
-        parent_image: Optional[BECImageItem] = None,
-        **kwargs,
-    ):
-        if config is None:
-            config = ImageItemConfig(widget_class=self.__class__.__name__)
-            self.config = config
-        else:
-            self.config = config
-        super().__init__(config=config, gui_id=gui_id)
-        pg.ImageItem.__init__(self)
-
-        self.parent_image = parent_image
-        self.colorbar_bar = None
-
-        self._add_color_bar(
-            self.config.color_bar, self.config.vrange
-        )  # TODO can also support None to not have any colorbar
-        self.apply_config()
-        if kwargs:
-            self.set(**kwargs)
-
-    def apply_config(self):
-        """
-        Apply current configuration.
-        """
-        self.set_color_map(self.config.color_map)
-        self.set_auto_downsample(self.config.downsample)
-        if self.config.vrange is not None:
-            self.set_vrange(vrange=self.config.vrange)
-
-    def set(self, **kwargs):
-        """
-        Set the properties of the image.
-
-        Args:
-            **kwargs: Keyword arguments for the properties to be set.
-
-        Possible properties:
-            - downsample
-            - color_map
-            - monitor
-            - opacity
-            - vrange
-            - fft
-            - log
-            - rot
-            - transpose
-        """
-        method_map = {
-            "downsample": self.set_auto_downsample,
-            "color_map": self.set_color_map,
-            "monitor": self.set_monitor,
-            "opacity": self.set_opacity,
-            "vrange": self.set_vrange,
-            "fft": self.set_fft,
-            "log": self.set_log,
-            "rot": self.set_rotation,
-            "transpose": self.set_transpose,
-        }
-        for key, value in kwargs.items():
-            if key in method_map:
-                method_map[key](value)
-            else:
-                print(f"Warning: '{key}' is not a recognized property.")
-
-    def set_fft(self, enable: bool = False):
-        """
-        Set the FFT of the image.
-
-        Args:
-            enable(bool): Whether to perform FFT on the monitor data.
-        """
-        self.config.processing.fft = enable
-
-    def set_log(self, enable: bool = False):
-        """
-        Set the log of the image.
-
-        Args:
-            enable(bool): Whether to perform log on the monitor data.
-        """
-        self.config.processing.log = enable
-        if enable and self.color_bar and self.config.color_bar == "full":
-            self.color_bar.autoHistogramRange()
-
-    def set_rotation(self, deg_90: int = 0):
-        """
-        Set the rotation of the image.
-
-        Args:
-            deg_90(int): The rotation angle of the monitor data before displaying.
-        """
-        self.config.processing.rotation = deg_90
-
-    def set_transpose(self, enable: bool = False):
-        """
-        Set the transpose of the image.
-
-        Args:
-            enable(bool): Whether to transpose the image.
-        """
-        self.config.processing.transpose = enable
-
-    def set_opacity(self, opacity: float = 1.0):
-        """
-        Set the opacity of the image.
-
-        Args:
-            opacity(float): The opacity of the image.
-        """
-        self.setOpacity(opacity)
-        self.config.opacity = opacity
-
-    def set_autorange(self, autorange: bool = False):
-        """
-        Set the autorange of the color bar.
-
-        Args:
-            autorange(bool): Whether to autorange the color bar.
-        """
-        self.config.autorange = autorange
-        if self.color_bar is not None:
-            self.color_bar.autoHistogramRange()
-
-    def set_color_map(self, cmap: str = "magma"):
-        """
-        Set the color map of the image.
-
-        Args:
-            cmap(str): The color map of the image.
-        """
-        self.setColorMap(cmap)
-        if self.color_bar is not None:
-            if self.config.color_bar == "simple":
-                self.color_bar.setColorMap(cmap)
-            elif self.config.color_bar == "full":
-                self.color_bar.gradient.loadPreset(cmap)
-        self.config.color_map = cmap
-
-    def set_auto_downsample(self, auto: bool = True):
-        """
-        Set the auto downsample of the image.
-
-        Args:
-            auto(bool): Whether to downsample the image.
-        """
-        self.setAutoDownsample(auto)
-        self.config.downsample = auto
-
-    def set_monitor(self, monitor: str):
-        """
-        Set the monitor of the image.
-
-        Args:
-            monitor(str): The name of the monitor.
-        """
-        self.config.monitor = monitor
-
-    def set_vrange(self, vmin: float = None, vmax: float = None, vrange: tuple[int, int] = None):
-        """
-        Set the range of the color bar.
-
-        Args:
-            vmin(float): Minimum value of the color bar.
-            vmax(float): Maximum value of the color bar.
-        """
-        if vrange is not None:
-            vmin, vmax = vrange
-        self.setLevels([vmin, vmax])
-        self.config.vrange = (vmin, vmax)
-        self.config.autorange = False
-        if self.color_bar is not None:
-            if self.config.color_bar == "simple":
-                self.color_bar.setLevels(low=vmin, high=vmax)
-            elif self.config.color_bar == "full":
-                self.color_bar.setLevels(min=vmin, max=vmax)
-                self.color_bar.setHistogramRange(vmin - 0.1 * vmin, vmax + 0.1 * vmax)
-
-    def get_data(self) -> np.ndarray:
-        """
-        Get the data of the image.
-        Returns:
-            np.ndarray: The data of the image.
-        """
-        return self.image
-
-    def _add_color_bar(
-        self, color_bar_style: str = "simple", vrange: Optional[tuple[int, int]] = None
-    ):
-        """
-        Add color bar to the layout.
-
-        Args:
-            style(Literal["simple,full"]): The style of the color bar.
-            vrange(tuple[int,int]): The range of the color bar.
-        """
-        if color_bar_style == "simple":
-            self.color_bar = pg.ColorBarItem(colorMap=self.config.color_map)
-            if vrange is not None:
-                self.color_bar.setLevels(low=vrange[0], high=vrange[1])
-            self.color_bar.setImageItem(self)
-            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
-            self.config.color_bar = "simple"
-        elif color_bar_style == "full":
-            # Setting histogram
-            self.color_bar = pg.HistogramLUTItem()
-            self.color_bar.setImageItem(self)
-            self.color_bar.gradient.loadPreset(self.config.color_map)
-            if vrange is not None:
-                self.color_bar.setLevels(min=vrange[0], max=vrange[1])
-                self.color_bar.setHistogramRange(
-                    vrange[0] - 0.1 * vrange[0], vrange[1] + 0.1 * vrange[1]
-                )
-
-            # Adding histogram to the layout
-            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
-
-            # save settings
-            self.config.color_bar = "full"
-        else:
-            raise ValueError("style should be 'simple' or 'full'")
-
-
 class BECImageShow(BECPlotBase):
     USER_ACCESS = [
         "rpc_id",
@@ -837,134 +558,3 @@ class BECImageShow(BECPlotBase):
             image.cleanup()
 
         super().cleanup()
-
-
-class ImageProcessor:
-    """
-    Class for processing the image data.
-    """
-
-    def __init__(self, config: ProcessingConfig = None):
-        if config is None:
-            config = ProcessingConfig()
-        self.config = config
-
-    def set_config(self, config: ProcessingConfig):
-        """
-        Set the configuration of the processor.
-
-        Args:
-            config(ProcessingConfig): The configuration of the processor.
-        """
-        self.config = config
-
-    def FFT(self, data: np.ndarray) -> np.ndarray:
-        """
-        Perform FFT on the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.abs(np.fft.fftshift(np.fft.fft2(data)))
-
-    def rotation(self, data: np.ndarray, rotate_90: int) -> np.ndarray:
-        """
-        Rotate the data by 90 degrees n times.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-            rotate_90(int): The number of 90 degree rotations.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.rot90(data, k=rotate_90, axes=(0, 1))
-
-    def transpose(self, data: np.ndarray) -> np.ndarray:
-        """
-        Transpose the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        return np.transpose(data)
-
-    def log(self, data: np.ndarray) -> np.ndarray:
-        """
-        Perform log on the data.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        # TODO this is not final solution -> data should stay as int16
-        data = data.astype(np.float32)
-        offset = 1e-6
-        data_offset = data + offset
-        return np.log10(data_offset)
-
-    # def center_of_mass(self, data: np.ndarray) -> tuple:  # TODO check functionality
-    #     return np.unravel_index(np.argmax(data), data.shape)
-
-    def process_image(self, data: np.ndarray) -> np.ndarray:
-        """
-        Process the data according to the configuration.
-
-        Args:
-            data(np.ndarray): The data to be processed.
-
-        Returns:
-            np.ndarray: The processed data.
-        """
-        if self.config.fft:
-            data = self.FFT(data)
-        if self.config.rotation is not None:
-            data = self.rotation(data, self.config.rotation)
-        if self.config.transpose:
-            data = self.transpose(data)
-        if self.config.log:
-            data = self.log(data)
-        return data
-
-
-class ProcessorWorker(QObject):
-    """
-    Worker for processing the image data.
-    """
-
-    processed = pyqtSignal(str, np.ndarray)
-    stopRequested = pyqtSignal()
-    finished = pyqtSignal()
-
-    def __init__(self, processor):
-        super().__init__()
-        self.processor = processor
-        self._isRunning = False
-        self.stopRequested.connect(self.stop)
-
-    @pyqtSlot(str, np.ndarray)
-    def process_image(self, device: str, image: np.ndarray):
-        """
-        Process the image data.
-
-        Args:
-            device(str): The name of the device.
-            image(np.ndarray): The image data.
-        """
-        self._isRunning = True
-        processed_image = self.processor.process_image(image)
-        self._isRunning = False
-        if not self._isRunning:
-            self.processed.emit(device, processed_image)
-            self.finished.emit()
-
-    def stop(self):
-        self._isRunning = False

bec_widgets/widgets/figure/plots/image/image_item.py

@@ -0,0 +1,277 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Literal, Optional
+
+import numpy as np
+import pyqtgraph as pg
+from pydantic import Field
+
+from bec_widgets.utils import BECConnector, ConnectionConfig
+from bec_widgets.widgets.figure.plots.image.image_processor import ProcessingConfig
+
+if TYPE_CHECKING:
+    from bec_widgets.widgets.figure.plots.image.image import BECImageShow
+
+
+class ImageItemConfig(ConnectionConfig):
+    parent_id: Optional[str] = Field(None, description="The parent plot of the image.")
+    monitor: Optional[str] = Field(None, description="The name of the monitor.")
+    source: Optional[str] = Field(None, description="The source of the curve.")
+    color_map: Optional[str] = Field("magma", description="The color map of the image.")
+    downsample: Optional[bool] = Field(True, description="Whether to downsample the image.")
+    opacity: Optional[float] = Field(1.0, description="The opacity of the image.")
+    vrange: Optional[tuple[int, int]] = Field(
+        None, description="The range of the color bar. If None, the range is automatically set."
+    )
+    color_bar: Optional[Literal["simple", "full"]] = Field(
+        "simple", description="The type of the color bar."
+    )
+    autorange: Optional[bool] = Field(True, description="Whether to autorange the color bar.")
+    processing: ProcessingConfig = Field(
+        default_factory=ProcessingConfig, description="The post processing of the image."
+    )
+
+
+class BECImageItem(BECConnector, pg.ImageItem):
+    USER_ACCESS = [
+        "rpc_id",
+        "config_dict",
+        "set",
+        "set_fft",
+        "set_log",
+        "set_rotation",
+        "set_transpose",
+        "set_opacity",
+        "set_autorange",
+        "set_color_map",
+        "set_auto_downsample",
+        "set_monitor",
+        "set_vrange",
+        "get_data",
+    ]
+
+    def __init__(
+        self,
+        config: Optional[ImageItemConfig] = None,
+        gui_id: Optional[str] = None,
+        parent_image: Optional[BECImageShow] = None,
+        **kwargs,
+    ):
+        if config is None:
+            config = ImageItemConfig(widget_class=self.__class__.__name__)
+            self.config = config
+        else:
+            self.config = config
+        super().__init__(config=config, gui_id=gui_id)
+        pg.ImageItem.__init__(self)
+
+        self.parent_image = parent_image
+        self.colorbar_bar = None
+
+        self._add_color_bar(
+            self.config.color_bar, self.config.vrange
+        )  # TODO can also support None to not have any colorbar
+        self.apply_config()
+        if kwargs:
+            self.set(**kwargs)
+
+    def apply_config(self):
+        """
+        Apply current configuration.
+        """
+        self.set_color_map(self.config.color_map)
+        self.set_auto_downsample(self.config.downsample)
+        if self.config.vrange is not None:
+            self.set_vrange(vrange=self.config.vrange)
+
+    def set(self, **kwargs):
+        """
+        Set the properties of the image.
+
+        Args:
+            **kwargs: Keyword arguments for the properties to be set.
+
+        Possible properties:
+            - downsample
+            - color_map
+            - monitor
+            - opacity
+            - vrange
+            - fft
+            - log
+            - rot
+            - transpose
+        """
+        method_map = {
+            "downsample": self.set_auto_downsample,
+            "color_map": self.set_color_map,
+            "monitor": self.set_monitor,
+            "opacity": self.set_opacity,
+            "vrange": self.set_vrange,
+            "fft": self.set_fft,
+            "log": self.set_log,
+            "rot": self.set_rotation,
+            "transpose": self.set_transpose,
+        }
+        for key, value in kwargs.items():
+            if key in method_map:
+                method_map[key](value)
+            else:
+                print(f"Warning: '{key}' is not a recognized property.")
+
+    def set_fft(self, enable: bool = False):
+        """
+        Set the FFT of the image.
+
+        Args:
+            enable(bool): Whether to perform FFT on the monitor data.
+        """
+        self.config.processing.fft = enable
+
+    def set_log(self, enable: bool = False):
+        """
+        Set the log of the image.
+
+        Args:
+            enable(bool): Whether to perform log on the monitor data.
+        """
+        self.config.processing.log = enable
+        if enable and self.color_bar and self.config.color_bar == "full":
+            self.color_bar.autoHistogramRange()
+
+    def set_rotation(self, deg_90: int = 0):
+        """
+        Set the rotation of the image.
+
+        Args:
+            deg_90(int): The rotation angle of the monitor data before displaying.
+        """
+        self.config.processing.rotation = deg_90
+
+    def set_transpose(self, enable: bool = False):
+        """
+        Set the transpose of the image.
+
+        Args:
+            enable(bool): Whether to transpose the image.
+        """
+        self.config.processing.transpose = enable
+
+    def set_opacity(self, opacity: float = 1.0):
+        """
+        Set the opacity of the image.
+
+        Args:
+            opacity(float): The opacity of the image.
+        """
+        self.setOpacity(opacity)
+        self.config.opacity = opacity
+
+    def set_autorange(self, autorange: bool = False):
+        """
+        Set the autorange of the color bar.
+
+        Args:
+            autorange(bool): Whether to autorange the color bar.
+        """
+        self.config.autorange = autorange
+        if self.color_bar is not None:
+            self.color_bar.autoHistogramRange()
+
+    def set_color_map(self, cmap: str = "magma"):
+        """
+        Set the color map of the image.
+
+        Args:
+            cmap(str): The color map of the image.
+        """
+        self.setColorMap(cmap)
+        if self.color_bar is not None:
+            if self.config.color_bar == "simple":
+                self.color_bar.setColorMap(cmap)
+            elif self.config.color_bar == "full":
+                self.color_bar.gradient.loadPreset(cmap)
+        self.config.color_map = cmap
+
+    def set_auto_downsample(self, auto: bool = True):
+        """
+        Set the auto downsample of the image.
+
+        Args:
+            auto(bool): Whether to downsample the image.
+        """
+        self.setAutoDownsample(auto)
+        self.config.downsample = auto
+
+    def set_monitor(self, monitor: str):
+        """
+        Set the monitor of the image.
+
+        Args:
+            monitor(str): The name of the monitor.
+        """
+        self.config.monitor = monitor
+
+    def set_vrange(self, vmin: float = None, vmax: float = None, vrange: tuple[int, int] = None):
+        """
+        Set the range of the color bar.
+
+        Args:
+            vmin(float): Minimum value of the color bar.
+            vmax(float): Maximum value of the color bar.
+        """
+        if vrange is not None:
+            vmin, vmax = vrange
+        self.setLevels([vmin, vmax])
+        self.config.vrange = (vmin, vmax)
+        self.config.autorange = False
+        if self.color_bar is not None:
+            if self.config.color_bar == "simple":
+                self.color_bar.setLevels(low=vmin, high=vmax)
+            elif self.config.color_bar == "full":
+                self.color_bar.setLevels(min=vmin, max=vmax)
+                self.color_bar.setHistogramRange(vmin - 0.1 * vmin, vmax + 0.1 * vmax)
+
+    def get_data(self) -> np.ndarray:
+        """
+        Get the data of the image.
+        Returns:
+            np.ndarray: The data of the image.
+        """
+        return self.image
+
+    def _add_color_bar(
+        self, color_bar_style: str = "simple", vrange: Optional[tuple[int, int]] = None
+    ):
+        """
+        Add color bar to the layout.
+
+        Args:
+            style(Literal["simple,full"]): The style of the color bar.
+            vrange(tuple[int,int]): The range of the color bar.
+        """
+        if color_bar_style == "simple":
+            self.color_bar = pg.ColorBarItem(colorMap=self.config.color_map)
+            if vrange is not None:
+                self.color_bar.setLevels(low=vrange[0], high=vrange[1])
+            self.color_bar.setImageItem(self)
+            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
+            self.config.color_bar = "simple"
+        elif color_bar_style == "full":
+            # Setting histogram
+            self.color_bar = pg.HistogramLUTItem()
+            self.color_bar.setImageItem(self)
+            self.color_bar.gradient.loadPreset(self.config.color_map)
+            if vrange is not None:
+                self.color_bar.setLevels(min=vrange[0], max=vrange[1])
+                self.color_bar.setHistogramRange(
+                    vrange[0] - 0.1 * vrange[0], vrange[1] + 0.1 * vrange[1]
+                )
+
+            # Adding histogram to the layout
+            self.parent_image.addItem(self.color_bar)  # , row=0, col=1)
+
+            # save settings
+            self.config.color_bar = "full"
+        else:
+            raise ValueError("style should be 'simple' or 'full'")

bec_widgets/widgets/figure/plots/image/image_processor.py

@@ -0,0 +1,152 @@
+from __future__ import annotations
+
+from typing import Optional
+
+import numpy as np
+from pydantic import BaseModel, Field
+from qtpy.QtCore import QObject, Signal, Slot
+
+
+class ProcessingConfig(BaseModel):
+    fft: Optional[bool] = Field(False, description="Whether to perform FFT on the monitor data.")
+    log: Optional[bool] = Field(False, description="Whether to perform log on the monitor data.")
+    center_of_mass: Optional[bool] = Field(
+        False, description="Whether to calculate the center of mass of the monitor data."
+    )
+    transpose: Optional[bool] = Field(
+        False, description="Whether to transpose the monitor data before displaying."
+    )
+    rotation: Optional[int] = Field(
+        None, description="The rotation angle of the monitor data before displaying."
+    )
+
+
+class ImageProcessor:
+    """
+    Class for processing the image data.
+    """
+
+    def __init__(self, config: ProcessingConfig = None):
+        if config is None:
+            config = ProcessingConfig()
+        self.config = config
+
+    def set_config(self, config: ProcessingConfig):
+        """
+        Set the configuration of the processor.
+
+        Args:
+            config(ProcessingConfig): The configuration of the processor.
+        """
+        self.config = config
+
+    def FFT(self, data: np.ndarray) -> np.ndarray:
+        """
+        Perform FFT on the data.
+
+        Args:
+            data(np.ndarray): The data to be processed.
+
+        Returns:
+            np.ndarray: The processed data.
+        """
+        return np.abs(np.fft.fftshift(np.fft.fft2(data)))
+
+    def rotation(self, data: np.ndarray, rotate_90: int) -> np.ndarray:
+        """
+        Rotate the data by 90 degrees n times.
+
+        Args:
+            data(np.ndarray): The data to be processed.
+            rotate_90(int): The number of 90 degree rotations.
+
+        Returns:
+            np.ndarray: The processed data.
+        """
+        return np.rot90(data, k=rotate_90, axes=(0, 1))
+
+    def transpose(self, data: np.ndarray) -> np.ndarray:
+        """
+        Transpose the data.
+
+        Args:
+            data(np.ndarray): The data to be processed.
+
+        Returns:
+            np.ndarray: The processed data.
+        """
+        return np.transpose(data)
+
+    def log(self, data: np.ndarray) -> np.ndarray:
+        """
+        Perform log on the data.
+
+        Args:
+            data(np.ndarray): The data to be processed.
+
+        Returns:
+            np.ndarray: The processed data.
+        """
+        # TODO this is not final solution -> data should stay as int16
+        data = data.astype(np.float32)
+        offset = 1e-6
+        data_offset = data + offset
+        return np.log10(data_offset)
+
+    # def center_of_mass(self, data: np.ndarray) -> tuple:  # TODO check functionality
+    #     return np.unravel_index(np.argmax(data), data.shape)
+
+    def process_image(self, data: np.ndarray) -> np.ndarray:
+        """
+        Process the data according to the configuration.
+
+        Args:
+            data(np.ndarray): The data to be processed.
+
+        Returns:
+            np.ndarray: The processed data.
+        """
+        if self.config.fft:
+            data = self.FFT(data)
+        if self.config.rotation is not None:
+            data = self.rotation(data, self.config.rotation)
+        if self.config.transpose:
+            data = self.transpose(data)
+        if self.config.log:
+            data = self.log(data)
+        return data
+
+
+class ProcessorWorker(QObject):
+    """
+    Worker for processing the image data.
+    """
+
+    processed = Signal(str, np.ndarray)
+    stopRequested = Signal()
+    finished = Signal()
+
+    def __init__(self, processor):
+        super().__init__()
+        self.processor = processor
+        self._isRunning = False
+        self.stopRequested.connect(self.stop)
+
+    @Slot(str, np.ndarray)
+    def process_image(self, device: str, image: np.ndarray):
+        """
+        Process the image data.
+
+        Args:
+            device(str): The name of the device.
+            image(np.ndarray): The image data.
+        """
+        self._isRunning = True
+        processed_image = self.processor.process_image(image)
+        self._isRunning = False
+        if not self._isRunning:
+            self.processed.emit(device, processed_image)
+            self.finished.emit()
+
+    def stop(self):
+        self._isRunning = False

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

@@ -13,8 +13,8 @@ from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils import EntryValidator
-from bec_widgets.widgets.plots.plot_base import BECPlotBase, SubplotConfig
-from bec_widgets.widgets.plots.waveform import Signal, SignalData
+from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
+from bec_widgets.widgets.figure.plots.waveform.waveform import Signal, SignalData
 
 
 class MotorMapConfig(SubplotConfig):

bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -7,50 +7,19 @@ import numpy as np
 import pyqtgraph as pg
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.scan_data import ScanData
-from pydantic import BaseModel, Field, ValidationError
-from pyqtgraph import mkBrush
-from qtpy import QtCore
+from pydantic import Field, ValidationError
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig, EntryValidator
-from bec_widgets.widgets.plots.plot_base import BECPlotBase, SubplotConfig
-
-
-class SignalData(BaseModel):
-    """The data configuration of a signal in the 1D waveform widget for x and y axis."""
-
-    name: str
-    entry: str
-    unit: Optional[str] = None  # todo implement later
-    modifier: Optional[str] = None  # todo implement later
-    limits: Optional[list[float]] = None  # todo implement later
-
-
-class Signal(BaseModel):
-    """The configuration of a signal in the 1D waveform widget."""
-
-    source: str
-    x: SignalData  # TODO maybe add metadata for config gui later
-    y: SignalData
-    z: Optional[SignalData] = None
-
-
-class CurveConfig(ConnectionConfig):
-    parent_id: Optional[str] = Field(None, description="The parent plot of the curve.")
-    label: Optional[str] = Field(None, description="The label of the curve.")
-    color: Optional[Any] = Field(None, description="The color of the curve.")
-    symbol: Optional[str] = Field("o", description="The symbol of the curve.")
-    symbol_color: Optional[str] = Field(None, description="The color of the symbol of the curve.")
-    symbol_size: Optional[int] = Field(5, description="The size of the symbol of the curve.")
-    pen_width: Optional[int] = Field(2, description="The width of the pen of the curve.")
-    pen_style: Optional[Literal["solid", "dash", "dot", "dashdot"]] = Field(
-        "solid", description="The style of the pen of the curve."
-    )
-    source: Optional[str] = Field(None, description="The source of the curve.")
-    signals: Optional[Signal] = Field(None, description="The signal of the curve.")
-    colormap: Optional[str] = Field("plasma", description="The colormap of the curves z gradient.")
+from bec_widgets.utils import Colors, EntryValidator
+from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
+from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
+    BECCurve,
+    CurveConfig,
+    Signal,
+    SignalData,
+)
 
 
 class Waveform1DConfig(SubplotConfig):
@@ -62,188 +31,6 @@ class Waveform1DConfig(SubplotConfig):
     )
 
 
-class BECCurve(BECConnector, pg.PlotDataItem):
-    USER_ACCESS = [
-        "remove",
-        "rpc_id",
-        "config_dict",
-        "set",
-        "set_data",
-        "set_color",
-        "set_colormap",
-        "set_symbol",
-        "set_symbol_color",
-        "set_symbol_size",
-        "set_pen_width",
-        "set_pen_style",
-        "get_data",
-    ]
-
-    def __init__(
-        self,
-        name: Optional[str] = None,
-        config: Optional[CurveConfig] = None,
-        gui_id: Optional[str] = None,
-        parent_item: Optional[pg.PlotItem] = None,
-        **kwargs,
-    ):
-        if config is None:
-            config = CurveConfig(label=name, widget_class=self.__class__.__name__)
-            self.config = config
-        else:
-            self.config = config
-            # config.widget_class = self.__class__.__name__
-        super().__init__(config=config, gui_id=gui_id)
-        pg.PlotDataItem.__init__(self, name=name)
-
-        self.parent_item = parent_item
-        self.apply_config()
-        if kwargs:
-            self.set(**kwargs)
-
-    def apply_config(self):
-        pen_style_map = {
-            "solid": QtCore.Qt.SolidLine,
-            "dash": QtCore.Qt.DashLine,
-            "dot": QtCore.Qt.DotLine,
-            "dashdot": QtCore.Qt.DashDotLine,
-        }
-        pen_style = pen_style_map.get(self.config.pen_style, QtCore.Qt.SolidLine)
-
-        pen = pg.mkPen(color=self.config.color, width=self.config.pen_width, style=pen_style)
-        self.setPen(pen)
-
-        if self.config.symbol:
-            symbol_color = self.config.symbol_color or self.config.color
-            brush = mkBrush(color=symbol_color)
-            self.setSymbolBrush(brush)
-            self.setSymbolSize(self.config.symbol_size)
-            self.setSymbol(self.config.symbol)
-
-    def set_data(self, x, y):
-        if self.config.source == "custom":
-            self.setData(x, y)
-        else:
-            raise ValueError(f"Source {self.config.source} do not allow custom data setting.")
-
-    def set(self, **kwargs):
-        """
-        Set the properties of the curve.
-
-        Args:
-            **kwargs: Keyword arguments for the properties to be set.
-
-        Possible properties:
-            - color: str
-            - symbol: str
-            - symbol_color: str
-            - symbol_size: int
-            - pen_width: int
-            - pen_style: Literal["solid", "dash", "dot", "dashdot"]
-        """
-
-        # Mapping of keywords to setter methods
-        method_map = {
-            "color": self.set_color,
-            "colormap": self.set_colormap,
-            "symbol": self.set_symbol,
-            "symbol_color": self.set_symbol_color,
-            "symbol_size": self.set_symbol_size,
-            "pen_width": self.set_pen_width,
-            "pen_style": self.set_pen_style,
-        }
-        for key, value in kwargs.items():
-            if key in method_map:
-                method_map[key](value)
-            else:
-                print(f"Warning: '{key}' is not a recognized property.")
-
-    def set_color(self, color: str, symbol_color: Optional[str] = None):
-        """
-        Change the color of the curve.
-
-        Args:
-            color(str): Color of the curve.
-            symbol_color(str, optional): Color of the symbol. Defaults to None.
-        """
-        self.config.color = color
-        self.config.symbol_color = symbol_color or color
-        self.apply_config()
-
-    def set_symbol(self, symbol: str):
-        """
-        Change the symbol of the curve.
-
-        Args:
-            symbol(str): Symbol of the curve.
-        """
-        self.config.symbol = symbol
-        self.apply_config()
-
-    def set_symbol_color(self, symbol_color: str):
-        """
-        Change the symbol color of the curve.
-
-        Args:
-            symbol_color(str): Color of the symbol.
-        """
-        self.config.symbol_color = symbol_color
-        self.apply_config()
-
-    def set_symbol_size(self, symbol_size: int):
-        """
-        Change the symbol size of the curve.
-
-        Args:
-            symbol_size(int): Size of the symbol.
-        """
-        self.config.symbol_size = symbol_size
-        self.apply_config()
-
-    def set_pen_width(self, pen_width: int):
-        """
-        Change the pen width of the curve.
-
-        Args:
-            pen_width(int): Width of the pen.
-        """
-        self.config.pen_width = pen_width
-        self.apply_config()
-
-    def set_pen_style(self, pen_style: Literal["solid", "dash", "dot", "dashdot"]):
-        """
-        Change the pen style of the curve.
-
-        Args:
-            pen_style(Literal["solid", "dash", "dot", "dashdot"]): Style of the pen.
-        """
-        self.config.pen_style = pen_style
-        self.apply_config()
-
-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the scatter plot z gradient.
-
-        Args:
-            colormap(str): Colormap for the scatter plot.
-        """
-        self.config.colormap = colormap
-
-    def get_data(self) -> tuple[np.ndarray, np.ndarray]:
-        """
-        Get the data of the curve.
-        Returns:
-            tuple[np.ndarray,np.ndarray]: X and Y data of the curve.
-        """
-        x_data, y_data = self.getData()
-        return x_data, y_data
-
-    def remove(self):
-        """Remove the curve from the plot."""
-        self.parent_item.removeItem(self)
-        self.cleanup()
-
-
 class BECWaveform(BECPlotBase):
     USER_ACCESS = [
         "rpc_id",

bec_widgets/widgets/figure/plots/waveform/waveform_curve.py

@@ -0,0 +1,227 @@
+from __future__ import annotations
+
+from typing import Any, Literal, Optional
+
+import pyqtgraph as pg
+from pydantic import BaseModel, Field
+from qtpy import QtCore
+
+from bec_widgets.utils import BECConnector, ConnectionConfig
+
+
+class SignalData(BaseModel):
+    """The data configuration of a signal in the 1D waveform widget for x and y axis."""
+
+    name: str
+    entry: str
+    unit: Optional[str] = None  # todo implement later
+    modifier: Optional[str] = None  # todo implement later
+    limits: Optional[list[float]] = None  # todo implement later
+
+
+class Signal(BaseModel):
+    """The configuration of a signal in the 1D waveform widget."""
+
+    source: str
+    x: SignalData  # TODO maybe add metadata for config gui later
+    y: SignalData
+    z: Optional[SignalData] = None
+
+
+class CurveConfig(ConnectionConfig):
+    parent_id: Optional[str] = Field(None, description="The parent plot of the curve.")
+    label: Optional[str] = Field(None, description="The label of the curve.")
+    color: Optional[Any] = Field(None, description="The color of the curve.")
+    symbol: Optional[str] = Field("o", description="The symbol of the curve.")
+    symbol_color: Optional[str] = Field(None, description="The color of the symbol of the curve.")
+    symbol_size: Optional[int] = Field(5, description="The size of the symbol of the curve.")
+    pen_width: Optional[int] = Field(2, description="The width of the pen of the curve.")
+    pen_style: Optional[Literal["solid", "dash", "dot", "dashdot"]] = Field(
+        "solid", description="The style of the pen of the curve."
+    )
+    source: Optional[str] = Field(None, description="The source of the curve.")
+    signals: Optional[Signal] = Field(None, description="The signal of the curve.")
+    colormap: Optional[str] = Field("plasma", description="The colormap of the curves z gradient.")
+
+
+class BECCurve(BECConnector, pg.PlotDataItem):
+    USER_ACCESS = [
+        "remove",
+        "rpc_id",
+        "config_dict",
+        "set",
+        "set_data",
+        "set_color",
+        "set_colormap",
+        "set_symbol",
+        "set_symbol_color",
+        "set_symbol_size",
+        "set_pen_width",
+        "set_pen_style",
+        "get_data",
+    ]
+
+    def __init__(
+        self,
+        name: Optional[str] = None,
+        config: Optional[CurveConfig] = None,
+        gui_id: Optional[str] = None,
+        parent_item: Optional[pg.PlotItem] = None,
+        **kwargs,
+    ):
+        if config is None:
+            config = CurveConfig(label=name, widget_class=self.__class__.__name__)
+            self.config = config
+        else:
+            self.config = config
+            # config.widget_class = self.__class__.__name__
+        super().__init__(config=config, gui_id=gui_id)
+        pg.PlotDataItem.__init__(self, name=name)
+
+        self.parent_item = parent_item
+        self.apply_config()
+        if kwargs:
+            self.set(**kwargs)
+
+    def apply_config(self):
+        pen_style_map = {
+            "solid": QtCore.Qt.SolidLine,
+            "dash": QtCore.Qt.DashLine,
+            "dot": QtCore.Qt.DotLine,
+            "dashdot": QtCore.Qt.DashDotLine,
+        }
+        pen_style = pen_style_map.get(self.config.pen_style, QtCore.Qt.SolidLine)
+
+        pen = pg.mkPen(color=self.config.color, width=self.config.pen_width, style=pen_style)
+        self.setPen(pen)
+
+        if self.config.symbol:
+            symbol_color = self.config.symbol_color or self.config.color
+            brush = pg.mkBrush(color=symbol_color)
+
+            self.setSymbolBrush(brush)
+            self.setSymbolSize(self.config.symbol_size)
+            self.setSymbol(self.config.symbol)
+
+    def set_data(self, x, y):
+        if self.config.source == "custom":
+            self.setData(x, y)
+        else:
+            raise ValueError(f"Source {self.config.source} do not allow custom data setting.")
+
+    def set(self, **kwargs):
+        """
+        Set the properties of the curve.
+
+        Args:
+            **kwargs: Keyword arguments for the properties to be set.
+
+        Possible properties:
+            - color: str
+            - symbol: str
+            - symbol_color: str
+            - symbol_size: int
+            - pen_width: int
+            - pen_style: Literal["solid", "dash", "dot", "dashdot"]
+        """
+
+        # Mapping of keywords to setter methods
+        method_map = {
+            "color": self.set_color,
+            "colormap": self.set_colormap,
+            "symbol": self.set_symbol,
+            "symbol_color": self.set_symbol_color,
+            "symbol_size": self.set_symbol_size,
+            "pen_width": self.set_pen_width,
+            "pen_style": self.set_pen_style,
+        }
+        for key, value in kwargs.items():
+            if key in method_map:
+                method_map[key](value)
+            else:
+                print(f"Warning: '{key}' is not a recognized property.")
+
+    def set_color(self, color: str, symbol_color: Optional[str] = None):
+        """
+        Change the color of the curve.
+
+        Args:
+            color(str): Color of the curve.
+            symbol_color(str, optional): Color of the symbol. Defaults to None.
+        """
+        self.config.color = color
+        self.config.symbol_color = symbol_color or color
+        self.apply_config()
+
+    def set_symbol(self, symbol: str):
+        """
+        Change the symbol of the curve.
+
+        Args:
+            symbol(str): Symbol of the curve.
+        """
+        self.config.symbol = symbol
+        self.apply_config()
+
+    def set_symbol_color(self, symbol_color: str):
+        """
+        Change the symbol color of the curve.
+
+        Args:
+            symbol_color(str): Color of the symbol.
+        """
+        self.config.symbol_color = symbol_color
+        self.apply_config()
+
+    def set_symbol_size(self, symbol_size: int):
+        """
+        Change the symbol size of the curve.
+
+        Args:
+            symbol_size(int): Size of the symbol.
+        """
+        self.config.symbol_size = symbol_size
+        self.apply_config()
+
+    def set_pen_width(self, pen_width: int):
+        """
+        Change the pen width of the curve.
+
+        Args:
+            pen_width(int): Width of the pen.
+        """
+        self.config.pen_width = pen_width
+        self.apply_config()
+
+    def set_pen_style(self, pen_style: Literal["solid", "dash", "dot", "dashdot"]):
+        """
+        Change the pen style of the curve.
+
+        Args:
+            pen_style(Literal["solid", "dash", "dot", "dashdot"]): Style of the pen.
+        """
+        self.config.pen_style = pen_style
+        self.apply_config()
+
+    def set_colormap(self, colormap: str):
+        """
+        Set the colormap for the scatter plot z gradient.
+
+        Args:
+            colormap(str): Colormap for the scatter plot.
+        """
+        self.config.colormap = colormap
+
+    def get_data(self) -> tuple[np.ndarray, np.ndarray]:
+        """
+        Get the data of the curve.
+        Returns:
+            tuple[np.ndarray,np.ndarray]: X and Y data of the curve.
+        """
+        x_data, y_data = self.getData()
+        return x_data, y_data
+
+    def remove(self):
+        """Remove the curve from the plot."""
+        self.parent_item.removeItem(self)
+        self.cleanup()

bec_widgets/widgets/monitor/__init__.py

@@ -1 +0,0 @@
-from .monitor import BECMonitor

bec_widgets/widgets/monitor/config_dialog.py

@@ -1,574 +0,0 @@
-import os
-
-from pydantic import ValidationError
-from qtpy import uic
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtWidgets import (
-    QApplication,
-    QLineEdit,
-    QMessageBox,
-    QTableWidget,
-    QTableWidgetItem,
-    QTabWidget,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.yaml_dialog import load_yaml, save_yaml
-from bec_widgets.validation import MonitorConfigValidator
-
-current_path = os.path.dirname(__file__)
-Ui_Form, BaseClass = uic.loadUiType(os.path.join(current_path, "config_dialog.ui"))
-Tab_Ui_Form, Tab_BaseClass = uic.loadUiType(os.path.join(current_path, "tab_template.ui"))
-
-# test configs for demonstration purpose
-
-# Configuration for default mode when only devices are monitored
-CONFIG_DEFAULT = {
-    "plot_settings": {
-        "background_color": "black",
-        "num_columns": 1,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor Y",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                }
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [
-                            {"name": "gauss_bpm"},
-                            {"name": "gauss_adc1"},
-                            {"name": "gauss_adc2"},
-                        ],
-                    },
-                }
-            ],
-        },
-    ],
-}
-
-# Configuration which is dynamically changing depending on the scan type
-CONFIG_SCAN_MODE = {
-    "plot_settings": {
-        "background_color": "white",
-        "num_columns": 3,
-        "colormap": "plasma",
-        "scan_types": True,
-    },
-    "plot_data": {
-        "grid_scan": [
-            {
-                "plot_name": "Grid plot 1",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 2",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 3",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "gauss_adc2"}]},
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 4",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samy", "entry": "samy"}],
-                            "y": [{"name": "gauss_adc3"}],
-                        },
-                    }
-                ],
-            },
-        ],
-        "line_scan": [
-            {
-                "plot_name": "BPM plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Gauss plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-        ],
-    },
-}
-
-
-class ConfigDialog(QWidget, Ui_Form):
-    config_updated = pyqtSignal(dict)
-
-    def __init__(self, client=None, default_config=None, skip_validation: bool = False):
-        super(ConfigDialog, self).__init__()
-        self.setupUi(self)
-
-        # Client
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.dev = self.client.device_manager.devices
-
-        # Init validator
-        self.skip_validation = skip_validation
-        if self.skip_validation is False:
-            self.validator = MonitorConfigValidator(self.dev)
-
-        # Connect the Ok/Apply/Cancel buttons
-        self.pushButton_ok.clicked.connect(self.apply_and_close)
-        self.pushButton_apply.clicked.connect(self.apply_config)
-        self.pushButton_cancel.clicked.connect(self.close)
-
-        # Hook signals top level
-        self.pushButton_new_scan_type.clicked.connect(
-            lambda: self.generate_empty_scan_tab(
-                self.tabWidget_scan_types, self.lineEdit_scan_type.text()
-            )
-        )
-
-        # Load/save yaml file buttons
-        self.pushButton_import.clicked.connect(self.load_config_from_yaml)
-        self.pushButton_export.clicked.connect(self.save_config_to_yaml)
-
-        # Scan Types changed
-        self.comboBox_scanTypes.currentIndexChanged.connect(self._init_default)
-
-        # Make scan tabs closable
-        self.tabWidget_scan_types.tabCloseRequested.connect(self.handle_tab_close_request)
-
-        # Init functions to make a default dialog
-        if default_config is None:
-            self._init_default()
-        else:
-            self.load_config(default_config)
-
-    def _init_default(self):
-        """Init default dialog"""
-
-        if self.comboBox_scanTypes.currentText() == "Disabled":  # Default mode
-            self.add_new_scan_tab(self.tabWidget_scan_types, "Default")
-            self.add_new_plot_tab(self.tabWidget_scan_types.widget(0))
-            self.pushButton_new_scan_type.setEnabled(False)
-            self.lineEdit_scan_type.setEnabled(False)
-        else:  # Scan mode with clear tab
-            self.pushButton_new_scan_type.setEnabled(True)
-            self.lineEdit_scan_type.setEnabled(True)
-            self.tabWidget_scan_types.clear()
-
-    def add_new_scan_tab(
-        self, parent_tab: QTabWidget, scan_name: str, closable: bool = False
-    ) -> QWidget:
-        """
-        Add a new scan tab to the parent tab widget
-
-        Args:
-            parent_tab(QTabWidget): Parent tab widget, where to add scan tab
-            scan_name(str): Scan name
-            closable(bool): If True, the scan tab will be closable
-
-        Returns:
-            scan_tab(QWidget): Scan tab widget
-        """
-        # Check for an existing tab with the same name
-        for index in range(parent_tab.count()):
-            if parent_tab.tabText(index) == scan_name:
-                print(f'Scan name "{scan_name}" already exists.')
-                return None  # or return the existing tab: return parent_tab.widget(index)
-
-        # Create a new scan tab
-        scan_tab = QWidget()
-        scan_tab_layout = QVBoxLayout(scan_tab)
-
-        # Set a tab widget for plots
-        tabWidget_plots = QTabWidget()
-        tabWidget_plots.setObjectName("tabWidget_plots")  # TODO decide if needed to give a name
-        tabWidget_plots.setTabsClosable(True)
-        tabWidget_plots.tabCloseRequested.connect(self.handle_tab_close_request)
-        scan_tab_layout.addWidget(tabWidget_plots)
-
-        # Add scan tab
-        parent_tab.addTab(scan_tab, scan_name)
-
-        # Make tabs closable
-        if closable:
-            parent_tab.setTabsClosable(closable)
-
-        return scan_tab
-
-    def add_new_plot_tab(self, scan_tab: QWidget) -> QWidget:
-        """
-        Add a new plot tab to the scan tab
-
-        Args:
-            scan_tab (QWidget): Scan tab widget
-
-        Returns:
-            plot_tab (QWidget): Plot tab
-        """
-
-        # Create a new plot tab from .ui template
-        plot_tab = QWidget()
-        plot_tab_ui = Tab_Ui_Form()
-        plot_tab_ui.setupUi(plot_tab)
-        plot_tab.ui = plot_tab_ui
-
-        # Add plot to current scan tab
-        tabWidget_plots = scan_tab.findChild(
-            QTabWidget, "tabWidget_plots"
-        )  # TODO decide if putting name is needed
-        plot_name = f"Plot {tabWidget_plots.count() + 1}"
-        tabWidget_plots.addTab(plot_tab, plot_name)
-
-        # Hook signal
-        self.hook_plot_tab_signals(scan_tab=scan_tab, plot_tab=plot_tab.ui)
-
-        return plot_tab
-
-    def hook_plot_tab_signals(self, scan_tab: QTabWidget, plot_tab: Tab_Ui_Form) -> None:
-        """
-        Hook signals of the plot tab
-        Args:
-            scan_tab(QTabWidget): Scan tab widget
-            plot_tab(Tab_Ui_Form): Plot tab widget
-        """
-        plot_tab.pushButton_add_new_plot.clicked.connect(
-            lambda: self.add_new_plot_tab(scan_tab=scan_tab)
-        )
-        plot_tab.pushButton_y_new.clicked.connect(
-            lambda: self.add_new_signal(plot_tab.tableWidget_y_signals)
-        )
-
-    def add_new_signal(self, table: QTableWidget) -> None:
-        """
-        Add a new signal to the table
-
-        Args:
-            table(QTableWidget): Table widget
-        """
-
-        row_position = table.rowCount()
-        table.insertRow(row_position)
-        table.setItem(row_position, 0, QTableWidgetItem(""))
-        table.setItem(row_position, 1, QTableWidgetItem(""))
-
-    def handle_tab_close_request(self, index: int) -> None:
-        """
-        Handle tab close request
-
-        Args:
-            index(int): Index of the tab to be closed
-        """
-
-        parent_tab = self.sender()
-        if parent_tab.count() > 1:  # ensure there is at least one tab
-            parent_tab.removeTab(index)
-
-    def generate_empty_scan_tab(self, parent_tab: QTabWidget, scan_name: str):
-        """
-        Generate an empty scan tab
-
-        Args:
-            parent_tab (QTabWidget): Parent tab widget where to add the scan tab
-            scan_name(str): name of the scan tab
-        """
-
-        scan_tab = self.add_new_scan_tab(parent_tab, scan_name, closable=True)
-        if scan_tab is not None:
-            self.add_new_plot_tab(scan_tab)
-
-    def get_plot_config(self, plot_tab: QWidget) -> dict:
-        """
-        Get plot configuration from the plot tab adn send it as dict
-
-        Args:
-            plot_tab(QWidget): Plot tab widget
-
-        Returns:
-            dict: Plot configuration
-        """
-
-        ui = plot_tab.ui
-        table = ui.tableWidget_y_signals
-
-        x_signals = [
-            {
-                "name": self.safe_text(ui.lineEdit_x_name),
-                "entry": self.safe_text(ui.lineEdit_x_entry),
-            }
-        ]
-
-        y_signals = [
-            {
-                "name": self.safe_text(table.item(row, 0)),
-                "entry": self.safe_text(table.item(row, 1)),
-            }
-            for row in range(table.rowCount())
-        ]
-
-        plot_data = {
-            "plot_name": self.safe_text(ui.lineEdit_plot_title),
-            "x_label": self.safe_text(ui.lineEdit_x_label),
-            "y_label": self.safe_text(ui.lineEdit_y_label),
-            "sources": [{"type": "scan_segment", "signals": {"x": x_signals, "y": y_signals}}],
-        }
-
-        return plot_data
-
-    def apply_config(self) -> dict:
-        """
-        Apply configuration from the whole configuration window
-
-        Returns:
-            dict: Current configuration
-
-        """
-
-        # General settings
-        config = {
-            "plot_settings": {
-                "background_color": self.comboBox_appearance.currentText(),
-                "num_columns": self.spinBox_n_column.value(),
-                "colormap": self.comboBox_colormap.currentText(),
-                "scan_types": True if self.comboBox_scanTypes.currentText() == "Enabled" else False,
-            },
-            "plot_data": {} if self.comboBox_scanTypes.currentText() == "Enabled" else [],
-        }
-
-        # Iterate through the plot tabs - Device monitor mode
-        if config["plot_settings"]["scan_types"] == False:
-            plot_tab = self.tabWidget_scan_types.widget(0).findChild(QTabWidget)
-            for index in range(plot_tab.count()):
-                plot_data = self.get_plot_config(plot_tab.widget(index))
-                config["plot_data"].append(plot_data)
-
-        # Iterate through the scan tabs - Scan mode
-        elif config["plot_settings"]["scan_types"] == True:
-            # Iterate through the scan tabs
-            for index in range(self.tabWidget_scan_types.count()):
-                scan_tab = self.tabWidget_scan_types.widget(index)
-                scan_name = self.tabWidget_scan_types.tabText(index)
-                plot_tab = scan_tab.findChild(QTabWidget)
-                config["plot_data"][scan_name] = []
-                # Iterate through the plot tabs
-                for index in range(plot_tab.count()):
-                    plot_data = self.get_plot_config(plot_tab.widget(index))
-                    config["plot_data"][scan_name].append(plot_data)
-
-        return config
-
-    def load_config(self, config: dict) -> None:
-        """
-        Load configuration to the configuration window
-
-        Args:
-            config(dict): Configuration to be loaded
-        """
-
-        # Plot setting General box
-        plot_settings = config.get("plot_settings", {})
-
-        self.comboBox_appearance.setCurrentText(plot_settings.get("background_color", "black"))
-        self.spinBox_n_column.setValue(plot_settings.get("num_columns", 1))
-        self.comboBox_colormap.setCurrentText(
-            plot_settings.get("colormap", "magma")
-        )  # TODO make logic to allow also different colormaps -> validation of incoming dict
-        self.comboBox_scanTypes.setCurrentText(
-            "Enabled" if plot_settings.get("scan_types", False) else "Disabled"
-        )
-
-        # Clear exiting scan tabs
-        self.tabWidget_scan_types.clear()
-
-        # Get what mode is active - scan vs default device monitor
-        scan_mode = plot_settings.get("scan_types", False)
-
-        if scan_mode is False:  # default mode:
-            plot_data = config.get("plot_data", [])
-            self.add_new_scan_tab(self.tabWidget_scan_types, "Default")
-            for plot_config in plot_data:  # Create plot tab for each plot and populate GUI
-                plot = self.add_new_plot_tab(self.tabWidget_scan_types.widget(0))
-                self.load_plot_setting(plot, plot_config)
-        elif scan_mode is True:  # scan mode
-            plot_data = config.get("plot_data", {})
-            for scan_name, scan_config in plot_data.items():
-                scan_tab = self.add_new_scan_tab(self.tabWidget_scan_types, scan_name)
-                for plot_config in scan_config:
-                    plot = self.add_new_plot_tab(scan_tab)
-                    self.load_plot_setting(plot, plot_config)
-
-    def load_plot_setting(self, plot: QWidget, plot_config: dict) -> None:
-        """
-        Load plot setting from config
-
-        Args:
-            plot (QWidget): plot tab widget
-            plot_config (dict): config for single plot tab
-        """
-        sources = plot_config.get("sources", [{}])[0]
-        x_signals = sources.get("signals", {}).get("x", [{}])[0]
-        y_signals = sources.get("signals", {}).get("y", [])
-
-        # LabelBox
-        plot.ui.lineEdit_plot_title.setText(plot_config.get("plot_name", ""))
-        plot.ui.lineEdit_x_label.setText(plot_config.get("x_label", ""))
-        plot.ui.lineEdit_y_label.setText(plot_config.get("y_label", ""))
-
-        # X axis
-        plot.ui.lineEdit_x_name.setText(x_signals.get("name", ""))
-        plot.ui.lineEdit_x_entry.setText(x_signals.get("entry", ""))
-
-        # Y axis
-        for y_signal in y_signals:
-            row_position = plot.ui.tableWidget_y_signals.rowCount()
-            plot.ui.tableWidget_y_signals.insertRow(row_position)
-            plot.ui.tableWidget_y_signals.setItem(
-                row_position, 0, QTableWidgetItem(y_signal.get("name", ""))
-            )
-            plot.ui.tableWidget_y_signals.setItem(
-                row_position, 1, QTableWidgetItem(y_signal.get("entry", ""))
-            )
-
-    def load_config_from_yaml(self):
-        """
-        Load configuration from yaml file
-        """
-        config = load_yaml(self)
-        self.load_config(config)
-
-    def save_config_to_yaml(self):
-        """
-        Save configuration to yaml file
-        """
-        config = self.apply_config()
-        save_yaml(self, config)
-
-    @staticmethod
-    def safe_text(line_edit: QLineEdit) -> str:
-        """
-        Get text from a line edit, if it is None, return empty string
-        Args:
-            line_edit(QLineEdit): Line edit widget
-
-        Returns:
-            str: Text from the line edit
-        """
-        return "" if line_edit is None else line_edit.text()
-
-    def apply_and_close(self):
-        new_config = self.apply_config()
-        if self.skip_validation is True:
-            self.config_updated.emit(new_config)
-            self.close()
-        else:
-            try:
-                validated_config = self.validator.validate_monitor_config(new_config)
-                approved_config = validated_config.model_dump()
-                self.config_updated.emit(approved_config)
-                self.close()
-            except ValidationError as e:
-                error_str = str(e)
-                formatted_error_message = ConfigDialog.format_validation_error(error_str)
-
-                # Display the formatted error message in a popup
-                QMessageBox.critical(self, "Configuration Error", formatted_error_message)
-
-    @staticmethod
-    def format_validation_error(error_str: str) -> str:
-        """
-        Format the validation error string to be displayed in a popup.
-        Args:
-            error_str(str): Error string from the validation error.
-        """
-        error_lines = error_str.split("\n")
-        # The first line contains the number of errors.
-        error_header = f"<p><b>{error_lines[0]}</b></p><hr>"
-
-        formatted_error_message = error_header
-        # Skip the first line as it's the header.
-        error_details = error_lines[1:]
-
-        # Iterate through pairs of lines (each error's two lines).
-        for i in range(0, len(error_details), 2):
-            location = error_details[i]
-            message = error_details[i + 1] if i + 1 < len(error_details) else ""
-
-            formatted_error_message += f"<p><b>{location}</b><br>{message}</p><hr>"
-
-        return formatted_error_message
-
-
-if __name__ == "__main__":  # pragma: no cover
-    app = QApplication([])
-    main_app = ConfigDialog()
-    main_app.show()
-    main_app.load_config(CONFIG_SCAN_MODE)
-    app.exec()

bec_widgets/widgets/monitor/config_dialog.ui

@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>597</width>
-    <height>769</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Plot Configuration</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QGroupBox" name="groupBox_plot_setting">
-       <property name="title">
-        <string>Plot Layout Settings</string>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Number of Columns</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_6">
-            <property name="text">
-             <string>Scan Types</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QPushButton" name="pushButton_new_scan_type">
-            <property name="text">
-             <string>New Scan Type</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="comboBox_scanTypes">
-            <item>
-             <property name="text">
-              <string>Disabled</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Enabled</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="spinBox_n_column">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="lineEdit_scan_type"/>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="Line" name="line">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Appearance</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboBox_appearance">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <item>
-             <property name="text">
-              <string>black</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>white</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Default Color Palette</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboBox_colormap">
-            <item>
-             <property name="text">
-              <string>magma</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>plasma</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>viridis</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>reds</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_config">
-       <property name="title">
-        <string>Configuration</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QPushButton" name="pushButton_import">
-          <property name="text">
-           <string>Import</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_export">
-          <property name="text">
-           <string>Export</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tabWidget_scan_types">
-     <property name="tabPosition">
-      <enum>QTabWidget::West</enum>
-     </property>
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>-1</number>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="confirm_layout">
-     <item>
-      <widget class="QPushButton" name="pushButton_cancel">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton_apply">
-       <property name="text">
-        <string>Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton_ok">
-       <property name="text">
-        <string>OK</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

bec_widgets/widgets/monitor/example_configs/config_device.yaml

@@ -1,60 +0,0 @@
-plot_settings:
-  background_color: "black"
-  num_columns: 2
-  colormap: "viridis"
-  scan_types: False
-
-plot_data:
-  - plot_name: "BPM4i plots vs samy"
-    x:
-      label: 'Motor Y'
-      signals:
-        - name: "samy"
-          entry: "samy"
-    y:
-      label: 'bpm4i'
-      signals:
-        - name: "bpm4i"
-          entry: "bpm4i"
-
-  - plot_name: "BPM4i plots vs samx"
-    x:
-      label: 'Motor X'
-      signals:
-        - name: "samx"
-          entry: "samx"
-    y:
-      label: 'bpm6b'
-      signals:
-        - name: "bpm6b"
-          entry: "bpm6b"
-        - name: "samy"
-          entry: "samy"
-
-  - plot_name: "Multiple Gaussian"
-    x:
-      label: 'Motor X'
-      signals:
-        - name: "samx"
-          entry: "samx"
-    y:
-      label: 'Gauss ADC'
-      signals:
-        - name: "gauss_adc1"
-          entry: "gauss_adc1"
-        - name: "gauss_adc2"
-          entry: "gauss_adc2"
-        - name: "gauss_adc3"
-          entry: "gauss_adc3"
-
-  - plot_name: "Linear Signals"
-    x:
-      label: 'Motor X'
-      signals:
-        - name: "samy"
-          entry: "samy"
-    y:
-      label: 'Motor Y'
-      signals:
-        - name: "samy"
-          entry: "samy"

bec_widgets/widgets/monitor/example_configs/config_scans.yaml

@@ -1,92 +0,0 @@
-plot_settings:
-  background_color: "black"
-  num_columns: 2
-  colormap: "plasma"
-  scan_types: True
-
-plot_data:
-  line_scan:
-
-    - plot_name: "BPM plot"
-      x:
-        label: 'Motor X'
-        signals:
-          - name: "samx"
-            entry: "samx"
-      y:
-        label: 'BPM'
-        signals:
-          - name: "gauss_bpm"
-            entry: "gauss_bpm"
-          - name: "gauss_adc1"
-            entry: "gauss_adc1"
-          - name: "gauss_adc2"
-            entry: "gauss_adc2"
-
-    - plot_name: "Multi"
-      x:
-        label: 'Motor X'
-        signals:
-          - name: "samx"
-            entry: "samx"
-      y:
-        label: 'Multi'
-        signals:
-          - name: "gauss_bpm"
-            entry: "gauss_bpm"
-          - name: "samx"
-            entry: "samx"
-
-  grid_scan:
-    - plot_name: "Grid plot 1"
-      x:
-        label: 'Motor X'
-        signals:
-          - name: "samx"
-            entry: "samx"
-      y:
-        label: 'BPM'
-        signals:
-          - name: "gauss_bpm"
-            entry: "gauss_bpm"
-          - name: "gauss_adc1"
-            entry: "gauss_adc1"
-
-    - plot_name: "Grid plot 2"
-      x:
-        label: 'Motor X'
-        signals:
-          - name: "samx"
-            entry: "samx"
-      y:
-        label: 'BPM'
-        signals:
-          - name: "gauss_bpm"
-            entry: "gauss_bpm"
-          - name: "gauss_adc1"
-            entry: "gauss_adc1"
-
-    - plot_name: "Grid plot 3"
-      x:
-        label: 'Motor Y'
-        signals:
-          - name: "samy"
-            entry: "samy"
-      y:
-        label: 'BPM'
-        signals:
-          - name: "gauss_bpm"
-            entry: "gauss_bpm"
-
-    - plot_name: "Grid plot 4"
-      x:
-        label: 'Motor Y'
-        signals:
-          - name: "samy"
-            entry: "samy"
-      y:
-        label: 'BPM'
-        signals:
-          - name: "gauss_adc3"
-            entry: "gauss_adc3"
-

bec_widgets/widgets/monitor/monitor.py

@@ -1,845 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring
-import time
-
-import pyqtgraph as pg
-from bec_lib.endpoints import MessageEndpoints
-from pydantic import ValidationError
-from pyqtgraph import mkBrush, mkPen
-from qtpy import QtCore
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QApplication, QMessageBox
-
-from bec_widgets.utils import Colors, Crosshair, yaml_dialog
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.validation import MonitorConfigValidator
-from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
-
-# just for demonstration purposes if script run directly
-CONFIG_SCAN_MODE = {
-    "plot_settings": {
-        "background_color": "white",
-        "num_columns": 3,
-        "colormap": "plasma",
-        "scan_types": True,
-    },
-    "plot_data": {
-        "grid_scan": [
-            {
-                "plot_name": "Grid plot 1",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 2",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 3",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "bpm4i"}]},
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 4",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samy", "entry": "samy"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-        ],
-        "line_scan": [
-            {
-                "plot_name": "BPM plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Gauss plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}, {"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-        ],
-    },
-}
-
-
-CONFIG_WRONG = {
-    "plot_settings": {
-        "background_color": "black",
-        "num_columns": 2,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor Y",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "non_existing_source",
-                    "signals": {
-                        "x": [{"name": "samy"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                },
-                {
-                    "type": "history",
-                    "scan_id": "<scan_id>",
-                    "signals": {
-                        "x": [{"name": "samy"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                },
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "non_sense_entry"}],
-                        "y": [
-                            {"name": "non_existing_name"},
-                            {"name": "samy", "entry": "non_existing_entry"},
-                        ],
-                    },
-                }
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "samx"}, {"name": "samy", "entry": "samx"}],
-                    }
-                }
-            ],
-        },
-    ],
-}
-
-
-CONFIG_SIMPLE = {
-    "plot_settings": {
-        "background_color": "black",
-        "num_columns": 2,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                },
-                # {
-                #     "type": "history",
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-                # {
-                #     "type": "dap",
-                #     'worker':'some_worker',
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "bpm4i"}, {"name": "bpm4i"}],
-                    },
-                }
-            ],
-        },
-    ],
-}
-
-CONFIG_REDIS = {
-    "plot_settings": {
-        "background_color": "white",
-        "axis_width": 2,
-        "num_columns": 5,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor Y",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {"x": [{"name": "samx"}], "y": [{"name": "gauss_bpm"}]},
-                },
-                {
-                    "type": "redis",
-                    "endpoint": "public/gui/data/6cd5ea3f-a9a9-4736-b4ed-74ab9edfb996",
-                    "update": "append",
-                    "signals": {"x": [{"name": "x_default_tag"}], "y": [{"name": "y_default_tag"}]},
-                },
-            ],
-        }
-    ],
-}
-
-
-class BECMonitor(pg.GraphicsLayoutWidget):
-    update_signal = pyqtSignal()
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: dict = None,
-        enable_crosshair: bool = True,
-        gui_id=None,
-        skip_validation: bool = False,
-    ):
-        super().__init__(parent=parent)
-
-        # Client and device manager from BEC
-        self.plot_data = None
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.dev = self.client.device_manager.devices
-        self.queue = self.client.queue
-
-        self.validator = MonitorConfigValidator(self.dev)
-        self.gui_id = gui_id
-
-        if self.gui_id is None:
-            self.gui_id = self.__class__.__name__ + str(time.time())
-
-        # Connect slots dispatcher
-        bec_dispatcher.connect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
-        bec_dispatcher.connect_slot(self.on_config_update, MessageEndpoints.gui_config(self.gui_id))
-        bec_dispatcher.connect_slot(
-            self.on_instruction, MessageEndpoints.gui_instructions(self.gui_id)
-        )
-        bec_dispatcher.connect_slot(self.on_data_from_redis, MessageEndpoints.gui_data(self.gui_id))
-
-        # Current configuration
-        self.config = config
-        self.skip_validation = skip_validation
-
-        # Enable crosshair
-        self.enable_crosshair = enable_crosshair
-
-        # Displayed Data
-        self.database = None
-
-        self.crosshairs = None
-        self.plots = None
-        self.curves_data = None
-        self.grid_coordinates = None
-        self.scan_id = None
-
-        # TODO make colors accessible to users
-        self.user_colors = {}  # key: (plot_name, y_name, y_entry), value: color
-
-        # Connect the update signal to the update plot method
-        self.proxy_update_plot = pg.SignalProxy(
-            self.update_signal, rateLimit=25, slot=self.update_scan_segment_plot
-        )
-
-        # Init UI
-        if self.config is None:
-            print("No initial config found for BECDeviceMonitor")
-        else:
-            self.on_config_update(self.config)
-
-    def _init_config(self):
-        """
-        Initializes or update the configuration settings for the PlotApp.
-        """
-
-        # Separate configs
-        self.plot_settings = self.config.get("plot_settings", {})
-        self.plot_data_config = self.config.get("plot_data", {})
-        self.scan_types = self.plot_settings.get("scan_types", False)
-
-        if self.scan_types is False:  # Device tracking mode
-            self.plot_data = self.plot_data_config  # TODO logic has to be improved
-        else:  # without incoming data setup the first configuration to the first scan type sorted alphabetically by name
-            self.plot_data = self.plot_data_config[min(list(self.plot_data_config.keys()))]
-
-        # Initialize the database
-        self.database = self._init_database(self.plot_data)
-
-        # Initialize the UI
-        self._init_ui(self.plot_settings["num_columns"])
-
-        if self.scan_id is not None:
-            self.replot_last_scan()
-
-    def _init_database(self, plot_data_config: dict, source_type_to_init=None) -> dict:
-        """
-        Initializes or updates the database for the PlotApp.
-        Args:
-            plot_data_config(dict): Configuration settings for plots.
-            source_type_to_init(str, optional): Specific source type to initialize. If None, initialize all.
-        Returns:
-            dict: Updated or new database dictionary.
-        """
-        database = {} if source_type_to_init is None else self.database.copy()
-
-        for plot in plot_data_config:
-            for source in plot["sources"]:
-                source_type = source["type"]
-                if source_type_to_init and source_type != source_type_to_init:
-                    continue  # Skip if not the specified source type
-
-                if source_type not in database:
-                    database[source_type] = {}
-
-                for axis, signals in source["signals"].items():
-                    for signal in signals:
-                        name = signal["name"]
-                        entry = signal.get("entry", name)
-                        if name not in database[source_type]:
-                            database[source_type][name] = {}
-                        if entry not in database[source_type][name]:
-                            database[source_type][name][entry] = []
-
-        return database
-
-    def _init_ui(self, num_columns: int = 3) -> None:
-        """
-        Initialize the UI components, create plots and store their grid positions.
-
-        Args:
-            num_columns (int): Number of columns to wrap the layout.
-
-        This method initializes a dictionary `self.plots` to store the plot objects
-        along with their corresponding x and y signal names. It dynamically arranges
-        the plots in a grid layout based on the given number of columns and dynamically
-        stretches the last plots to fit the remaining space.
-        """
-        self.clear()
-        self.plots = {}
-        self.grid_coordinates = []
-
-        num_plots = len(self.plot_data)
-
-        # Check if num_columns exceeds the number of plots
-        if num_columns >= num_plots:
-            num_columns = num_plots
-            self.plot_settings["num_columns"] = num_columns  # Update the settings
-            print(
-                "Warning: num_columns in the YAML file was greater than the number of plots."
-                f" Resetting num_columns to number of plots:{num_columns}."
-            )
-        else:
-            self.plot_settings["num_columns"] = num_columns  # Update the settings
-
-        num_rows = num_plots // num_columns
-        last_row_cols = num_plots % num_columns
-        remaining_space = num_columns - last_row_cols
-
-        for i, plot_config in enumerate(self.plot_data):
-            row, col = i // num_columns, i % num_columns
-            colspan = 1
-
-            if row == num_rows and remaining_space > 0:
-                if last_row_cols == 1:
-                    colspan = num_columns
-                else:
-                    colspan = remaining_space // last_row_cols + 1
-                    remaining_space -= colspan - 1
-                    last_row_cols -= 1
-
-            plot_name = plot_config.get("plot_name", "")
-
-            x_label = plot_config.get("x_label", "")
-            y_label = plot_config.get("y_label", "")
-
-            plot = self.addPlot(row=row, col=col, colspan=colspan, title=plot_name)
-            plot.setLabel("bottom", x_label)
-            plot.setLabel("left", y_label)
-            plot.addLegend()
-            self._set_plot_colors(plot, self.plot_settings)
-
-            self.plots[plot_name] = plot
-            self.grid_coordinates.append((row, col))
-
-        # Initialize curves
-        self.init_curves()
-
-    def _set_plot_colors(self, plot: pg.PlotItem, plot_settings: dict) -> None:
-        """
-        Set the plot colors based on the plot config.
-
-        Args:
-            plot (pg.PlotItem): Plot object to set the colors.
-            plot_settings (dict): Plot settings dictionary.
-        """
-        if plot_settings.get("show_grid", False):
-            plot.showGrid(x=True, y=True, alpha=0.5)
-        pen_width = plot_settings.get("axis_width")
-        color = plot_settings.get("axis_color")
-        if color is None:
-            if plot_settings["background_color"].lower() == "black":
-                color = "w"
-                self.setBackground("k")
-            elif plot_settings["background_color"].lower() == "white":
-                color = "k"
-                self.setBackground("w")
-            else:
-                raise ValueError(
-                    f"Invalid background color {plot_settings['background_color']}. Allowed values"
-                    " are 'white' or 'black'."
-                )
-        pen = pg.mkPen(color=color, width=pen_width)
-        x_axis = plot.getAxis("bottom")  # 'bottom' corresponds to the x-axis
-        x_axis.setPen(pen)
-        x_axis.setTextPen(pen)
-        x_axis.setTickPen(pen)
-
-        y_axis = plot.getAxis("left")  # 'left' corresponds to the y-axis
-        y_axis.setPen(pen)
-        y_axis.setTextPen(pen)
-        y_axis.setTickPen(pen)
-
-    def init_curves(self) -> None:
-        """
-        Initialize curve data and properties for each plot and data source.
-        """
-        self.curves_data = {}
-
-        for idx, plot_config in enumerate(self.plot_data):
-            plot_name = plot_config.get("plot_name", "")
-            plot = self.plots[plot_name]
-            plot.clear()
-
-            for source in plot_config["sources"]:
-                source_type = source["type"]
-                y_signals = source["signals"].get("y", [])
-                colors_ys = Colors.golden_angle_color(
-                    colormap=self.plot_settings["colormap"], num=len(y_signals)
-                )
-
-                if source_type not in self.curves_data:
-                    self.curves_data[source_type] = {}
-                if plot_name not in self.curves_data[source_type]:
-                    self.curves_data[source_type][plot_name] = []
-
-                for i, (y_signal, color) in enumerate(zip(y_signals, colors_ys)):
-                    y_name = y_signal["name"]
-                    y_entry = y_signal.get("entry", y_name)
-                    curve_name = f"{y_name} ({y_entry})-{source_type[0].upper()}"
-                    curve_data = self.create_curve(curve_name, color)
-                    plot.addItem(curve_data)
-                    self.curves_data[source_type][plot_name].append((y_name, y_entry, curve_data))
-
-        # Render static plot elements
-        self.update_plot()
-        # # Hook Crosshair #TODO enable later, currently not working
-        if self.enable_crosshair is True:
-            self.hook_crosshair()
-
-    def create_curve(self, curve_name: str, color: str) -> pg.PlotDataItem:
-        """
-        Create
-        Args:
-            curve_name: Name of the curve
-            color(str): Color of the curve
-
-        Returns:
-            pg.PlotDataItem: Assigned curve object
-        """
-        user_color = self.user_colors.get(curve_name, None)
-        color_to_use = user_color if user_color else color
-        pen_curve = mkPen(color=color_to_use, width=2, style=QtCore.Qt.DashLine)
-        brush_curve = mkBrush(color=color_to_use)
-
-        return pg.PlotDataItem(
-            symbolSize=5,
-            symbolBrush=brush_curve,
-            pen=pen_curve,
-            skipFiniteCheck=True,
-            name=curve_name,
-        )
-
-    def hook_crosshair(self) -> None:
-        """Hook the crosshair to all plots."""
-        # TODO can be extended to hook crosshair signal for mouse move/clicked
-        self.crosshairs = {}
-        for plot_name, plot in self.plots.items():
-            crosshair = Crosshair(plot, precision=3)
-            self.crosshairs[plot_name] = crosshair
-
-    def update_scan_segment_plot(self):
-        """
-        Update the plot with the latest scan segment data.
-        """
-        self.update_plot(source_type="scan_segment")
-
-    def update_plot(self, source_type=None) -> None:
-        """
-        Update the plot data based on the stored data dictionary.
-        Only updates data for the specified source_type if provided.
-        """
-        for src_type, plots in self.curves_data.items():
-            if source_type and src_type != source_type:
-                continue
-
-            for plot_name, curve_list in plots.items():
-                plot_config = next(
-                    (pc for pc in self.plot_data if pc.get("plot_name") == plot_name), None
-                )
-                if not plot_config:
-                    continue
-
-                x_name, x_entry = self.extract_x_config(plot_config, src_type)
-
-                for y_name, y_entry, curve in curve_list:
-                    data_x = self.database.get(src_type, {}).get(x_name, {}).get(x_entry, [])
-                    data_y = self.database.get(src_type, {}).get(y_name, {}).get(y_entry, [])
-                    curve.setData(data_x, data_y)
-
-    def extract_x_config(self, plot_config: dict, source_type: str) -> tuple:
-        """Extract the signal configurations for x and y axes from plot_config.
-        Args:
-            plot_config (dict): Plot configuration.
-        Returns:
-            tuple: Tuple containing the x name and x entry.
-        """
-        x_name, x_entry = None, None
-
-        for source in plot_config["sources"]:
-            if source["type"] == source_type and "x" in source["signals"]:
-                x_signal = source["signals"]["x"][0]
-                x_name = x_signal.get("name")
-                x_entry = x_signal.get("entry", x_name)
-                return x_name, x_entry
-
-    def get_config(self):
-        """Return the current configuration settings."""
-        return self.config
-
-    def show_config_dialog(self):
-        """Show the configuration dialog."""
-
-        dialog = ConfigDialog(
-            client=self.client, default_config=self.config, skip_validation=self.skip_validation
-        )
-        dialog.config_updated.connect(self.on_config_update)
-        dialog.show()
-
-    def update_client(self, client) -> None:
-        """Update the client and device manager from BEC.
-        Args:
-            client: BEC client
-        """
-        self.client = client
-        self.dev = self.client.device_manager.devices
-
-    def _close_all_plots(self):
-        """Close all plots."""
-        for plot in self.plots.values():
-            plot.clear()
-
-    @pyqtSlot(dict)
-    def on_instruction(self, msg_content: dict) -> None:
-        """
-        Handle instructions sent to the GUI.
-        Possible actions are:
-            - clear: Clear the plots
-            - close: Close the GUI
-            - config_dialog: Open the configuration dialog
-
-        Args:
-            msg_content (dict): Message content with the instruction and parameters.
-        """
-        action = msg_content.get("action", None)
-        parameters = msg_content.get("parameters", None)
-
-        if action == "clear":
-            self.flush()
-            self._close_all_plots()
-        elif action == "close":
-            self.close()
-        elif action == "config_dialog":
-            self.show_config_dialog()
-        else:
-            print(f"Unknown instruction received: {msg_content}")
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Validate and update the configuration settings for the PlotApp.
-        Args:
-            config(dict): Configuration settings
-        """
-        # convert config from BEC CLI to correct formatting
-        config_tag = config.get("config", None)
-        if config_tag is not None:
-            config = config["config"]
-
-        if self.skip_validation is True:
-            self.config = config
-            self._init_config()
-        else:
-            try:
-                validated_config = self.validator.validate_monitor_config(config)
-                self.config = validated_config.model_dump()
-                self._init_config()
-            except ValidationError as e:
-                error_str = str(e)
-                formatted_error_message = BECMonitor.format_validation_error(error_str)
-
-                # Display the formatted error message in a popup
-                QMessageBox.critical(self, "Configuration Error", formatted_error_message)
-
-    @staticmethod
-    def format_validation_error(error_str: str) -> str:
-        """
-        Format the validation error string to be displayed in a popup.
-        Args:
-            error_str(str): Error string from the validation error.
-        """
-        error_lines = error_str.split("\n")
-        # The first line contains the number of errors.
-        error_header = f"<p><b>{error_lines[0]}</b></p><hr>"
-
-        formatted_error_message = error_header
-        # Skip the first line as it's the header.
-        error_details = error_lines[1:]
-
-        # Iterate through pairs of lines (each error's two lines).
-        for i in range(0, len(error_details), 2):
-            location = error_details[i]
-            message = error_details[i + 1] if i + 1 < len(error_details) else ""
-
-            formatted_error_message += f"<p><b>{location}</b><br>{message}</p><hr>"
-
-        return formatted_error_message
-
-    def flush(self, flush_all=False, source_type_to_flush=None) -> None:
-        """Update or reset the database to match the current configuration.
-
-        Args:
-            flush_all (bool): If True, reset the entire database.
-            source_type_to_flush (str): Specific source type to reset. Ignored if flush_all is True.
-        """
-        if flush_all:
-            self.database = self._init_database(self.plot_data)
-            self.init_curves()
-        else:
-            if source_type_to_flush in self.database:
-                # TODO maybe reinit the database from config again instead of cycle through names/entries
-                # Reset only the specified source type
-                for name in self.database[source_type_to_flush]:
-                    for entry in self.database[source_type_to_flush][name]:
-                        self.database[source_type_to_flush][name][entry] = []
-                # Reset curves for the specified source type
-                if source_type_to_flush in self.curves_data:
-                    self.init_curves()
-
-    @pyqtSlot(dict, dict)
-    def on_scan_segment(self, msg: dict, metadata: dict):
-        """
-        Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
-
-        Args:
-            msg (dict): Message received with scan data.
-            metadata (dict): Metadata of the scan.
-        """
-        current_scan_id = msg.get("scan_id", None)
-        if current_scan_id is None:
-            return
-
-        if current_scan_id != self.scan_id:
-            if self.scan_types is False:
-                self.plot_data = self.plot_data_config
-            elif self.scan_types is True:
-                current_name = metadata.get("scan_name")
-                if current_name is None:
-                    raise ValueError(
-                        "Scan name not found in metadata. Please check the scan_name in the YAML"
-                        " config or in bec configuration."
-                    )
-                self.plot_data = self.plot_data_config.get(current_name, None)
-                if not self.plot_data:
-                    raise ValueError(
-                        f"Scan name {current_name} not found in the YAML config. Please check the scan_name in the "
-                        "YAML config or in bec configuration."
-                    )
-
-                # Init UI
-                self._init_ui(self.plot_settings["num_columns"])
-
-            self.scan_id = current_scan_id
-            self.scan_data = self.queue.scan_storage.find_scan_by_ID(self.scan_id)
-            if not self.scan_data:
-                print(f"No data found for scan_id: {self.scan_id}")  # TODO better error
-                return
-            self.flush(source_type_to_flush="scan_segment")
-
-        self.scan_segment_update()
-
-        self.update_signal.emit()
-
-    def scan_segment_update(self):
-        """
-        Update the database with data from scan storage based on the provided scan_id.
-        """
-        scan_data = self.scan_data.data
-        for device_name, device_entries in self.database.get("scan_segment", {}).items():
-            for entry in device_entries.keys():
-                dataset = scan_data[device_name][entry].val
-                if dataset:
-                    self.database["scan_segment"][device_name][entry] = dataset
-                else:
-                    print(f"No data found for {device_name} {entry}")
-
-    def replot_last_scan(self):
-        """
-        Replot the last scan.
-        """
-        self.scan_segment_update()
-        self.update_plot(source_type="scan_segment")
-
-    @pyqtSlot(dict)
-    def on_data_from_redis(self, msg) -> None:
-        """
-        Handle new data sent from redis.
-        Args:
-            msg (dict): Message received with  data.
-        """
-
-        # wait until new config is loaded
-        while "redis" not in self.database:
-            time.sleep(0.1)
-        self._init_database(
-            self.plot_data, source_type_to_init="redis"
-        )  # add database entry for redis dataset
-
-        data = msg.get("data", {})
-        x_data = data.get("x", {})
-        y_data = data.get("y", {})
-
-        # Update x data
-        if x_data:
-            x_tag = x_data.get("tag")
-            self.database["redis"][x_tag][x_tag] = x_data["data"]
-
-        # Update y data
-        for y_tag, y_info in y_data.items():
-            self.database["redis"][y_tag][y_tag] = y_info["data"]
-
-        # Trigger plot update
-        self.update_plot(source_type="redis")
-        print(f"database after: {self.database}")
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import argparse
-    import json
-    import sys
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--config_file", help="Path to the config file.")
-    parser.add_argument("--config", help="Path to the config file.")
-    parser.add_argument("--id", help="GUI ID.")
-    args = parser.parse_args()
-
-    if args.config is not None:
-        # Load config from file
-        config = json.loads(args.config)
-    elif args.config_file is not None:
-        # Load config from file
-        config = yaml_dialog.load_yaml(args.config_file)
-    else:
-        config = CONFIG_SIMPLE
-
-    client = BECDispatcher().client
-    client.start()
-    app = QApplication(sys.argv)
-    monitor = BECMonitor(config=config, gui_id=args.id, skip_validation=False)
-    monitor.show()
-    # just to test redis data
-    # redis_data = {
-    #     "x": {"data": [1, 2, 3], "tag": "x_default_tag"},
-    #     "y": {"y_default_tag": {"data": [1, 2, 3]}},
-    # }
-    # monitor.on_data_from_redis({"data": redis_data})
-    sys.exit(app.exec())

bec_widgets/widgets/monitor/tab_template.ui

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>506</width>
-    <height>592</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QGroupBox" name="groupBox_general">
-     <property name="title">
-      <string>General</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>X Label</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="5">
-       <widget class="Line" name="line_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4">
-       <widget class="QLineEdit" name="lineEdit_y_label"/>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="label_11">
-        <property name="text">
-         <string>Y Label</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="4">
-       <widget class="QLineEdit" name="lineEdit_plot_title"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="lineEdit_x_label"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Plot Title</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="Line" name="line_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QGroupBox" name="groupBox_x_axis">
-       <property name="title">
-        <string>X Axis</string>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Name:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="lineEdit_x_name"/>
-        </item>
-        <item>
-         <widget class="Line" name="line">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Entry:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="lineEdit_x_entry"/>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_y_signals">
-       <property name="title">
-        <string>Y Signals</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="BECTable" name="tableWidget_y_signals">
-          <column>
-           <property name="text">
-            <string>Name</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Entries</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Color</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QPushButton" name="pushButton_add_new_plot">
-         <property name="text">
-          <string>Add New Plot</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushButton_y_new">
-         <property name="text">
-          <string>Add New Signal</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BECTable</class>
-   <extends>QTableWidget</extends>
-   <header>bec_widgets.utils.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/widgets/motor_control/__init__.py

@@ -1,7 +0,0 @@
-from .motor_control import (
-    MotorControlAbsolute,
-    MotorControlRelative,
-    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorThread,
-)

bec_widgets/widgets/motor_control/motor_control.py

@@ -1,26 +1,12 @@
 # pylint: disable = no-name-in-module,missing-module-docstring
-import os
 from enum import Enum
 
 from bec_lib.alarm_handler import AlarmBase
 from bec_lib.device import Positioner
-from qtpy import uic
-from qtpy.QtCore import Qt, QThread
+from qtpy.QtCore import QThread
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QDoubleValidator, QKeySequence
-from qtpy.QtWidgets import (
-    QCheckBox,
-    QComboBox,
-    QDoubleSpinBox,
-    QLineEdit,
-    QMessageBox,
-    QPushButton,
-    QShortcut,
-    QTableWidget,
-    QTableWidgetItem,
-    QWidget,
-)
+from qtpy.QtWidgets import QMessageBox, QWidget
 
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
 
@@ -77,938 +63,6 @@ class MotorControlWidget(QWidget):
         self._init_ui()
 
 
-class MotorControlSelection(MotorControlWidget):
-    """
-    Widget for selecting the motors to control.
-
-    Signals:
-        selected_motors_signal (pyqtSignal(str,str)): Signal to emit the selected motors.
-    Slots:
-        get_available_motors (pyqtSlot): Slot to populate the available motors in the combo boxes and set the index based on the configuration.
-        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls GUI.
-        on_config_update (pyqtSlot(dict)): Slot to update the config dict.
-    """
-
-    selected_motors_signal = pyqtSignal(str, str)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "motor_control_selection.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-        # Lock GUI while motors are moving
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        self.pushButton_connecMotors.clicked.connect(self.select_motor)
-        self.get_available_motors()
-
-        # Connect change signals to change color
-        self.comboBox_motor_x.currentIndexChanged.connect(
-            lambda: self.set_combobox_style(self.comboBox_motor_x, "#ffa700")
-        )
-        self.comboBox_motor_y.currentIndexChanged.connect(
-            lambda: self.set_combobox_style(self.comboBox_motor_y, "#ffa700")
-        )
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        self._init_ui()
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, enable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            enable(bool): True to enable, False to disable.
-        """
-        self.motorSelection.setEnabled(enable)
-
-    @pyqtSlot()
-    def get_available_motors(self) -> None:
-        """
-        Slot to populate the available motors in the combo boxes and set the index based on the configuration.
-        """
-        # Get all available motors
-        self.motor_list = self.motor_thread.get_all_motors_names()
-
-        # Populate the combo boxes
-        self.comboBox_motor_x.addItems(self.motor_list)
-        self.comboBox_motor_y.addItems(self.motor_list)
-
-        # Set the index based on the config if provided
-        if self.config:
-            index_x = self.comboBox_motor_x.findText(self.motor_x)
-            index_y = self.comboBox_motor_y.findText(self.motor_y)
-            self.comboBox_motor_x.setCurrentIndex(index_x if index_x != -1 else 0)
-            self.comboBox_motor_y.setCurrentIndex(index_y if index_y != -1 else 0)
-
-    def set_combobox_style(self, combobox: QComboBox, color: str) -> None:
-        """
-        Set the combobox style to a specific color.
-        Args:
-            combobox(QComboBox): Combobox to change the color.
-            color(str): Color to set the combobox to.
-        """
-        combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
-
-    def select_motor(self):
-        """Emit the selected motors"""
-        motor_x = self.comboBox_motor_x.currentText()
-        motor_y = self.comboBox_motor_y.currentText()
-
-        # Reset the combobox color to normal after selection
-        self.set_combobox_style(self.comboBox_motor_x, "")
-        self.set_combobox_style(self.comboBox_motor_y, "")
-
-        self.selected_motors_signal.emit(motor_x, motor_y)
-
-
-class MotorControlAbsolute(MotorControlWidget):
-    """
-    Widget for controlling the motors to absolute coordinates.
-
-    Signals:
-        coordinates_signal (pyqtSignal(tuple)): Signal to emit the coordinates.
-    Slots:
-        change_motors (pyqtSlot): Slot to change the active motors.
-        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls.
-    """
-
-    coordinates_signal = pyqtSignal(tuple)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "motor_control_absolute.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-
-        # Check if there are any motors connected
-        if self.motor_x is None or self.motor_y is None:
-            self.motorControl_absolute.setEnabled(False)
-            return
-
-        # Move to absolute coordinates
-        self.pushButton_go_absolute.clicked.connect(
-            lambda: self.move_motor_absolute(
-                self.spinBox_absolute_x.value(), self.spinBox_absolute_y.value()
-            )
-        )
-
-        self.pushButton_set.clicked.connect(self.save_absolute_coordinates)
-        self.pushButton_save.clicked.connect(self.save_current_coordinates)
-        self.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
-
-        # Enable/Disable GUI
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        # Error messages
-        self.motor_thread.motor_error.connect(
-            lambda error: MotorControlErrors.display_error_message(error)
-        )
-
-        # Keyboard shortcuts
-        self._init_keyboard_shortcuts()
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """Update config dict"""
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Update step precision
-        self.precision = self.config["motor_control"]["precision"]
-
-        self._init_ui()
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, enable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            enable(bool): True to enable, False to disable.
-        """
-
-        # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.motorControl_absolute.findChildren(QWidget):
-            widget.setEnabled(enable)
-
-        # Enable the pushButton_stop if the motor is moving
-        self.pushButton_stop.setEnabled(True)
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str):
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(int)
-    def set_precision(self, precision: int) -> None:
-        """
-        Set the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.precision = precision
-        self.config["motor_control"]["precision"] = precision
-        self.spinBox_absolute_x.setDecimals(precision)
-        self.spinBox_absolute_y.setDecimals(precision)
-
-    def move_motor_absolute(self, x: float, y: float) -> None:
-        """
-        Move the motor to the target coordinates.
-        Args:
-            x(float): Target x coordinate.
-            y(float): Target y coordinate.
-        """
-        # self._enable_motor_controls(False)
-        target_coordinates = (x, y)
-        self.motor_thread.move_absolute(self.motor_x, self.motor_y, target_coordinates)
-        if self.checkBox_save_with_go.isChecked():
-            self.save_absolute_coordinates()
-
-    def _init_keyboard_shortcuts(self):
-        """Initialize the keyboard shortcuts."""
-        # Go absolute button
-        self.pushButton_go_absolute.setShortcut("Ctrl+G")
-        self.pushButton_go_absolute.setToolTip("Ctrl+G")
-
-        # Set absolute coordinates
-        self.pushButton_set.setShortcut("Ctrl+D")
-        self.pushButton_set.setToolTip("Ctrl+D")
-
-        # Save Current coordinates
-        self.pushButton_save.setShortcut("Ctrl+S")
-        self.pushButton_save.setToolTip("Ctrl+S")
-
-        # Stop Button
-        self.pushButton_stop.setShortcut("Ctrl+X")
-        self.pushButton_stop.setToolTip("Ctrl+X")
-
-    def save_absolute_coordinates(self):
-        """Emit the setup coordinates from the spinboxes"""
-
-        x, y = round(self.spinBox_absolute_x.value(), self.precision), round(
-            self.spinBox_absolute_y.value(), self.precision
-        )
-        self.coordinates_signal.emit((x, y))
-
-    def save_current_coordinates(self):
-        """Emit the current coordinates from the motor thread"""
-        x, y = self.motor_thread.get_coordinates(self.motor_x, self.motor_y)
-        self.coordinates_signal.emit((round(x, self.precision), round(y, self.precision)))
-
-
-class MotorControlRelative(MotorControlWidget):
-    """
-    Widget for controlling the motors to relative coordinates.
-
-    Signals:
-        precision_signal (pyqtSignal): Signal to emit the precision of the coordinates.
-    Slots:
-        change_motors (pyqtSlot(str,str)): Slot to change the active motors.
-        enable_motor_controls (pyqtSlot): Slot to enable/disable the motor controls.
-    """
-
-    precision_signal = pyqtSignal(int)
-
-    def _load_ui(self):
-        """Load the UI from the .ui file."""
-        # Loading UI
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "motor_control_relative.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI."""
-        self._init_ui_motor_control()
-        self._init_keyboard_shortcuts()
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Update step precision
-        self.precision = self.config["motor_control"]["precision"]
-        self.spinBox_precision.setValue(self.precision)
-
-        # Update step sizes
-        self.spinBox_step_x.setValue(self.config["motor_control"]["step_size_x"])
-        self.spinBox_step_y.setValue(self.config["motor_control"]["step_size_y"])
-
-        # Checkboxes for keyboard shortcuts and x/y step size link
-        self.checkBox_same_xy.setChecked(self.config["motor_control"]["step_x_y_same"])
-        self.checkBox_enableArrows.setChecked(self.config["motor_control"]["move_with_arrows"])
-
-        self._init_ui()
-
-    def _init_ui_motor_control(self) -> None:
-        """Initialize the motor control elements"""
-
-        # Connect checkbox and spinBoxes
-        self.checkBox_same_xy.stateChanged.connect(self._sync_step_sizes)
-        self.spinBox_step_x.valueChanged.connect(self._update_step_size_x)
-        self.spinBox_step_y.valueChanged.connect(self._update_step_size_y)
-
-        self.toolButton_right.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_x, "x", 1)
-        )
-        self.toolButton_left.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_x, "x", -1)
-        )
-        self.toolButton_up.clicked.connect(lambda: self.move_motor_relative(self.motor_y, "y", 1))
-        self.toolButton_down.clicked.connect(
-            lambda: self.move_motor_relative(self.motor_y, "y", -1)
-        )
-
-        # Switch between key shortcuts active
-        self.checkBox_enableArrows.stateChanged.connect(self._update_arrow_key_shortcuts)
-        self._update_arrow_key_shortcuts()
-
-        # Enable/Disable GUI
-        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
-
-        # Precision update
-        self.spinBox_precision.valueChanged.connect(lambda x: self._update_precision(x))
-
-        # Error messages
-        self.motor_thread.motor_error.connect(
-            lambda error: MotorControlErrors.display_error_message(error)
-        )
-
-        # Stop Button
-        self.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
-
-    def _init_keyboard_shortcuts(self) -> None:
-        """Initialize the keyboard shortcuts"""
-
-        # Increase/decrease step size for X motor
-        increase_x_shortcut = QShortcut(QKeySequence("Ctrl+A"), self)
-        decrease_x_shortcut = QShortcut(QKeySequence("Ctrl+Z"), self)
-        increase_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_x, 2)
-        )
-        decrease_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_x, 0.5)
-        )
-        self.spinBox_step_x.setToolTip("Increase step size: Ctrl+A\nDecrease step size: Ctrl+Z")
-
-        # Increase/decrease step size for Y motor
-        increase_y_shortcut = QShortcut(QKeySequence("Alt+A"), self)
-        decrease_y_shortcut = QShortcut(QKeySequence("Alt+Z"), self)
-        increase_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_y, 2)
-        )
-        decrease_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_y, 0.5)
-        )
-        self.spinBox_step_y.setToolTip("Increase step size: Alt+A\nDecrease step size: Alt+Z")
-
-        # Stop Button
-        self.pushButton_stop.setShortcut("Ctrl+X")
-        self.pushButton_stop.setToolTip("Ctrl+X")
-
-    def _update_arrow_key_shortcuts(self) -> None:
-        """Update the arrow key shortcuts based on the checkbox state."""
-        if self.checkBox_enableArrows.isChecked():
-            # Set the arrow key shortcuts for motor movement
-            self.toolButton_right.setShortcut(Qt.Key_Right)
-            self.toolButton_left.setShortcut(Qt.Key_Left)
-            self.toolButton_up.setShortcut(Qt.Key_Up)
-            self.toolButton_down.setShortcut(Qt.Key_Down)
-        else:
-            # Clear the shortcuts
-            self.toolButton_right.setShortcut("")
-            self.toolButton_left.setShortcut("")
-            self.toolButton_up.setShortcut("")
-            self.toolButton_down.setShortcut("")
-
-    def _update_precision(self, precision: int) -> None:
-        """
-        Update the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.spinBox_step_x.setDecimals(precision)
-        self.spinBox_step_y.setDecimals(precision)
-        self.precision_signal.emit(precision)
-
-    def _change_step_size(self, spinBox: QDoubleSpinBox, factor: float) -> None:
-        """
-        Change the step size of the spinbox.
-        Args:
-            spinBox(QDoubleSpinBox): Spinbox to change the step size.
-            factor(float): Factor to change the step size.
-        """
-        old_step = spinBox.value()
-        new_step = old_step * factor
-        spinBox.setValue(new_step)
-
-    def _sync_step_sizes(self):
-        """Sync step sizes based on checkbox state."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_x.value()
-            self.spinBox_step_y.setValue(value)
-
-    def _update_step_size_x(self):
-        """Update step size for x if checkbox is checked."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_x.value()
-            self.spinBox_step_y.setValue(value)
-
-    def _update_step_size_y(self):
-        """Update step size for y if checkbox is checked."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_y.value()
-            self.spinBox_step_x.setValue(value)
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str):
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(bool)
-    def enable_motor_controls(self, disable: bool) -> None:
-        """
-        Enable or disable the motor controls.
-        Args:
-            disable(bool): True to disable, False to enable.
-        """
-
-        # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.motorControl.findChildren(QWidget):
-            widget.setEnabled(disable)
-
-        # Enable the pushButton_stop if the motor is moving
-        self.pushButton_stop.setEnabled(True)
-
-    def move_motor_relative(self, motor, axis: str, direction: int) -> None:
-        """
-        Move the motor relative to the current position.
-        Args:
-            motor: Motor to move.
-            axis(str): Axis to move.
-            direction(int): Direction to move. 1 for positive, -1 for negative.
-        """
-        if axis == "x":
-            step = direction * self.spinBox_step_x.value()
-        elif axis == "y":
-            step = direction * self.spinBox_step_y.value()
-        self.motor_thread.move_relative(motor, step)
-
-
-class MotorCoordinateTable(MotorControlWidget):
-    """
-    Widget to save coordinates from motor, display them in the table and move back to them.
-    There are two modes of operation:
-        - Individual: Each row is a single coordinate.
-        - Start/Stop: Each pair of rows is a start and end coordinate.
-    Signals:
-        plot_coordinates_signal (pyqtSignal(list, str, str)): Signal to plot the coordinates in the MotorMap.
-    Slots:
-        add_coordinate (pyqtSlot(tuple)): Slot to add a coordinate to the table.
-        mode_switch (pyqtSlot): Slot to switch between individual and start/stop mode.
-    """
-
-    plot_coordinates_signal = pyqtSignal(list, str, str)
-
-    def _load_ui(self):
-        """Load the UI for the coordinate table."""
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "motor_control_table.ui"), self)
-
-    def _init_ui(self):
-        """Initialize the UI"""
-        # Setup table behaviour
-        self._setup_table()
-        self.table.setSelectionBehavior(QTableWidget.SelectRows)
-
-        # for tag columns default tag
-        self.tag_counter = 1
-
-        # Connect signals and slots
-        self.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
-        self.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
-
-        # Keyboard shortcuts for deleting a row
-        self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.table)
-        self.delete_shortcut.activated.connect(self.delete_selected_row)
-        self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.table)
-        self.backspace_shortcut.activated.connect(self.delete_selected_row)
-
-        # Warning message for mode switch enable/disable
-        self.warning_message = True
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Update config dict
-        Args:
-            config(dict): New config dict
-        """
-        self.config = config
-
-        # Get motor names
-        self.motor_x, self.motor_y = (
-            self.config["motor_control"]["motor_x"],
-            self.config["motor_control"]["motor_y"],
-        )
-
-        # Decimal precision of the table coordinates
-        self.precision = self.config["motor_control"].get("precision", 3)
-
-        # Mode switch default option
-        self.mode = self.config["motor_control"].get("mode", "Individual")
-
-        # Set combobox to default mode
-        self.comboBox_mode.setCurrentText(self.mode)
-
-        self._init_ui()
-
-    def _setup_table(self):
-        """Setup the table with appropriate headers and configurations."""
-        mode = self.comboBox_mode.currentText()
-
-        if mode == "Individual":
-            self._setup_individual_mode()
-        elif mode == "Start/Stop":
-            self._setup_start_stop_mode()
-            self.start_stop_counter = 0  # TODO: remove this??
-
-        self.wipe_motor_map_coordinates()
-
-    def _setup_individual_mode(self):
-        """Setup the table for individual mode."""
-        self.table.setColumnCount(5)
-        self.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
-        self.table.verticalHeader().setVisible(False)
-
-    def _setup_start_stop_mode(self):
-        """Setup the table for start/stop mode."""
-        self.table.setColumnCount(8)
-        self.table.setHorizontalHeaderLabels(
-            [
-                "Show",
-                "Move [start]",
-                "Move [end]",
-                "Tag",
-                "X [start]",
-                "Y [start]",
-                "X [end]",
-                "Y [end]",
-            ]
-        )
-        self.table.verticalHeader().setVisible(False)
-        # Set flag to track if the coordinate is stat or the end of the entry
-        self.is_next_entry_end = False
-
-    def mode_switch(self):
-        """Switch between individual and start/stop mode."""
-        last_selected_index = self.comboBox_mode.currentIndex()
-
-        if self.table.rowCount() > 0 and self.warning_message is True:
-            msgBox = QMessageBox()
-            msgBox.setIcon(QMessageBox.Critical)
-            msgBox.setText(
-                "Switching modes will delete all table entries. Do you want to continue?"
-            )
-            msgBox.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
-            returnValue = msgBox.exec()
-
-            if returnValue is QMessageBox.Cancel:
-                self.comboBox_mode.blockSignals(True)  # Block signals
-                self.comboBox_mode.setCurrentIndex(last_selected_index)
-                self.comboBox_mode.blockSignals(False)  # Unblock signals
-                return
-
-        # Wipe table
-        self.wipe_motor_map_coordinates()
-
-        # Initiate new table with new mode
-        self._setup_table()
-
-    @pyqtSlot(tuple)
-    def add_coordinate(self, coordinates: tuple):
-        """
-        Add a coordinate to the table.
-        Args:
-            coordinates(tuple): Coordinates (x,y) to add to the table.
-        """
-        tag = f"Pos {self.tag_counter}"
-        self.tag_counter += 1
-        x, y = coordinates
-        self._add_row(tag, x, y)
-
-    def _add_row(self, tag: str, x: float, y: float) -> None:
-        """
-        Add a row to the table.
-        Args:
-            tag(str): Tag of the coordinate.
-            x(float): X coordinate.
-            y(float): Y coordinate.
-        """
-
-        mode = self.comboBox_mode.currentText()
-        if mode == "Individual":
-            checkbox_pos = 0
-            button_pos = 1
-            tag_pos = 2
-            x_pos = 3
-            y_pos = 4
-            coordinate_reference = "Individual"
-            color = "green"
-
-            # Add new row -> new entry
-            row_count = self.table.rowCount()
-            self.table.insertRow(row_count)
-
-            # Add Widgets
-            self._add_widgets(
-                tag,
-                x,
-                y,
-                row_count,
-                checkbox_pos,
-                tag_pos,
-                button_pos,
-                x_pos,
-                y_pos,
-                coordinate_reference,
-                color,
-            )
-
-        if mode == "Start/Stop":
-            # These positions are always fixed
-            checkbox_pos = 0
-            tag_pos = 3
-
-            if self.is_next_entry_end is False:  # It is the start position of the entry
-                print("Start position")
-                button_pos = 1
-                x_pos = 4
-                y_pos = 5
-                coordinate_reference = "Start"
-                color = "blue"
-
-                # Add new row -> new entry
-                row_count = self.table.rowCount()
-                self.table.insertRow(row_count)
-
-                # Add Widgets
-                self._add_widgets(
-                    tag,
-                    x,
-                    y,
-                    row_count,
-                    checkbox_pos,
-                    tag_pos,
-                    button_pos,
-                    x_pos,
-                    y_pos,
-                    coordinate_reference,
-                    color,
-                )
-
-                # Next entry will be the end of the current entry
-                self.is_next_entry_end = True
-
-            elif self.is_next_entry_end is True:  # It is the end position of the entry
-                print("End position")
-                row_count = self.table.rowCount() - 1  # Current row
-                button_pos = 2
-                x_pos = 6
-                y_pos = 7
-                coordinate_reference = "Stop"
-                color = "red"
-
-                # Add Widgets
-                self._add_widgets(
-                    tag,
-                    x,
-                    y,
-                    row_count,
-                    checkbox_pos,
-                    tag_pos,
-                    button_pos,
-                    x_pos,
-                    y_pos,
-                    coordinate_reference,
-                    color,
-                )
-                self.is_next_entry_end = False  # Next entry will be the start of the new entry
-
-        # Auto table resize
-        self.resize_table_auto()
-
-    def _add_widgets(
-        self,
-        tag: str,
-        x: float,
-        y: float,
-        row: int,
-        checkBox_pos: int,
-        tag_pos: int,
-        button_pos: int,
-        x_pos: int,
-        y_pos: int,
-        coordinate_reference: str,
-        color: str,
-    ) -> None:
-        """
-        Add widgets to the table.
-        Args:
-            tag(str): Tag of the coordinate.
-            x(float): X coordinate.
-            y(float): Y coordinate.
-            row(int): Row of the QTableWidget where to add the widgets.
-            checkBox_pos(int): Column where to put CheckBox.
-            tag_pos(int): Column where to put Tag.
-            button_pos(int): Column where to put Move button.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-            coordinate_reference(str): Reference to the coordinate for MotorMap.
-            color(str): Color of the coordinate for MotorMap.
-        """
-        # Add widgets
-        self._add_checkbox(row, checkBox_pos, x_pos, y_pos)
-        self._add_move_button(row, button_pos, x_pos, y_pos)
-        self.table.setItem(row, tag_pos, QTableWidgetItem(tag))
-        self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color)
-        self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color)
-
-        # # Emit the coordinates to be plotted
-        self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-
-        # Connect item edit to emit coordinates
-        self.table.itemChanged.connect(
-            lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}")
-        )
-        self.table.itemChanged.connect(
-            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-        )
-
-    def _add_checkbox(self, row: int, checkBox_pos: int, x_pos: int, y_pos: int):
-        """
-        Add a checkbox to the table.
-        Args:
-            row(int): Row of QTableWidget where to add the checkbox.
-            checkBox_pos(int): Column where to put CheckBox.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-        """
-        show_checkbox = QCheckBox()
-        show_checkbox.setChecked(True)
-        show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos))
-        self.table.setCellWidget(row, checkBox_pos, show_checkbox)
-
-    def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None:
-        """
-        Add a move button to the table.
-        Args:
-            row(int): Row of QTableWidget where to add the move button.
-            button_pos(int): Column where to put move button.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-        """
-        move_button = QPushButton("Move")
-        move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos))
-        self.table.setCellWidget(row, button_pos, move_button)
-
-    def _add_line_edit(
-        self,
-        value: float,
-        row: int,
-        line_pos: int,
-        x_pos: int,
-        y_pos: int,
-        coordinate_reference: str,
-        color: str,
-    ) -> None:
-        """
-        Add a QLineEdit to the table.
-        Args:
-            value(float): Initial value of the QLineEdit.
-            row(int): Row of QTableWidget where to add the QLineEdit.
-            line_pos(int): Column where to put QLineEdit.
-            x_pos(int): Column where to link x coordinate.
-            y_pos(int): Column where to link y coordinate.
-            coordinate_reference(str): Reference to the coordinate for MotorMap.
-            color(str): Color of the coordinate for MotorMap.
-        """
-        # Adding validator
-        validator = QDoubleValidator()
-        validator.setDecimals(self.precision)
-
-        # Create line edit
-        edit = QLineEdit(str(f"{value:.{self.precision}f}"))
-        edit.setValidator(validator)
-        edit.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
-        # Add line edit to the table
-        self.table.setCellWidget(row, line_pos, edit)
-        edit.textChanged.connect(
-            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
-        )
-
-    def wipe_motor_map_coordinates(self):
-        """Wipe the motor map coordinates."""
-        try:
-            self.table.itemChanged.disconnect()  # Disconnect all previous connections
-        except TypeError:
-            print("No previous connections to disconnect")
-        self.table.setRowCount(0)
-        reference_tags = ["Individual", "Start", "Stop"]
-        for reference_tag in reference_tags:
-            self.plot_coordinates_signal.emit([], reference_tag, "green")
-
-    def handle_move_button_click(self, x_pos: int, y_pos: int) -> None:
-        """
-        Handle the move button click.
-        Args:
-            x_pos(int): X position of the coordinate.
-            y_pos(int): Y position of the coordinate.
-        """
-        button = self.sender()
-        row = self.table.indexAt(button.pos()).row()
-
-        x = self.get_coordinate(row, x_pos)
-        y = self.get_coordinate(row, y_pos)
-        self.move_motor(x, y)
-
-    def emit_plot_coordinates(self, x_pos: float, y_pos: float, reference_tag: str, color: str):
-        """
-        Emit the coordinates to be plotted.
-        Args:
-            x_pos(float): X position of the coordinate.
-            y_pos(float): Y position of the coordinate.
-            reference_tag(str): Reference tag of the coordinate.
-            color(str): Color of the coordinate.
-        """
-        print(
-            f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}"
-        )
-        coordinates = []
-        for row in range(self.table.rowCount()):
-            show = self.table.cellWidget(row, 0).isChecked()
-            x = self.get_coordinate(row, x_pos)
-            y = self.get_coordinate(row, y_pos)
-
-            coordinates.append((x, y, show))  # (x, y, show_flag)
-        self.plot_coordinates_signal.emit(coordinates, reference_tag, color)
-
-    def get_coordinate(self, row: int, column: int) -> float:
-        """
-        Helper function to get the coordinate from the table QLineEdit cells.
-        Args:
-            row(int): Row of the table.
-            column(int): Column of the table.
-        Returns:
-            float: Value of the coordinate.
-        """
-        edit = self.table.cellWidget(row, column)
-        value = float(edit.text()) if edit and edit.text() != "" else None
-        if value:
-            return value
-
-    def delete_selected_row(self):
-        """Delete the selected row from the table."""
-        selected_rows = self.table.selectionModel().selectedRows()
-        for row in selected_rows:
-            self.table.removeRow(row.row())
-        if self.comboBox_mode.currentText() == "Start/Stop":
-            self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue")
-            self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red")
-            self.is_next_entry_end = False
-        elif self.comboBox_mode.currentText() == "Individual":
-            self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green")
-
-    def resize_table_auto(self):
-        """Resize the table to fit the contents."""
-        if self.checkBox_resize_auto.isChecked():
-            self.table.resizeColumnsToContents()
-
-    def move_motor(self, x: float, y: float) -> None:
-        """
-        Move the motor to the target coordinates.
-        Args:
-            x(float): Target x coordinate.
-            y(float): Target y coordinate.
-        """
-        self.motor_thread.move_absolute(self.motor_x, self.motor_y, (x, y))
-
-    @pyqtSlot(str, str)
-    def change_motors(self, motor_x: str, motor_y: str) -> None:
-        """
-        Change the active motors and update config.
-        Can be connected to the selected_motors_signal from MotorControlSelection.
-        Args:
-            motor_x(str): New motor X to be controlled.
-            motor_y(str): New motor Y to be controlled.
-        """
-        self.motor_x = motor_x
-        self.motor_y = motor_y
-        self.config["motor_control"]["motor_x"] = motor_x
-        self.config["motor_control"]["motor_y"] = motor_y
-
-    @pyqtSlot(int)
-    def set_precision(self, precision: int) -> None:
-        """
-        Set the precision of the coordinates.
-        Args:
-            precision(int): Precision of the coordinates.
-        """
-        self.precision = precision
-        self.config["motor_control"]["precision"] = precision
-
-
 class MotorControlErrors:
     """Class for displaying formatted error messages."""
 

bec_widgets/widgets/motor_control/motor_table/motor_table.py

@@ -0,0 +1,484 @@
+# pylint: disable = no-name-in-module,missing-module-docstring
+import os
+
+from qtpy import uic
+from qtpy.QtCore import Qt
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtGui import QDoubleValidator, QKeySequence
+from qtpy.QtWidgets import (
+    QCheckBox,
+    QLineEdit,
+    QMessageBox,
+    QPushButton,
+    QShortcut,
+    QTableWidget,
+    QTableWidgetItem,
+)
+
+from bec_widgets.utils import UILoader
+from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
+
+
+class MotorCoordinateTable(MotorControlWidget):
+    """
+    Widget to save coordinates from motor, display them in the table and move back to them.
+    There are two modes of operation:
+        - Individual: Each row is a single coordinate.
+        - Start/Stop: Each pair of rows is a start and end coordinate.
+    Signals:
+        plot_coordinates_signal (pyqtSignal(list, str, str)): Signal to plot the coordinates in the MotorMap.
+    Slots:
+        add_coordinate (pyqtSlot(tuple)): Slot to add a coordinate to the table.
+        mode_switch (pyqtSlot): Slot to switch between individual and start/stop mode.
+    """
+
+    plot_coordinates_signal = pyqtSignal(list, str, str)
+
+    def _load_ui(self):
+        """Load the UI for the coordinate table."""
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "motor_table.ui"), self)
+
+    def _init_ui(self):
+        """Initialize the UI"""
+        # Setup table behaviour
+        self._setup_table()
+        self.ui.table.setSelectionBehavior(QTableWidget.SelectRows)
+
+        # for tag columns default tag
+        self.tag_counter = 1
+
+        # Connect signals and slots
+        self.ui.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
+        self.ui.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
+
+        # Keyboard shortcuts for deleting a row
+        self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.ui.table)
+        self.delete_shortcut.activated.connect(self.delete_selected_row)
+        self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.ui.table)
+        self.backspace_shortcut.activated.connect(self.delete_selected_row)
+
+        # Warning message for mode switch enable/disable
+        self.warning_message = True
+
+    @pyqtSlot(dict)
+    def on_config_update(self, config: dict) -> None:
+        """
+        Update config dict
+        Args:
+            config(dict): New config dict
+        """
+        self.config = config
+
+        # Get motor names
+        self.motor_x, self.motor_y = (
+            self.config["motor_control"]["motor_x"],
+            self.config["motor_control"]["motor_y"],
+        )
+
+        # Decimal precision of the table coordinates
+        self.precision = self.config["motor_control"].get("precision", 3)
+
+        # Mode switch default option
+        self.mode = self.config["motor_control"].get("mode", "Individual")
+
+        # Set combobox to default mode
+        self.ui.comboBox_mode.setCurrentText(self.mode)
+
+        self._init_ui()
+
+    def _setup_table(self):
+        """Setup the table with appropriate headers and configurations."""
+        mode = self.ui.comboBox_mode.currentText()
+
+        if mode == "Individual":
+            self._setup_individual_mode()
+        elif mode == "Start/Stop":
+            self._setup_start_stop_mode()
+            self.start_stop_counter = 0  # TODO: remove this??
+
+        self.wipe_motor_map_coordinates()
+
+    def _setup_individual_mode(self):
+        """Setup the table for individual mode."""
+        self.ui.table.setColumnCount(5)
+        self.ui.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
+        self.ui.table.verticalHeader().setVisible(False)
+
+    def _setup_start_stop_mode(self):
+        """Setup the table for start/stop mode."""
+        self.ui.table.setColumnCount(8)
+        self.ui.table.setHorizontalHeaderLabels(
+            [
+                "Show",
+                "Move [start]",
+                "Move [end]",
+                "Tag",
+                "X [start]",
+                "Y [start]",
+                "X [end]",
+                "Y [end]",
+            ]
+        )
+        self.ui.table.verticalHeader().setVisible(False)
+        # Set flag to track if the coordinate is stat or the end of the entry
+        self.is_next_entry_end = False
+
+    def mode_switch(self):
+        """Switch between individual and start/stop mode."""
+        last_selected_index = self.ui.comboBox_mode.currentIndex()
+
+        if self.ui.table.rowCount() > 0 and self.warning_message is True:
+            msgBox = QMessageBox()
+            msgBox.setIcon(QMessageBox.Critical)
+            msgBox.setText(
+                "Switching modes will delete all table entries. Do you want to continue?"
+            )
+            msgBox.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
+            returnValue = msgBox.exec()
+
+            if returnValue is QMessageBox.Cancel:
+                self.ui.comboBox_mode.blockSignals(True)  # Block signals
+                self.ui.comboBox_mode.setCurrentIndex(last_selected_index)
+                self.ui.comboBox_mode.blockSignals(False)  # Unblock signals
+                return
+
+        # Wipe table
+        self.wipe_motor_map_coordinates()
+
+        # Initiate new table with new mode
+        self._setup_table()
+
+    @pyqtSlot(tuple)
+    def add_coordinate(self, coordinates: tuple):
+        """
+        Add a coordinate to the table.
+        Args:
+            coordinates(tuple): Coordinates (x,y) to add to the table.
+        """
+        tag = f"Pos {self.tag_counter}"
+        self.tag_counter += 1
+        x, y = coordinates
+        self._add_row(tag, x, y)
+
+    def _add_row(self, tag: str, x: float, y: float) -> None:
+        """
+        Add a row to the table.
+        Args:
+            tag(str): Tag of the coordinate.
+            x(float): X coordinate.
+            y(float): Y coordinate.
+        """
+
+        mode = self.ui.comboBox_mode.currentText()
+        if mode == "Individual":
+            checkbox_pos = 0
+            button_pos = 1
+            tag_pos = 2
+            x_pos = 3
+            y_pos = 4
+            coordinate_reference = "Individual"
+            color = "green"
+
+            # Add new row -> new entry
+            row_count = self.ui.table.rowCount()
+            self.ui.table.insertRow(row_count)
+
+            # Add Widgets
+            self._add_widgets(
+                tag,
+                x,
+                y,
+                row_count,
+                checkbox_pos,
+                tag_pos,
+                button_pos,
+                x_pos,
+                y_pos,
+                coordinate_reference,
+                color,
+            )
+
+        if mode == "Start/Stop":
+            # These positions are always fixed
+            checkbox_pos = 0
+            tag_pos = 3
+
+            if self.is_next_entry_end is False:  # It is the start position of the entry
+                print("Start position")
+                button_pos = 1
+                x_pos = 4
+                y_pos = 5
+                coordinate_reference = "Start"
+                color = "blue"
+
+                # Add new row -> new entry
+                row_count = self.ui.table.rowCount()
+                self.ui.table.insertRow(row_count)
+
+                # Add Widgets
+                self._add_widgets(
+                    tag,
+                    x,
+                    y,
+                    row_count,
+                    checkbox_pos,
+                    tag_pos,
+                    button_pos,
+                    x_pos,
+                    y_pos,
+                    coordinate_reference,
+                    color,
+                )
+
+                # Next entry will be the end of the current entry
+                self.is_next_entry_end = True
+
+            elif self.is_next_entry_end is True:  # It is the end position of the entry
+                print("End position")
+                row_count = self.ui.table.rowCount() - 1  # Current row
+                button_pos = 2
+                x_pos = 6
+                y_pos = 7
+                coordinate_reference = "Stop"
+                color = "red"
+
+                # Add Widgets
+                self._add_widgets(
+                    tag,
+                    x,
+                    y,
+                    row_count,
+                    checkbox_pos,
+                    tag_pos,
+                    button_pos,
+                    x_pos,
+                    y_pos,
+                    coordinate_reference,
+                    color,
+                )
+                self.is_next_entry_end = False  # Next entry will be the start of the new entry
+
+        # Auto table resize
+        self.resize_table_auto()
+
+    def _add_widgets(
+        self,
+        tag: str,
+        x: float,
+        y: float,
+        row: int,
+        checkBox_pos: int,
+        tag_pos: int,
+        button_pos: int,
+        x_pos: int,
+        y_pos: int,
+        coordinate_reference: str,
+        color: str,
+    ) -> None:
+        """
+        Add widgets to the table.
+        Args:
+            tag(str): Tag of the coordinate.
+            x(float): X coordinate.
+            y(float): Y coordinate.
+            row(int): Row of the QTableWidget where to add the widgets.
+            checkBox_pos(int): Column where to put CheckBox.
+            tag_pos(int): Column where to put Tag.
+            button_pos(int): Column where to put Move button.
+            x_pos(int): Column where to link x coordinate.
+            y_pos(int): Column where to link y coordinate.
+            coordinate_reference(str): Reference to the coordinate for MotorMap.
+            color(str): Color of the coordinate for MotorMap.
+        """
+        # Add widgets
+        self._add_checkbox(row, checkBox_pos, x_pos, y_pos)
+        self._add_move_button(row, button_pos, x_pos, y_pos)
+        self.ui.table.setItem(row, tag_pos, QTableWidgetItem(tag))
+        self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color)
+        self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color)
+
+        # # Emit the coordinates to be plotted
+        self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
+
+        # Connect item edit to emit coordinates
+        self.ui.table.itemChanged.connect(
+            lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}")
+        )
+        self.ui.table.itemChanged.connect(
+            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
+        )
+
+    def _add_checkbox(self, row: int, checkBox_pos: int, x_pos: int, y_pos: int):
+        """
+        Add a checkbox to the table.
+        Args:
+            row(int): Row of QTableWidget where to add the checkbox.
+            checkBox_pos(int): Column where to put CheckBox.
+            x_pos(int): Column where to link x coordinate.
+            y_pos(int): Column where to link y coordinate.
+        """
+        show_checkbox = QCheckBox()
+        show_checkbox.setChecked(True)
+        show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos))
+        self.ui.table.setCellWidget(row, checkBox_pos, show_checkbox)
+
+    def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None:
+        """
+        Add a move button to the table.
+        Args:
+            row(int): Row of QTableWidget where to add the move button.
+            button_pos(int): Column where to put move button.
+            x_pos(int): Column where to link x coordinate.
+            y_pos(int): Column where to link y coordinate.
+        """
+        move_button = QPushButton("Move")
+        move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos))
+        self.ui.table.setCellWidget(row, button_pos, move_button)
+
+    def _add_line_edit(
+        self,
+        value: float,
+        row: int,
+        line_pos: int,
+        x_pos: int,
+        y_pos: int,
+        coordinate_reference: str,
+        color: str,
+    ) -> None:
+        """
+        Add a QLineEdit to the table.
+        Args:
+            value(float): Initial value of the QLineEdit.
+            row(int): Row of QTableWidget where to add the QLineEdit.
+            line_pos(int): Column where to put QLineEdit.
+            x_pos(int): Column where to link x coordinate.
+            y_pos(int): Column where to link y coordinate.
+            coordinate_reference(str): Reference to the coordinate for MotorMap.
+            color(str): Color of the coordinate for MotorMap.
+        """
+        # Adding validator
+        validator = QDoubleValidator()
+        validator.setDecimals(self.precision)
+
+        # Create line edit
+        edit = QLineEdit(str(f"{value:.{self.precision}f}"))
+        edit.setValidator(validator)
+        edit.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        # Add line edit to the table
+        self.ui.table.setCellWidget(row, line_pos, edit)
+        edit.textChanged.connect(
+            lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
+        )
+
+    def wipe_motor_map_coordinates(self):
+        """Wipe the motor map coordinates."""
+        try:
+            self.ui.table.itemChanged.disconnect()  # Disconnect all previous connections
+        except TypeError:
+            print("No previous connections to disconnect")
+        self.ui.table.setRowCount(0)
+        reference_tags = ["Individual", "Start", "Stop"]
+        for reference_tag in reference_tags:
+            self.plot_coordinates_signal.emit([], reference_tag, "green")
+
+    def handle_move_button_click(self, x_pos: int, y_pos: int) -> None:
+        """
+        Handle the move button click.
+        Args:
+            x_pos(int): X position of the coordinate.
+            y_pos(int): Y position of the coordinate.
+        """
+        button = self.sender()
+        row = self.ui.table.indexAt(button.pos()).row()
+
+        x = self.get_coordinate(row, x_pos)
+        y = self.get_coordinate(row, y_pos)
+        self.move_motor(x, y)
+
+    def emit_plot_coordinates(self, x_pos: float, y_pos: float, reference_tag: str, color: str):
+        """
+        Emit the coordinates to be plotted.
+        Args:
+            x_pos(float): X position of the coordinate.
+            y_pos(float): Y position of the coordinate.
+            reference_tag(str): Reference tag of the coordinate.
+            color(str): Color of the coordinate.
+        """
+        print(
+            f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}"
+        )
+        coordinates = []
+        for row in range(self.ui.table.rowCount()):
+            show = self.ui.table.cellWidget(row, 0).isChecked()
+            x = self.get_coordinate(row, x_pos)
+            y = self.get_coordinate(row, y_pos)
+
+            coordinates.append((x, y, show))  # (x, y, show_flag)
+        self.plot_coordinates_signal.emit(coordinates, reference_tag, color)
+
+    def get_coordinate(self, row: int, column: int) -> float:
+        """
+        Helper function to get the coordinate from the table QLineEdit cells.
+        Args:
+            row(int): Row of the table.
+            column(int): Column of the table.
+        Returns:
+            float: Value of the coordinate.
+        """
+        edit = self.ui.table.cellWidget(row, column)
+        value = float(edit.text()) if edit and edit.text() != "" else None
+        if value:
+            return value
+
+    def delete_selected_row(self):
+        """Delete the selected row from the table."""
+        selected_rows = self.ui.table.selectionModel().selectedRows()
+        for row in selected_rows:
+            self.ui.table.removeRow(row.row())
+        if self.ui.comboBox_mode.currentText() == "Start/Stop":
+            self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue")
+            self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red")
+            self.is_next_entry_end = False
+        elif self.ui.comboBox_mode.currentText() == "Individual":
+            self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green")
+
+    def resize_table_auto(self):
+        """Resize the table to fit the contents."""
+        if self.ui.checkBox_resize_auto.isChecked():
+            self.ui.table.resizeColumnsToContents()
+
+    def move_motor(self, x: float, y: float) -> None:
+        """
+        Move the motor to the target coordinates.
+        Args:
+            x(float): Target x coordinate.
+            y(float): Target y coordinate.
+        """
+        self.motor_thread.move_absolute(self.motor_x, self.motor_y, (x, y))
+
+    @pyqtSlot(str, str)
+    def change_motors(self, motor_x: str, motor_y: str) -> None:
+        """
+        Change the active motors and update config.
+        Can be connected to the selected_motors_signal from MotorControlSelection.
+        Args:
+            motor_x(str): New motor X to be controlled.
+            motor_y(str): New motor Y to be controlled.
+        """
+        self.motor_x = motor_x
+        self.motor_y = motor_y
+        self.config["motor_control"]["motor_x"] = motor_x
+        self.config["motor_control"]["motor_y"] = motor_y
+
+    @pyqtSlot(int)
+    def set_precision(self, precision: int) -> None:
+        """
+        Set the precision of the coordinates.
+        Args:
+            precision(int): Precision of the coordinates.
+        """
+        self.precision = precision
+        self.config["motor_control"]["precision"] = precision

bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.py

@@ -0,0 +1,159 @@
+import os
+
+from qtpy.QtWidgets import QWidget
+from qtpy import uic
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import Slot as pyqtSlot
+
+from bec_widgets.utils import UILoader
+from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget, MotorControlErrors
+
+
+class MotorControlAbsolute(MotorControlWidget):
+    """
+    Widget for controlling the motors to absolute coordinates.
+
+    Signals:
+        coordinates_signal (pyqtSignal(tuple)): Signal to emit the coordinates.
+    Slots:
+        change_motors (pyqtSlot): Slot to change the active motors.
+        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls.
+    """
+
+    coordinates_signal = pyqtSignal(tuple)
+
+    def _load_ui(self):
+        """Load the UI from the .ui file."""
+        current_path = os.path.dirname(__file__)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "movement_absolute.ui"), self)
+
+    def _init_ui(self):
+        """Initialize the UI."""
+
+        # Check if there are any motors connected
+        if self.motor_x is None or self.motor_y is None:
+            self.ui.motorControl_absolute.setEnabled(False)
+            return
+
+        # Move to absolute coordinates
+        self.ui.pushButton_go_absolute.clicked.connect(
+            lambda: self.move_motor_absolute(
+                self.ui.spinBox_absolute_x.value(), self.ui.spinBox_absolute_y.value()
+            )
+        )
+
+        self.ui.pushButton_set.clicked.connect(self.save_absolute_coordinates)
+        self.ui.pushButton_save.clicked.connect(self.save_current_coordinates)
+        self.ui.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
+
+        # Enable/Disable GUI
+        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
+
+        # Error messages
+        self.motor_thread.motor_error.connect(
+            lambda error: MotorControlErrors.display_error_message(error)
+        )
+
+        # Keyboard shortcuts
+        self._init_keyboard_shortcuts()
+
+    @pyqtSlot(dict)
+    def on_config_update(self, config: dict) -> None:
+        """Update config dict"""
+        self.config = config
+
+        # Get motor names
+        self.motor_x, self.motor_y = (
+            self.config["motor_control"]["motor_x"],
+            self.config["motor_control"]["motor_y"],
+        )
+
+        # Update step precision
+        self.precision = self.config["motor_control"]["precision"]
+
+        self._init_ui()
+
+    @pyqtSlot(bool)
+    def enable_motor_controls(self, enable: bool) -> None:
+        """
+        Enable or disable the motor controls.
+        Args:
+            enable(bool): True to enable, False to disable.
+        """
+
+        # Disable or enable all controls within the motorControl_absolute group box
+        for widget in self.ui.motorControl_absolute.findChildren(QWidget):
+            widget.setEnabled(enable)
+
+        # Enable the pushButton_stop if the motor is moving
+        self.ui.pushButton_stop.setEnabled(True)
+
+    @pyqtSlot(str, str)
+    def change_motors(self, motor_x: str, motor_y: str):
+        """
+        Change the active motors and update config.
+        Can be connected to the selected_motors_signal from MotorControlSelection.
+        Args:
+            motor_x(str): New motor X to be controlled.
+            motor_y(str): New motor Y to be controlled.
+        """
+        self.motor_x = motor_x
+        self.motor_y = motor_y
+        self.config["motor_control"]["motor_x"] = motor_x
+        self.config["motor_control"]["motor_y"] = motor_y
+
+    @pyqtSlot(int)
+    def set_precision(self, precision: int) -> None:
+        """
+        Set the precision of the coordinates.
+        Args:
+            precision(int): Precision of the coordinates.
+        """
+        self.precision = precision
+        self.config["motor_control"]["precision"] = precision
+        self.ui.spinBox_absolute_x.setDecimals(precision)
+        self.ui.spinBox_absolute_y.setDecimals(precision)
+
+    def move_motor_absolute(self, x: float, y: float) -> None:
+        """
+        Move the motor to the target coordinates.
+        Args:
+            x(float): Target x coordinate.
+            y(float): Target y coordinate.
+        """
+        # self._enable_motor_controls(False)
+        target_coordinates = (x, y)
+        self.motor_thread.move_absolute(self.motor_x, self.motor_y, target_coordinates)
+        if self.ui.checkBox_save_with_go.isChecked():
+            self.save_absolute_coordinates()
+
+    def _init_keyboard_shortcuts(self):
+        """Initialize the keyboard shortcuts."""
+        # Go absolute button
+        self.ui.pushButton_go_absolute.setShortcut("Ctrl+G")
+        self.ui.pushButton_go_absolute.setToolTip("Ctrl+G")
+
+        # Set absolute coordinates
+        self.ui.pushButton_set.setShortcut("Ctrl+D")
+        self.ui.pushButton_set.setToolTip("Ctrl+D")
+
+        # Save Current coordinates
+        self.ui.pushButton_save.setShortcut("Ctrl+S")
+        self.ui.pushButton_save.setToolTip("Ctrl+S")
+
+        # Stop Button
+        self.ui.pushButton_stop.setShortcut("Ctrl+X")
+        self.ui.pushButton_stop.setToolTip("Ctrl+X")
+
+    def save_absolute_coordinates(self):
+        """Emit the setup coordinates from the spinboxes"""
+
+        x, y = round(self.ui.spinBox_absolute_x.value(), self.precision), round(
+            self.ui.spinBox_absolute_y.value(), self.precision
+        )
+        self.coordinates_signal.emit((x, y))
+
+    def save_current_coordinates(self):
+        """Emit the current coordinates from the motor thread"""
+        x, y = self.motor_thread.get_coordinates(self.motor_x, self.motor_y)
+        self.coordinates_signal.emit((round(x, self.precision), round(y, self.precision)))

bec_widgets/widgets/motor_control/movement_relative/movement_relative.py

@@ -0,0 +1,227 @@
+import os
+
+from qtpy import uic
+from qtpy.QtCore import Qt
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtGui import QKeySequence
+from qtpy.QtWidgets import QDoubleSpinBox, QShortcut, QWidget
+
+from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
+
+
+class MotorControlRelative(MotorControlWidget):
+    """
+    Widget for controlling the motors to relative coordinates.
+
+    Signals:
+        precision_signal (pyqtSignal): Signal to emit the precision of the coordinates.
+    Slots:
+        change_motors (pyqtSlot(str,str)): Slot to change the active motors.
+        enable_motor_controls (pyqtSlot): Slot to enable/disable the motor controls.
+    """
+
+    precision_signal = pyqtSignal(int)
+
+    def _load_ui(self):
+        """Load the UI from the .ui file."""
+        # Loading UI
+        current_path = os.path.dirname(__file__)
+        uic.loadUi(os.path.join(current_path, "movement_relative.ui"), self)
+
+    def _init_ui(self):
+        """Initialize the UI."""
+        self._init_ui_motor_control()
+        self._init_keyboard_shortcuts()
+
+    @pyqtSlot(dict)
+    def on_config_update(self, config: dict) -> None:
+        """
+        Update config dict
+        Args:
+            config(dict): New config dict
+        """
+        self.config = config
+
+        # Get motor names
+        self.motor_x, self.motor_y = (
+            self.config["motor_control"]["motor_x"],
+            self.config["motor_control"]["motor_y"],
+        )
+
+        # Update step precision
+        self.precision = self.config["motor_control"]["precision"]
+        self.spinBox_precision.setValue(self.precision)
+
+        # Update step sizes
+        self.spinBox_step_x.setValue(self.config["motor_control"]["step_size_x"])
+        self.spinBox_step_y.setValue(self.config["motor_control"]["step_size_y"])
+
+        # Checkboxes for keyboard shortcuts and x/y step size link
+        self.checkBox_same_xy.setChecked(self.config["motor_control"]["step_x_y_same"])
+        self.checkBox_enableArrows.setChecked(self.config["motor_control"]["move_with_arrows"])
+
+        self._init_ui()
+
+    def _init_ui_motor_control(self) -> None:
+        """Initialize the motor control elements"""
+
+        # Connect checkbox and spinBoxes
+        self.checkBox_same_xy.stateChanged.connect(self._sync_step_sizes)
+        self.spinBox_step_x.valueChanged.connect(self._update_step_size_x)
+        self.spinBox_step_y.valueChanged.connect(self._update_step_size_y)
+
+        self.toolButton_right.clicked.connect(
+            lambda: self.move_motor_relative(self.motor_x, "x", 1)
+        )
+        self.toolButton_left.clicked.connect(
+            lambda: self.move_motor_relative(self.motor_x, "x", -1)
+        )
+        self.toolButton_up.clicked.connect(lambda: self.move_motor_relative(self.motor_y, "y", 1))
+        self.toolButton_down.clicked.connect(
+            lambda: self.move_motor_relative(self.motor_y, "y", -1)
+        )
+
+        # Switch between key shortcuts active
+        self.checkBox_enableArrows.stateChanged.connect(self._update_arrow_key_shortcuts)
+        self._update_arrow_key_shortcuts()
+
+        # Enable/Disable GUI
+        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
+
+        # Precision update
+        self.spinBox_precision.valueChanged.connect(lambda x: self._update_precision(x))
+
+        # Error messages
+        self.motor_thread.motor_error.connect(
+            lambda error: MotorControlErrors.display_error_message(error)
+        )
+
+        # Stop Button
+        self.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
+
+    def _init_keyboard_shortcuts(self) -> None:
+        """Initialize the keyboard shortcuts"""
+
+        # Increase/decrease step size for X motor
+        increase_x_shortcut = QShortcut(QKeySequence("Ctrl+A"), self)
+        decrease_x_shortcut = QShortcut(QKeySequence("Ctrl+Z"), self)
+        increase_x_shortcut.activated.connect(
+            lambda: self._change_step_size(self.spinBox_step_x, 2)
+        )
+        decrease_x_shortcut.activated.connect(
+            lambda: self._change_step_size(self.spinBox_step_x, 0.5)
+        )
+        self.spinBox_step_x.setToolTip("Increase step size: Ctrl+A\nDecrease step size: Ctrl+Z")
+
+        # Increase/decrease step size for Y motor
+        increase_y_shortcut = QShortcut(QKeySequence("Alt+A"), self)
+        decrease_y_shortcut = QShortcut(QKeySequence("Alt+Z"), self)
+        increase_y_shortcut.activated.connect(
+            lambda: self._change_step_size(self.spinBox_step_y, 2)
+        )
+        decrease_y_shortcut.activated.connect(
+            lambda: self._change_step_size(self.spinBox_step_y, 0.5)
+        )
+        self.spinBox_step_y.setToolTip("Increase step size: Alt+A\nDecrease step size: Alt+Z")
+
+        # Stop Button
+        self.pushButton_stop.setShortcut("Ctrl+X")
+        self.pushButton_stop.setToolTip("Ctrl+X")
+
+    def _update_arrow_key_shortcuts(self) -> None:
+        """Update the arrow key shortcuts based on the checkbox state."""
+        if self.checkBox_enableArrows.isChecked():
+            # Set the arrow key shortcuts for motor movement
+            self.toolButton_right.setShortcut(Qt.Key_Right)
+            self.toolButton_left.setShortcut(Qt.Key_Left)
+            self.toolButton_up.setShortcut(Qt.Key_Up)
+            self.toolButton_down.setShortcut(Qt.Key_Down)
+        else:
+            # Clear the shortcuts
+            self.toolButton_right.setShortcut("")
+            self.toolButton_left.setShortcut("")
+            self.toolButton_up.setShortcut("")
+            self.toolButton_down.setShortcut("")
+
+    def _update_precision(self, precision: int) -> None:
+        """
+        Update the precision of the coordinates.
+        Args:
+            precision(int): Precision of the coordinates.
+        """
+        self.spinBox_step_x.setDecimals(precision)
+        self.spinBox_step_y.setDecimals(precision)
+        self.precision_signal.emit(precision)
+
+    def _change_step_size(self, spinBox: QDoubleSpinBox, factor: float) -> None:
+        """
+        Change the step size of the spinbox.
+        Args:
+            spinBox(QDoubleSpinBox): Spinbox to change the step size.
+            factor(float): Factor to change the step size.
+        """
+        old_step = spinBox.value()
+        new_step = old_step * factor
+        spinBox.setValue(new_step)
+
+    def _sync_step_sizes(self):
+        """Sync step sizes based on checkbox state."""
+        if self.checkBox_same_xy.isChecked():
+            value = self.spinBox_step_x.value()
+            self.spinBox_step_y.setValue(value)
+
+    def _update_step_size_x(self):
+        """Update step size for x if checkbox is checked."""
+        if self.checkBox_same_xy.isChecked():
+            value = self.spinBox_step_x.value()
+            self.spinBox_step_y.setValue(value)
+
+    def _update_step_size_y(self):
+        """Update step size for y if checkbox is checked."""
+        if self.checkBox_same_xy.isChecked():
+            value = self.spinBox_step_y.value()
+            self.spinBox_step_x.setValue(value)
+
+    @pyqtSlot(str, str)
+    def change_motors(self, motor_x: str, motor_y: str):
+        """
+        Change the active motors and update config.
+        Can be connected to the selected_motors_signal from MotorControlSelection.
+        Args:
+            motor_x(str): New motor X to be controlled.
+            motor_y(str): New motor Y to be controlled.
+        """
+        self.motor_x = motor_x
+        self.motor_y = motor_y
+        self.config["motor_control"]["motor_x"] = motor_x
+        self.config["motor_control"]["motor_y"] = motor_y
+
+    @pyqtSlot(bool)
+    def enable_motor_controls(self, disable: bool) -> None:
+        """
+        Enable or disable the motor controls.
+        Args:
+            disable(bool): True to disable, False to enable.
+        """
+
+        # Disable or enable all controls within the motorControl_absolute group box
+        for widget in self.motorControl.findChildren(QWidget):
+            widget.setEnabled(disable)
+
+        # Enable the pushButton_stop if the motor is moving
+        self.pushButton_stop.setEnabled(True)
+
+    def move_motor_relative(self, motor, axis: str, direction: int) -> None:
+        """
+        Move the motor relative to the current position.
+        Args:
+            motor: Motor to move.
+            axis(str): Axis to move.
+            direction(int): Direction to move. 1 for positive, -1 for negative.
+        """
+        if axis == "x":
+            step = direction * self.spinBox_step_x.value()
+        elif axis == "y":
+            step = direction * self.spinBox_step_y.value()
+        self.motor_thread.move_relative(motor, step)

bec_widgets/widgets/motor_control/selection/motor_selection_launch.py

@@ -0,0 +1,30 @@
+import qdarktheme
+from qtpy.QtWidgets import QApplication
+
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.widgets.motor_control.selection.selection import MotorControlSelection
+
+CONFIG_DEFAULT = {
+    "motor_control": {
+        "motor_x": "samx",
+        "motor_y": "samy",
+        "step_size_x": 3,
+        "step_size_y": 5,
+        "precision": 4,
+        "step_x_y_same": False,
+        "move_with_arrows": False,
+    }
+}
+if __name__ == "__main__":
+    bec_dispatcher = BECDispatcher()
+    # BECclient global variables
+    client = bec_dispatcher.client
+    client.start()
+
+    app = QApplication([])
+    qdarktheme.setup_theme("auto")
+    motor_control = MotorControlSelection(client=client, config=CONFIG_DEFAULT)
+
+    window = motor_control
+    window.show()
+    app.exec()

bec_widgets/widgets/motor_control/selection/registerselection.py

@@ -0,0 +1,13 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from selection import MotorControlSelection
+from selectionplugin import MotorControlSelectionPlugin
+
+from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+# Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
+
+
+if __name__ == "__main__":
+    QPyDesignerCustomWidgetCollection.addCustomWidget(MotorControlSelectionPlugin())

bec_widgets/widgets/motor_control/selection/selection.py

@@ -0,0 +1,110 @@
+# pylint: disable = no-name-in-module,missing-module-docstring
+import os
+
+from qtpy import uic
+from qtpy.QtCore import Signal as pyqtSignal
+from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtWidgets import QComboBox
+
+from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
+
+
+class MotorControlSelection(MotorControlWidget):
+    """
+    Widget for selecting the motors to control.
+
+    Signals:
+        selected_motors_signal (pyqtSignal(str,str)): Signal to emit the selected motors.
+    Slots:
+        get_available_motors (pyqtSlot): Slot to populate the available motors in the combo boxes and set the index based on the configuration.
+        enable_motor_controls (pyqtSlot(bool)): Slot to enable/disable the motor controls GUI.
+        on_config_update (pyqtSlot(dict)): Slot to update the config dict.
+    """
+
+    selected_motors_signal = pyqtSignal(str, str)
+
+    def _load_ui(self):
+        """Load the UI from the .ui file."""
+        current_path = os.path.dirname(__file__)
+        uic.loadUi(os.path.join(current_path, "selection.ui"), self)
+
+    def _init_ui(self):
+        """Initialize the UI."""
+        # Lock GUI while motors are moving
+        self.motor_thread.lock_gui.connect(self.enable_motor_controls)
+
+        self.pushButton_connecMotors.clicked.connect(self.select_motor)
+        self.get_available_motors()
+
+        # Connect change signals to change color
+        self.comboBox_motor_x.currentIndexChanged.connect(
+            lambda: self.set_combobox_style(self.comboBox_motor_x, "#ffa700")
+        )
+        self.comboBox_motor_y.currentIndexChanged.connect(
+            lambda: self.set_combobox_style(self.comboBox_motor_y, "#ffa700")
+        )
+
+    @pyqtSlot(dict)
+    def on_config_update(self, config: dict) -> None:
+        """
+        Update config dict
+        Args:
+            config(dict): New config dict
+        """
+        self.config = config
+
+        # Get motor names
+        self.motor_x, self.motor_y = (
+            self.config["motor_control"]["motor_x"],
+            self.config["motor_control"]["motor_y"],
+        )
+
+        self._init_ui()
+
+    @pyqtSlot(bool)
+    def enable_motor_controls(self, enable: bool) -> None:
+        """
+        Enable or disable the motor controls.
+        Args:
+            enable(bool): True to enable, False to disable.
+        """
+        self.motorSelection.setEnabled(enable)
+
+    @pyqtSlot()
+    def get_available_motors(self) -> None:
+        """
+        Slot to populate the available motors in the combo boxes and set the index based on the configuration.
+        """
+        # Get all available motors
+        self.motor_list = self.motor_thread.get_all_motors_names()
+
+        # Populate the combo boxes
+        self.comboBox_motor_x.addItems(self.motor_list)
+        self.comboBox_motor_y.addItems(self.motor_list)
+
+        # Set the index based on the config if provided
+        if self.config:
+            index_x = self.comboBox_motor_x.findText(self.motor_x)
+            index_y = self.comboBox_motor_y.findText(self.motor_y)
+            self.comboBox_motor_x.setCurrentIndex(index_x if index_x != -1 else 0)
+            self.comboBox_motor_y.setCurrentIndex(index_y if index_y != -1 else 0)
+
+    def set_combobox_style(self, combobox, color: str) -> None:
+        """
+        Set the combobox style to a specific color.
+        Args:
+            combobox(QComboBox): Combobox to change the color.
+            color(str): Color to set the combobox to.
+        """
+        combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
+
+    def select_motor(self):
+        """Emit the selected motors"""
+        motor_x = self.comboBox_motor_x.currentText()
+        motor_y = self.comboBox_motor_y.currentText()
+
+        # Reset the combobox color to normal after selection
+        self.set_combobox_style(self.comboBox_motor_x, "")
+        self.set_combobox_style(self.comboBox_motor_y, "")
+
+        self.selected_motors_signal.emit(motor_x, motor_y)

bec_widgets/widgets/motor_control/selection/selection.pyproject

@@ -0,0 +1,4 @@
+{
+    "files": ["selection.py", "motor_selection_launch.py", "registertictactoe.py", "tictactoeplugin.py",
+    "tictactoetaskmenu.py"]
+}

bec_widgets/widgets/motor_control/selection/selectionplugin.py

@@ -0,0 +1,58 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from selection import MotorControlSelection
+
+from PySide6.QtGui import QIcon
+from PySide6.QtDesigner import QDesignerCustomWidgetInterface
+
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='MotorControlSelection' name='selection'>
+    </widget>
+</ui>
+"""
+
+
+class MotorControlSelectionPlugin(QDesignerCustomWidgetInterface):
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = MotorControlSelection(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return ""
+
+    def icon(self):
+        return QIcon()
+
+    def includeFile(self):
+        return "selection"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+        # manager = form_editor.extensionManager()
+        # iid = TicTacToeTaskMenuFactory.task_menu_iid()
+        # manager.registerExtensions(TicTacToeTaskMenuFactory(manager), iid)
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "MotorControlSelection"
+
+    def toolTip(self):
+        return "MotorControl Selection Example for BEC Widgets"
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/widgets/motor_map/__init__.py

@@ -1 +0,0 @@
-from .motor_map import MotorMap

bec_widgets/widgets/motor_map/motor_map.py

@@ -1,594 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring
-from __future__ import annotations
-
-import time
-from typing import Any, Union
-
-import numpy as np
-import pyqtgraph as pg
-from bec_lib.endpoints import MessageEndpoints
-from qtpy import QtCore, QtGui
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QApplication
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.yaml_dialog import load_yaml
-
-CONFIG_DEFAULT = {
-    "plot_settings": {
-        "colormap": "Greys",
-        "scatter_size": 5,
-        "max_points": 1000,
-        "num_dim_points": 100,
-        "precision": 2,
-        "num_columns": 1,
-        "background_value": 25,
-    },
-    "motors": [
-        {
-            "plot_name": "Motor Map",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "samx", "entry": "samx"}],
-                "y": [{"name": "samy", "entry": "samy"}],
-            },
-        },
-        {
-            "plot_name": "Motor Map 2 ",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "aptrx", "entry": "aptrx"}],
-                "y": [{"name": "aptry", "entry": "aptry"}],
-            },
-        },
-    ],
-}
-
-
-class MotorMap(pg.GraphicsLayoutWidget):
-    update_signal = pyqtSignal()
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: dict = None,
-        gui_id=None,
-        skip_validation: bool = True,
-    ):
-        super().__init__(parent=parent)
-
-        # Import BEC related stuff
-        bec_dispatcher = BECDispatcher()
-        self.client = bec_dispatcher.client if client is None else client
-        self.dev = self.client.device_manager.devices
-
-        # TODO import validator when prepared
-        self.gui_id = gui_id
-
-        if self.gui_id is None:
-            self.gui_id = self.__class__.__name__ + str(time.time())
-
-        # Current configuration
-        self.config = config
-        self.skip_validation = skip_validation  # TODO implement validation when validator is ready
-
-        # Connect the update signal to the update plot method
-        self.proxy_update_plot = pg.SignalProxy(
-            self.update_signal, rateLimit=25, slot=self._update_plots
-        )
-
-        # Config related variables
-        self.plot_data = None
-        self.plot_settings = None
-        self.max_points = None
-        self.num_dim_points = None
-        self.scatter_size = None
-        self.precision = None
-        self.background_value = None
-        self.database = {}
-        self.device_mapping = {}
-        self.plots = {}
-        self.grid_coordinates = []
-        self.curves_data = {}
-
-        # Init UI with config
-        if self.config is None:
-            print("No initial config found for MotorMap. Using default config.")
-        else:
-            self.on_config_update(self.config)
-
-    @pyqtSlot(dict)
-    def on_config_update(self, config: dict) -> None:
-        """
-        Validate and update the configuration settings for the PlotApp.
-        Args:
-            config(dict): Configuration settings
-        """
-        # TODO implement BEC CLI commands similar to BECPlotter
-        # convert config from BEC CLI to correct formatting
-        config_tag = config.get("config", None)
-        if config_tag is not None:
-            config = config["config"]
-
-        if self.skip_validation is True:
-            self.config = config
-            self._init_config()
-
-        else:  # TODO implement validator
-            print("Do validation")
-
-    @pyqtSlot(str, str, int)
-    def change_motors(self, motor_x: str, motor_y: str, subplot: int = 0) -> None:
-        """
-        Change the active motors for the plot.
-        Args:
-            motor_x(str): Motor name for the X axis.
-            motor_y(str): Motor name for the Y axis.
-            subplot(int): Subplot number.
-        """
-        if subplot >= len(self.plot_data):
-            print(f"Invalid subplot index: {subplot}. Available subplots: {len(self.plot_data)}")
-            return
-
-        # Update the motor names in the plot configuration
-        self.config["motors"][subplot]["signals"]["x"][0]["name"] = motor_x
-        self.config["motors"][subplot]["signals"]["x"][0]["entry"] = motor_x
-        self.config["motors"][subplot]["signals"]["y"][0]["name"] = motor_y
-        self.config["motors"][subplot]["signals"]["y"][0]["entry"] = motor_y
-
-        # reinitialise the config and UI
-        self._init_config()
-
-    def _init_config(self):
-        """Initiate the configuration."""
-
-        # Global widget settings
-        self._get_global_settings()
-
-        # Motor settings
-        self.plot_data = self.config.get("motors", {})
-
-        # Include motor limits into the config
-        self._add_limits_to_plot_data()
-
-        # Initialize the database
-        self.database = self._init_database()
-
-        # Create device mapping for x/y motor pairs
-        self.device_mapping = self._create_device_mapping()
-
-        # Initialize the plot UI
-        self._init_ui()
-
-        # Connect motors to slots
-        self._connect_motors_to_slots()
-
-        # Render init position of selected motors
-        self._update_plots()
-
-    def _get_global_settings(self):
-        """Get global settings from the config."""
-        self.plot_settings = self.config.get("plot_settings", {})
-
-        self.max_points = self.plot_settings.get("max_points", 5000)
-        self.num_dim_points = self.plot_settings.get("num_dim_points", 100)
-        self.scatter_size = self.plot_settings.get("scatter_size", 5)
-        self.precision = self.plot_settings.get("precision", 2)
-        self.background_value = self.plot_settings.get("background_value", 25)
-
-    def _create_device_mapping(self):
-        """
-        Create a mapping of device names to their corresponding x/y devices.
-        """
-        mapping = {}
-        for motor in self.config.get("motors", []):
-            for axis in ["x", "y"]:
-                for signal in motor["signals"][axis]:
-                    other_axis = "y" if axis == "x" else "x"
-                    corresponding_device = motor["signals"][other_axis][0]["name"]
-                    mapping[signal["name"]] = corresponding_device
-        return mapping
-
-    def _connect_motors_to_slots(self):
-        """Connect motors to slots."""
-
-        # Disconnect all slots before connecting a new ones
-        bec_dispatcher = BECDispatcher()
-        bec_dispatcher.disconnect_all()
-
-        # Get list of all unique motors
-        unique_motors = []
-        for motor_config in self.plot_data:
-            for axis in ["x", "y"]:
-                for signal in motor_config["signals"][axis]:
-                    unique_motors.append(signal["name"])
-        unique_motors = list(set(unique_motors))
-
-        # Create list of endpoint
-        endpoints = []
-        for motor in unique_motors:
-            endpoints.append(MessageEndpoints.device_readback(motor))
-
-        # Connect all topics to a single slot
-        bec_dispatcher.connect_slot(self.on_device_readback, endpoints)
-
-    def _add_limits_to_plot_data(self):
-        """
-        Add limits to each motor signal in the plot_data.
-        """
-        for motor_config in self.plot_data:
-            for axis in ["x", "y"]:
-                for signal in motor_config["signals"][axis]:
-                    motor_name = signal["name"]
-                    motor_limits = self._get_motor_limit(motor_name)
-                    signal["limits"] = motor_limits
-
-    def _get_motor_limit(self, motor: str) -> Union[list | None]:
-        """
-        Get the motor limit from the config.
-        Args:
-            motor(str): Motor name.
-
-        Returns:
-            float: Motor limit.
-        """
-        try:
-            limits = self.dev[motor].limits
-            if limits == [0, 0]:
-                return None
-            return limits
-        except AttributeError:  # TODO maybe not needed, if no limits it returns [0,0]
-            # If the motor doesn't have a 'limits' attribute, return a default value or raise a custom exception
-            print(f"The device '{motor}' does not have defined limits.")
-            return None
-
-    def _init_database(self):
-        """Initiate the database according the config."""
-        database = {}
-
-        for plot in self.plot_data:
-            for axis, signals in plot["signals"].items():
-                for signal in signals:
-                    name = signal["name"]
-                    entry = signal.get("entry", name)
-                    if name not in database:
-                        database[name] = {}
-                    if entry not in database[name]:
-                        database[name][entry] = [self.get_coordinate(name, entry)]
-        return database
-
-    def get_coordinate(self, name, entry):
-        """Get the initial coordinate value for a motor."""
-        try:
-            return self.dev[name].read()[entry]["value"]
-        except Exception as e:
-            print(f"Error getting initial value for {name}: {e}")
-            return None
-
-    def _init_ui(self, num_columns: int = 3) -> None:
-        """
-        Initialize the UI components, create plots and store their grid positions.
-
-        Args:
-            num_columns (int): Number of columns to wrap the layout.
-
-        This method initializes a dictionary `self.plots` to store the plot objects
-        along with their corresponding x and y signal names. It dynamically arranges
-        the plots in a grid layout based on the given number of columns and dynamically
-        stretches the last plots to fit the remaining space.
-        """
-        self.clear()
-        self.plots = {}
-        self.grid_coordinates = []
-        self.curves_data = {}  # TODO moved from init_curves
-
-        num_plots = len(self.plot_data)
-
-        # Check if num_columns exceeds the number of plots
-        if num_columns >= num_plots:
-            num_columns = num_plots
-            self.plot_settings["num_columns"] = num_columns  # Update the settings
-            print(
-                "Warning: num_columns in the YAML file was greater than the number of plots."
-                f" Resetting num_columns to number of plots:{num_columns}."
-            )
-        else:
-            self.plot_settings["num_columns"] = num_columns  # Update the settings
-
-        num_rows = num_plots // num_columns
-        last_row_cols = num_plots % num_columns
-        remaining_space = num_columns - last_row_cols
-
-        for i, plot_config in enumerate(self.plot_data):
-            row, col = i // num_columns, i % num_columns
-            colspan = 1
-
-            if row == num_rows and remaining_space > 0:
-                if last_row_cols == 1:
-                    colspan = num_columns
-                else:
-                    colspan = remaining_space // last_row_cols + 1
-                    remaining_space -= colspan - 1
-                    last_row_cols -= 1
-
-            if "plot_name" not in plot_config:
-                plot_name = f"Plot ({row}, {col})"
-                plot_config["plot_name"] = plot_name
-            else:
-                plot_name = plot_config["plot_name"]
-
-            x_label = plot_config.get("x_label", "")
-            y_label = plot_config.get("y_label", "")
-
-            plot = self.addPlot(row=row, col=col, colspan=colspan, title="Motor position: (X, Y)")
-            plot.setLabel("bottom", f"{x_label} ({plot_config['signals']['x'][0]['name']})")
-            plot.setLabel("left", f"{y_label} ({plot_config['signals']['y'][0]['name']})")
-            plot.addLegend()
-            # self._set_plot_colors(plot, self.plot_settings) #TODO implement colors
-
-            self.plots[plot_name] = plot
-            self.grid_coordinates.append((row, col))
-
-            self._init_motor_map(plot_config)
-
-    def _init_motor_map(self, plot_config: dict) -> None:
-        """
-        Initialize the motor map.
-        Args:
-            plot_config(dict): Plot configuration.
-        """
-
-        # Get plot name to find appropriate plot
-        plot_name = plot_config.get("plot_name", "")
-
-        # Reset the curves data
-        plot = self.plots[plot_name]
-        plot.clear()
-
-        limits_x, limits_y = plot_config["signals"]["x"][0].get("limits", None), plot_config[
-            "signals"
-        ]["y"][0].get("limits", None)
-        if limits_x is not None and limits_y is not None:
-            self._make_limit_map(plot, [limits_x, limits_y])
-
-        # Initiate ScatterPlotItem for motor coordinates
-        self.curves_data[plot_name] = {
-            "pos": pg.ScatterPlotItem(
-                size=self.scatter_size, pen=pg.mkPen(None), brush=pg.mkBrush(255, 255, 255, 255)
-            )
-        }
-
-        # Add the scatter plot to the plot
-        plot.addItem(self.curves_data[plot_name]["pos"])
-        # Set the point map to be always on the top
-        self.curves_data[plot_name]["pos"].setZValue(0)
-
-        # Add all layers to the plot
-        plot.showGrid(x=True, y=True)
-
-        # Add the crosshair for motor coordinates
-        init_position_x = self._get_motor_init_position(
-            plot_config["signals"]["x"][0]["name"], plot_config["signals"]["x"][0]["entry"]
-        )
-        init_position_y = self._get_motor_init_position(
-            plot_config["signals"]["y"][0]["name"], plot_config["signals"]["y"][0]["entry"]
-        )
-        self._add_coordinantes_crosshair(plot_name, init_position_x, init_position_y)
-
-    def _add_coordinantes_crosshair(self, plot_name: str, x: float, y: float) -> None:
-        """
-        Add crosshair to the plot to highlight the current position.
-        Args:
-            plot_name(str): Name of the plot.
-            x(float): X coordinate.
-            y(float): Y coordinate.
-        """
-        # find the current plot
-        plot = self.plots[plot_name]
-
-        # Crosshair to highlight the current position
-        highlight_H = pg.InfiniteLine(
-            angle=0, movable=False, pen=pg.mkPen(color="r", width=1, style=QtCore.Qt.DashLine)
-        )
-        highlight_V = pg.InfiniteLine(
-            angle=90, movable=False, pen=pg.mkPen(color="r", width=1, style=QtCore.Qt.DashLine)
-        )
-
-        # Add crosshair to the curve list for future referencing
-        self.curves_data[plot_name]["highlight_H"] = highlight_H
-        self.curves_data[plot_name]["highlight_V"] = highlight_V
-
-        # Add crosshair to the plot
-        plot.addItem(highlight_H)
-        plot.addItem(highlight_V)
-
-        highlight_H.setPos(x)
-        highlight_V.setPos(y)
-
-    def _make_limit_map(self, plot: pg.PlotItem, limits: list):
-        """
-        Make a limit map from the limits list.
-
-        Args:
-            plot(pg.PlotItem): Plot to add the limit map to.
-            limits(list): List of limits.
-        """
-        # Define the size of the image map based on the motor's limits
-        limit_x_min, limit_x_max = limits[0]
-        limit_y_min, limit_y_max = limits[1]
-
-        map_width = int(limit_x_max - limit_x_min + 1)
-        map_height = int(limit_y_max - limit_y_min + 1)
-
-        limit_map_data = np.full((map_width, map_height), self.background_value, dtype=np.float32)
-
-        # Create the image map
-        limit_map = pg.ImageItem()
-        limit_map.setImage(limit_map_data)
-        plot.addItem(limit_map)
-
-        # Translate and scale the image item to match the motor coordinates
-        tr = QtGui.QTransform()
-        tr.translate(limit_x_min, limit_y_min)
-        limit_map.setTransform(tr)
-
-    def _get_motor_init_position(self, name: str, entry: str) -> float:
-        """
-        Get the motor initial position from the config.
-        Args:
-            name(str): Motor name.
-            entry(str): Motor entry.
-        Returns:
-            float: Motor initial position.
-        """
-        init_position = round(self.dev[name].read()[entry]["value"], self.precision)
-        return init_position
-
-    def _update_plots(self):
-        """Update the motor position on plots."""
-        for plot_name, curve_list in self.curves_data.items():
-            plot_config = next(
-                (pc for pc in self.plot_data if pc.get("plot_name") == plot_name), None
-            )
-            if not plot_config:
-                continue
-
-            # Get the motor coordinates
-            x_motor_name = plot_config["signals"]["x"][0]["name"]
-            x_motor_entry = plot_config["signals"]["x"][0]["entry"]
-            y_motor_name = plot_config["signals"]["y"][0]["name"]
-            y_motor_entry = plot_config["signals"]["y"][0]["entry"]
-
-            # update motor position only if there is data
-            if (
-                len(self.database[x_motor_name][x_motor_entry]) >= 1
-                and len(self.database[y_motor_name][y_motor_entry]) >= 1
-            ):
-                # Relevant data for the plot
-                motor_x_data = self.database[x_motor_name][x_motor_entry]
-                motor_y_data = self.database[y_motor_name][y_motor_entry]
-
-                # Setup gradient brush for history
-                brushes = [pg.mkBrush(50, 50, 50, 255)] * len(motor_x_data)
-
-                # Calculate the decrement step based on self.num_dim_points
-                decrement_step = (255 - 50) / self.num_dim_points
-
-                for i in range(1, min(self.num_dim_points + 1, len(motor_x_data) + 1)):
-                    brightness = max(60, 255 - decrement_step * (i - 1))
-                    brushes[-i] = pg.mkBrush(brightness, brightness, brightness, 255)
-
-                brushes[-1] = pg.mkBrush(
-                    255, 255, 255, 255
-                )  # Newest point is always full brightness
-
-                # Update the scatter plot
-                self.curves_data[plot_name]["pos"].setData(
-                    x=motor_x_data, y=motor_y_data, brush=brushes, pen=None, size=self.scatter_size
-                )
-
-                # Get last know position for crosshair
-                current_x = motor_x_data[-1]
-                current_y = motor_y_data[-1]
-
-                # Update plot title
-                self.plots[plot_name].setTitle(
-                    f"Motor position: ({round(current_x,self.precision)}, {round(current_y,self.precision)})"
-                )
-
-                # Update the crosshair
-                self.curves_data[plot_name]["highlight_V"].setPos(current_x)
-                self.curves_data[plot_name]["highlight_H"].setPos(current_y)
-
-    @pyqtSlot(list, str, str)
-    def plot_saved_coordinates(self, coordinates: list, tag: str, color: str):
-        """
-        Plot saved coordinates on the map.
-        Args:
-            coordinates(list): List of coordinates to be plotted.
-            tag(str): Tag for the coordinates for future reference.
-            color(str): Color to plot coordinates in.
-        """
-        for plot_name in self.plots:
-            plot = self.plots[plot_name]
-
-            # Clear previous saved points
-            if tag in self.curves_data[plot_name]:
-                plot.removeItem(self.curves_data[plot_name][tag])
-
-            # Filter coordinates to be shown
-            visible_coords = [coord[:2] for coord in coordinates if coord[2]]
-
-            if visible_coords:
-                saved_points = pg.ScatterPlotItem(
-                    pos=np.array(visible_coords), brush=pg.mkBrush(color)
-                )
-                plot.addItem(saved_points)
-                self.curves_data[plot_name][tag] = saved_points
-
-    @pyqtSlot(dict)
-    def on_device_readback(self, msg: dict):
-        """
-        Update the motor coordinates on the plots.
-        Args:
-            msg (dict): Message received with device readback data.
-        """
-
-        for device_name, device_info in msg["signals"].items():
-            # Check if the device is relevant to our current context
-            if device_name in self.device_mapping:
-                self._update_device_data(device_name, device_info["value"])
-
-        self.update_signal.emit()
-
-    def _update_device_data(self, device_name: str, value: float):
-        """
-        Update the device data.
-        Args:
-            device_name (str): Device name.
-            value (float): Device value.
-        """
-        if device_name in self.database:
-            self.database[device_name][device_name].append(value)
-
-            corresponding_device = self.device_mapping.get(device_name)
-            if corresponding_device and corresponding_device in self.database:
-                last_value = (
-                    self.database[corresponding_device][corresponding_device][-1]
-                    if self.database[corresponding_device][corresponding_device]
-                    else None
-                )
-                self.database[corresponding_device][corresponding_device].append(last_value)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import argparse
-    import json
-    import sys
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--config_file", help="Path to the config file.")
-    parser.add_argument("--config", help="Path to the config file.")
-    parser.add_argument("--id", help="GUI ID.")
-    args = parser.parse_args()
-
-    if args.config is not None:
-        # Load config from file
-        config = json.loads(args.config)
-    elif args.config_file is not None:
-        # Load config from file
-        config = load_yaml(args.config_file)
-    else:
-        config = CONFIG_DEFAULT
-
-    client = BECDispatcher().client
-    client.start()
-    app = QApplication(sys.argv)
-    motor_map = MotorMap(config=config, gui_id=args.id, skip_validation=True)
-    motor_map.show()
-
-    sys.exit(app.exec())

bec_widgets/widgets/plots/__init__.py

@@ -1,4 +0,0 @@
-from .image import BECImageItem, BECImageShow, ImageItemConfig
-from .motor_map import BECMotorMap, MotorMapConfig
-from .plot_base import AxisConfig, BECPlotBase, SubplotConfig
-from .waveform import BECCurve, BECWaveform, Waveform1DConfig

bec_widgets/widgets/spiral_progress_bar/__init__.py

@@ -0,0 +1 @@
+from .spiral_progress_bar import SpiralProgressBar

bec_widgets/widgets/spiral_progress_bar/ring.py

@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+from typing import Literal, Optional
+
+from bec_lib.endpoints import EndpointInfo
+from pydantic import BaseModel, Field, field_validator
+from pydantic_core import PydanticCustomError
+from qtpy import QtGui
+
+from bec_widgets.utils import BECConnector, ConnectionConfig
+
+
+class RingConnections(BaseModel):
+    slot: Literal["on_scan_progress", "on_device_readback"] = None
+    endpoint: EndpointInfo | str = None
+
+    @field_validator("endpoint")
+    def validate_endpoint(cls, v, values):
+        slot = values.data["slot"]
+        endpoint = v.endpoint if isinstance(v, EndpointInfo) else v
+        if slot == "on_scan_progress":
+            if endpoint != "scans/scan_progress":
+                raise PydanticCustomError(
+                    "unsupported endpoint",
+                    "For slot 'on_scan_progress', endpoint must be MessageEndpoint.scan_progress or 'scans/scan_progress'.",
+                    {"wrong_value": v},
+                )
+        elif slot == "on_device_readback":
+            if not endpoint.startswith("internal/devices/readback/"):
+                raise PydanticCustomError(
+                    "unsupported endpoint",
+                    "For slot 'on_device_readback', endpoint must be MessageEndpoint.device_readback(device) or 'internal/devices/readback/{device}'.",
+                    {"wrong_value": v},
+                )
+        return v
+
+
+class RingConfig(ConnectionConfig):
+    direction: int | None = Field(
+        -1, description="Direction of the progress bars. -1 for clockwise, 1 for counter-clockwise."
+    )
+    color: str | tuple | None = Field(
+        (0, 159, 227, 255),
+        description="Color for the progress bars. Can be tuple (R, G, B, A) or string HEX Code.",
+    )
+    background_color: str | tuple | None = Field(
+        (200, 200, 200, 50),
+        description="Background color for the progress bars. Can be tuple (R, G, B, A) or string HEX Code.",
+    )
+    index: int | None = Field(0, description="Index of the progress bar. 0 is outer ring.")
+    line_width: int | None = Field(5, description="Line widths for the progress bars.")
+    start_position: int | None = Field(
+        90,
+        description="Start position for the progress bars in degrees. Default is 90 degrees - corespons to "
+        "the top of the ring.",
+    )
+    min_value: int | None = Field(0, description="Minimum value for the progress bars.")
+    max_value: int | None = Field(100, description="Maximum value for the progress bars.")
+    precision: int | None = Field(3, description="Precision for the progress bars.")
+    update_behaviour: Literal["manual", "auto"] | None = Field(
+        "auto", description="Update behaviour for the progress bars."
+    )
+    connections: RingConnections | None = Field(
+        default_factory=RingConnections, description="Connections for the progress bars."
+    )
+
+
+class Ring(BECConnector):
+    USER_ACCESS = [
+        "get_all_rpc",
+        "rpc_id",
+        "config_dict",
+        "set_value",
+        "set_color",
+        "set_background",
+        "set_line_width",
+        "set_min_max_values",
+        "set_start_angle",
+        "set_connections",
+        "reset_connection",
+    ]
+
+    def __init__(
+        self,
+        parent=None,
+        parent_progress_widget=None,
+        config: RingConfig | dict | None = None,
+        client=None,
+        gui_id: Optional[str] = None,
+    ):
+        if config is None:
+            config = RingConfig(widget_class=self.__class__.__name__)
+            self.config = config
+        else:
+            if isinstance(config, dict):
+                config = RingConfig(**config)
+            self.config = config
+        super().__init__(client=client, config=config, gui_id=gui_id)
+
+        self.parent_progress_widget = parent_progress_widget
+        self.color = None
+        self.background_color = None
+        self.start_position = None
+        self.config = config
+        self.value = 0
+        self.RID = None
+        self._init_config_params()
+
+    def _init_config_params(self):
+        self.color = self.convert_color(self.config.color)
+        self.background_color = self.convert_color(self.config.background_color)
+        self.set_start_angle(self.config.start_position)
+        if self.config.connections:
+            self.set_connections(self.config.connections.slot, self.config.connections.endpoint)
+
+    def set_value(self, value: int | float):
+        self.value = round(
+            max(self.config.min_value, min(self.config.max_value, value)), self.config.precision
+        )
+
+    def set_color(self, color: str | tuple):
+        self.config.color = color
+        self.color = self.convert_color(color)
+
+    def set_background(self, color: str | tuple):
+        self.config.background_color = color
+        self.color = self.convert_color(color)
+
+    def set_line_width(self, width: int):
+        self.config.line_width = width
+
+    def set_min_max_values(self, min_value: int, max_value: int):
+        self.config.min_value = min_value
+        self.config.max_value = max_value
+
+    def set_start_angle(self, start_angle: int):
+        self.config.start_position = start_angle
+        self.start_position = start_angle * 16
+
+    @staticmethod
+    def convert_color(color):
+        converted_color = None
+        if isinstance(color, str):
+            converted_color = QtGui.QColor(color)
+        elif isinstance(color, tuple):
+            converted_color = QtGui.QColor(*color)
+        return converted_color
+
+    def set_connections(self, slot: str, endpoint: str | EndpointInfo):
+        if self.config.connections.endpoint == endpoint and self.config.connections.slot == slot:
+            return
+        else:
+            self.bec_dispatcher.disconnect_slot(
+                self.config.connections.slot, self.config.connections.endpoint
+            )
+            self.config.connections = RingConnections(slot=slot, endpoint=endpoint)
+            self.bec_dispatcher.connect_slot(getattr(self, slot), endpoint)
+
+    def reset_connection(self):
+        self.bec_dispatcher.disconnect_slot(
+            self.config.connections.slot, self.config.connections.endpoint
+        )
+        self.config.connections = RingConnections()
+
+    def on_scan_progress(self, msg, meta):
+        current_RID = meta.get("RID", None)
+        if current_RID != self.RID:
+            self.set_min_max_values(0, msg.get("max_value", 100))
+        self.set_value(msg.get("value", 0))
+        self.parent_progress_widget.update()
+
+    def on_device_readback(self, msg, meta):
+        if isinstance(self.config.connections.endpoint, EndpointInfo):
+            endpoint = self.config.connections.endpoint.endpoint
+        else:
+            endpoint = self.config.connections.endpoint
+        device = endpoint.split("/")[-1]
+        value = msg.get("signals").get(device).get("value")
+        self.set_value(value)
+        self.parent_progress_widget.update()
+
+    def cleanup(self):
+        self.reset_connection()
+        super().cleanup()

bec_widgets/widgets/spiral_progress_bar/spiral_progress_bar.py

@@ -0,0 +1,594 @@
+from __future__ import annotations
+
+from typing import Literal, Optional
+
+import pyqtgraph as pg
+from bec_lib.endpoints import MessageEndpoints
+from pydantic import Field, field_validator
+from pydantic_core import PydanticCustomError
+from qtpy import QtCore, QtGui
+from qtpy.QtCore import QSize, Slot
+from qtpy.QtWidgets import QSizePolicy, QWidget
+
+from bec_widgets.utils import BECConnector, Colors, ConnectionConfig, EntryValidator
+from bec_widgets.widgets.spiral_progress_bar.ring import Ring, RingConfig
+
+
+class SpiralProgressBarConfig(ConnectionConfig):
+    color_map: str | None = Field("magma", description="Color scheme for the progress bars.")
+    min_number_of_bars: int | None = Field(
+        1, description="Minimum number of progress bars to display."
+    )
+    max_number_of_bars: int | None = Field(
+        10, description="Maximum number of progress bars to display."
+    )
+    num_bars: int | None = Field(1, description="Number of progress bars to display.")
+    gap: int | None = Field(10, description="Gap between progress bars.")
+    auto_updates: bool | None = Field(
+        True, description="Enable or disable updates based on scan queue status."
+    )
+    rings: list[RingConfig] | None = Field([], description="List of ring configurations.")
+
+    @field_validator("num_bars")
+    def validate_num_bars(cls, v, values):
+        min_number_of_bars = values.data.get("min_number_of_bars", None)
+        max_number_of_bars = values.data.get("max_number_of_bars", None)
+        if min_number_of_bars is not None and max_number_of_bars is not None:
+            print(
+                f"Number of bars adjusted to be between defined min:{min_number_of_bars} and max:{max_number_of_bars} number of bars."
+            )
+            v = max(min_number_of_bars, min(v, max_number_of_bars))
+            return v
+
+    @field_validator("rings")
+    def validate_rings(cls, v, values):
+        if v is not None and v is not []:
+            num_bars = values.data.get("num_bars", None)
+            if len(v) != num_bars:
+                raise PydanticCustomError(
+                    "different number of configs",
+                    f"Length of rings configuration ({len(v)}) does not match the number of bars ({num_bars}).",
+                    {"wrong_value": len(v)},
+                )
+            indices = [ring.index for ring in v]
+            if sorted(indices) != list(range(len(indices))):
+                raise PydanticCustomError(
+                    "wrong indices",
+                    f"Indices of ring configurations must be unique and in order from 0 to num_bars {num_bars}.",
+                    {"wrong_value": indices},
+                )
+        return v
+
+    @field_validator("color_map")
+    def validate_color_map(cls, v, values):
+        if v is not None and v != "":
+            if v not in pg.colormap.listMaps():
+                raise PydanticCustomError(
+                    "unsupported colormap",
+                    f"Colormap '{v}' not found in the current installation of pyqtgraph",
+                    {"wrong_value": v},
+                )
+        return v
+
+
+class SpiralProgressBar(BECConnector, QWidget):
+    USER_ACCESS = [
+        "get_all_rpc",
+        "rpc_id",
+        "config_dict",
+        "rings",
+        "update_config",
+        "add_ring",
+        "remove_ring",
+        "set_precision",
+        "set_min_max_values",
+        "set_number_of_bars",
+        "set_value",
+        "set_colors_from_map",
+        "set_colors_directly",
+        "set_line_widths",
+        "set_gap",
+        "set_diameter",
+        "reset_diameter",
+        "enable_auto_updates",
+    ]
+
+    def __init__(
+        self,
+        parent=None,
+        config: SpiralProgressBarConfig | dict | None = None,
+        client=None,
+        gui_id: str | None = None,
+        num_bars: int | None = None,
+    ):
+        if config is None:
+            config = SpiralProgressBarConfig(widget_class=self.__class__.__name__)
+            self.config = config
+        else:
+            if isinstance(config, dict):
+                config = SpiralProgressBarConfig(**config, widget_class=self.__class__.__name__)
+            self.config = config
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QWidget.__init__(self, parent=None)
+
+        self.get_bec_shortcuts()
+        self.entry_validator = EntryValidator(self.dev)
+
+        self.RID = None
+        self.values = None
+
+        # For updating bar behaviour
+        self._auto_updates = True
+        self._rings = []
+
+        if num_bars is not None:
+            self.config.num_bars = max(
+                self.config.min_number_of_bars, min(num_bars, self.config.max_number_of_bars)
+            )
+        self.initialize_bars()
+
+        self.enable_auto_updates(self.config.auto_updates)
+
+    @property
+    def rings(self):
+        return self._rings
+
+    @rings.setter
+    def rings(self, value):
+        self._rings = value
+
+    def update_config(self, config: SpiralProgressBarConfig | dict):
+        """
+        Update the configuration of the widget.
+
+        Args:
+            config(SpiralProgressBarConfig|dict): Configuration to update.
+        """
+        if isinstance(config, dict):
+            config = SpiralProgressBarConfig(**config, widget_class=self.__class__.__name__)
+        self.config = config
+        self.clear_all()
+
+    def initialize_bars(self):
+        """
+        Initialize the progress bars.
+        """
+        start_positions = [90 * 16] * self.config.num_bars
+        directions = [-1] * self.config.num_bars
+
+        self.config.rings = [
+            RingConfig(
+                widget_class="Ring",
+                index=i,
+                start_positions=start_positions[i],
+                directions=directions[i],
+            )
+            for i in range(self.config.num_bars)
+        ]
+        self._rings = [
+            Ring(parent_progress_widget=self, config=config) for config in self.config.rings
+        ]
+
+        if self.config.color_map:
+            self.set_colors_from_map(self.config.color_map)
+
+        min_size = self._calculate_minimum_size()
+        self.setMinimumSize(min_size)
+        self.update()
+
+    def add_ring(self, **kwargs) -> Ring:
+        """
+        Add a new progress bar.
+
+        Args:
+            **kwargs: Keyword arguments for the new progress bar.
+
+        Returns:
+            Ring: Ring object.
+        """
+        if self.config.num_bars < self.config.max_number_of_bars:
+            ring = Ring(parent_progress_widget=self, **kwargs)
+            ring.config.index = self.config.num_bars
+            self.config.num_bars += 1
+            self._rings.append(ring)
+            self.config.rings.append(ring.config)
+            if self.config.color_map:
+                self.set_colors_from_map(self.config.color_map)
+            self.update()
+            return ring
+
+    def remove_ring(self, index: int):
+        """
+        Remove a progress bar by index.
+
+        Args:
+            index(int): Index of the progress bar to remove.
+        """
+        ring = self._find_ring_by_index(index)
+        ring.cleanup()
+        self._rings.remove(ring)
+        self.config.rings.remove(ring.config)
+        self.config.num_bars -= 1
+        self._reindex_rings()
+        if self.config.color_map:
+            self.set_colors_from_map(self.config.color_map)
+        self.update()
+
+    def _reindex_rings(self):
+        """
+        Reindex the progress bars.
+        """
+        for i, ring in enumerate(self._rings):
+            ring.config.index = i
+
+    def set_precision(self, precision: int, bar_index: int = None):
+        """
+        Set the precision for the progress bars. If bar_index is not provide, the precision will be set for all progress bars.
+
+        Args:
+            precision(int): Precision for the progress bars.
+            bar_index(int): Index of the progress bar to set the precision for. If provided, only a single precision can be set.
+        """
+        if bar_index is not None:
+            bar_index = self._bar_index_check(bar_index)
+            ring = self._find_ring_by_index(bar_index)
+            ring.config.precision = precision
+        else:
+            for ring in self._rings:
+                ring.config.precision = precision
+        self.update()
+
+    def set_min_max_values(
+        self,
+        min_values: int | float | list[int | float],
+        max_values: int | float | list[int | float],
+    ):
+        """
+        Set the minimum and maximum values for the progress bars.
+
+        Args:
+            min_values(int|float | list[float]): Minimum value(s) for the progress bars. If multiple progress bars are displayed, provide a list of minimum values for each progress bar.
+            max_values(int|float | list[float]): Maximum value(s) for the progress bars. If multiple progress bars are displayed, provide a list of maximum values for each progress bar.
+        """
+        if isinstance(min_values, int) or isinstance(min_values, float):
+            min_values = [min_values]
+        if isinstance(max_values, int) or isinstance(max_values, float):
+            max_values = [max_values]
+        min_values = self._adjust_list_to_bars(min_values)
+        max_values = self._adjust_list_to_bars(max_values)
+        for ring, min_value, max_value in zip(self._rings, min_values, max_values):
+            ring.set_min_max_values(min_value, max_value)
+        self.update()
+
+    def set_number_of_bars(self, num_bars: int):
+        """
+        Set the number of progress bars to display.
+
+        Args:
+            num_bars(int): Number of progress bars to display.
+        """
+        num_bars = max(
+            self.config.min_number_of_bars, min(num_bars, self.config.max_number_of_bars)
+        )
+        if num_bars != self.config.num_bars:
+            self.config.num_bars = num_bars
+            self.initialize_bars()
+
+    def set_value(self, values: int | list, ring_index: int = None):
+        """
+        Set the values for the progress bars.
+
+        Args:
+            values(int | tuple): Value(s) for the progress bars. If multiple progress bars are displayed, provide a tuple of values for each progress bar.
+            ring_index(int): Index of the progress bar to set the value for. If provided, only a single value can be set.
+
+        Examples:
+            >>> SpiralProgressBar.set_value(50)
+            >>> SpiralProgressBar.set_value([30, 40, 50]) # (outer, middle, inner)
+            >>> SpiralProgressBar.set_value(60, bar_index=1) # Set the value for the middle progress bar.
+        """
+        if ring_index is not None:
+            ring = self._find_ring_by_index(ring_index)
+            if isinstance(values, list):
+                values = values[0]
+                print(
+                    f"Warning: Only a single value can be set for a single progress bar. Using the first value in the list {values}"
+                )
+            ring.set_value(values)
+        else:
+            if isinstance(values, int):
+                values = [values]
+                values = self._adjust_list_to_bars(values)
+            for ring, value in zip(self._rings, values):
+                ring.set_value(value)
+        self.update()
+
+    def set_colors_from_map(self, colormap, color_format: Literal["RGB", "HEX"] = "RGB"):
+        """
+        Set the colors for the progress bars from a colormap.
+
+        Args:
+            colormap(str): Name of the colormap.
+            color_format(Literal["RGB","HEX"]): Format of the returned colors ('RGB', 'HEX').
+        """
+        if colormap not in pg.colormap.listMaps():
+            raise ValueError(
+                f"Colormap '{colormap}' not found in the current installation of pyqtgraph"
+            )
+        colors = Colors.golden_angle_color(colormap, self.config.num_bars, color_format)
+        self.set_colors_directly(colors)
+        self.config.color_map = colormap
+        self.update()
+
+    def set_colors_directly(self, colors: list[str | tuple] | str | tuple, bar_index: int = None):
+        """
+        Set the colors for the progress bars directly.
+
+        Args:
+            colors(list[str | tuple] | str | tuple): Color(s) for the progress bars. If multiple progress bars are displayed, provide a list of colors for each progress bar.
+            bar_index(int): Index of the progress bar to set the color for. If provided, only a single color can be set.
+        """
+        if bar_index is not None and isinstance(colors, (str, tuple)):
+            bar_index = self._bar_index_check(bar_index)
+            ring = self._find_ring_by_index(bar_index)
+            ring.set_color(colors)
+        else:
+            if isinstance(colors, (str, tuple)):
+                colors = [colors]
+            colors = self._adjust_list_to_bars(colors)
+            for ring, color in zip(self._rings, colors):
+                ring.set_color(color)
+            self.config.color_map = None
+        self.update()
+
+    def set_line_widths(self, widths: int | list[int], bar_index: int = None):
+        """
+        Set the line widths for the progress bars.
+
+        Args:
+            widths(int | list[int]): Line width(s) for the progress bars. If multiple progress bars are displayed, provide a list of line widths for each progress bar.
+            bar_index(int): Index of the progress bar to set the line width for. If provided, only a single line width can be set.
+        """
+        if bar_index is not None:
+            bar_index = self._bar_index_check(bar_index)
+            ring = self._find_ring_by_index(bar_index)
+            if isinstance(widths, list):
+                widths = widths[0]
+                print(
+                    f"Warning: Only a single line width can be set for a single progress bar. Using the first value in the list {widths}"
+                )
+            ring.set_line_width(widths)
+        else:
+            if isinstance(widths, int):
+                widths = [widths]
+            widths = self._adjust_list_to_bars(widths)
+            self.config.gap = max(widths) * 2
+            for ring, width in zip(self._rings, widths):
+                ring.set_line_width(width)
+        min_size = self._calculate_minimum_size()
+        self.setMinimumSize(min_size)
+        self.update()
+
+    def set_gap(self, gap: int):
+        """
+        Set the gap between the progress bars.
+
+        Args:
+            gap(int): Gap between the progress bars.
+        """
+        self.config.gap = gap
+        self.update()
+
+    def set_diameter(self, diameter: int):
+        """
+        Set the diameter of the widget.
+
+        Args:
+            diameter(int): Diameter of the widget.
+        """
+        size = QSize(diameter, diameter)
+        self.resize(size)
+        self.setFixedSize(size)
+
+    def _find_ring_by_index(self, index: int) -> Ring:
+        """
+        Find the ring by index.
+
+        Args:
+            index(int): Index of the ring.
+
+        Returns:
+            Ring: Ring object.
+        """
+        found_ring = None
+        for ring in self._rings:
+            if ring.config.index == index:
+                found_ring = ring
+                break
+        if found_ring is None:
+            raise ValueError(f"Ring with index {index} not found.")
+        return found_ring
+
+    def enable_auto_updates(self, enable: bool = True):
+        """
+        Enable or disable updates based on scan status. Overrides manual updates.
+        The behaviour of the whole progress bar widget will be driven by the scan queue status.
+
+        Args:
+            enable(bool): True or False.
+
+        Returns:
+            bool: True if scan segment updates are enabled.
+        """
+
+        self._auto_updates = enable
+        if enable is True:
+            self.bec_dispatcher.connect_slot(
+                self.on_scan_queue_status, MessageEndpoints.scan_queue_status()
+            )
+        else:
+            self.bec_dispatcher.disconnect_slot(
+                self.on_scan_queue_status, MessageEndpoints.scan_queue_status()
+            )
+        return self._auto_updates
+
+    @Slot(dict, dict)
+    def on_scan_queue_status(self, msg, meta):
+        primary_queue = msg.get("queue").get("primary")
+        info = primary_queue.get("info", None)
+
+        if info:
+            active_request_block = info[0].get("active_request_block", None)
+            if active_request_block:
+                report_instructions = active_request_block.get("report_instructions", None)
+                if report_instructions:
+                    instruction_type = list(report_instructions[0].keys())[0]
+                    if instruction_type == "scan_progress":
+                        if self.config.num_bars != 1:
+                            self.set_number_of_bars(1)
+                        self._hook_scan_progress(ring_index=0)
+                    elif instruction_type == "readback":
+                        devices = report_instructions[0].get("readback").get("devices")
+                        start = report_instructions[0].get("readback").get("start")
+                        end = report_instructions[0].get("readback").get("end")
+                        if self.config.num_bars != len(devices):
+                            self.set_number_of_bars(len(devices))
+                        for index, device in enumerate(devices):
+                            self._hook_readback(index, device, start[index], end[index])
+                    else:
+                        print(f"{instruction_type} not supported yet.")
+
+                    # elif instruction_type == "device_progress":
+                    #     print("hook device_progress")
+
+    def _hook_scan_progress(self, ring_index: int = None):
+        if ring_index is not None:
+            ring = self._find_ring_by_index(ring_index)
+        else:
+            ring = self._rings[0]
+
+        if ring.config.connections.slot == "on_scan_progress":
+            return
+        else:
+            ring.set_connections("on_scan_progress", MessageEndpoints.scan_progress())
+
+    def _hook_readback(self, bar_index: int, device: str, min: float | int, max: float | int):
+        ring = self._find_ring_by_index(bar_index)
+        ring.set_min_max_values(min, max)
+        endpoint = MessageEndpoints.device_readback(device)
+        ring.set_connections("on_device_readback", endpoint)
+
+    def _adjust_list_to_bars(self, items: list) -> list:
+        """
+        Utility method to adjust the list of parameters to match the number of progress bars.
+
+        Args:
+            items(list): List of parameters for the progress bars.
+
+        Returns:
+            list: List of parameters for the progress bars.
+        """
+        if items is None:
+            raise ValueError(
+                "Items cannot be None. Please provide a list for parameters for the progress bars."
+            )
+        if not isinstance(items, list):
+            items = [items]
+        if len(items) < self.config.num_bars:
+            last_item = items[-1]
+            items.extend([last_item] * (self.config.num_bars - len(items)))
+        elif len(items) > self.config.num_bars:
+            items = items[: self.config.num_bars]
+        return items
+
+    def _bar_index_check(self, bar_index: int):
+        """
+        Utility method to check if the bar index is within the range of the number of progress bars.
+
+        Args:
+            bar_index(int): Index of the progress bar to set the value for.
+        """
+        if not (0 <= bar_index < self.config.num_bars):
+            raise ValueError(
+                f"bar_index {bar_index} out of range of number of bars {self.config.num_bars}."
+            )
+        return bar_index
+
+    def paintEvent(self, event):
+        painter = QtGui.QPainter(self)
+        painter.setRenderHint(QtGui.QPainter.Antialiasing)
+        size = min(self.width(), self.height())
+        rect = QtCore.QRect(0, 0, size, size)
+        rect.adjust(
+            max(ring.config.line_width for ring in self._rings),
+            max(ring.config.line_width for ring in self._rings),
+            -max(ring.config.line_width for ring in self._rings),
+            -max(ring.config.line_width for ring in self._rings),
+        )
+
+        for i, ring in enumerate(self._rings):
+            # Background arc
+            painter.setPen(
+                QtGui.QPen(ring.background_color, ring.config.line_width, QtCore.Qt.SolidLine)
+            )
+            offset = self.config.gap * i
+            adjusted_rect = QtCore.QRect(
+                rect.left() + offset,
+                rect.top() + offset,
+                rect.width() - 2 * offset,
+                rect.height() - 2 * offset,
+            )
+            painter.drawArc(adjusted_rect, ring.config.start_position, 360 * 16)
+
+            # Foreground arc
+            pen = QtGui.QPen(ring.color, ring.config.line_width, QtCore.Qt.SolidLine)
+            pen.setCapStyle(QtCore.Qt.RoundCap)
+            painter.setPen(pen)
+            proportion = (ring.value - ring.config.min_value) / (
+                (ring.config.max_value - ring.config.min_value) + 1e-3
+            )
+            angle = int(proportion * 360 * 16 * ring.config.direction)
+            painter.drawArc(adjusted_rect, ring.start_position, angle)
+
+    def reset_diameter(self):
+        """
+        Reset the fixed size of the widget.
+        """
+        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        self.setMinimumSize(self._calculate_minimum_size())
+        self.setMaximumSize(16777215, 16777215)
+
+    def _calculate_minimum_size(self):
+        """
+        Calculate the minimum size of the widget.
+        """
+        if not self.config.rings:
+            print("no rings to get size from setting size to 10x10")
+            return QSize(10, 10)
+        ring_widths = [self.config.rings[i].line_width for i in range(self.config.num_bars)]
+        total_width = sum(ring_widths) + self.config.gap * (self.config.num_bars - 1)
+        diameter = total_width * 2
+        if diameter < 50:
+            diameter = 50
+        return QSize(diameter, diameter)
+
+    def sizeHint(self):
+        min_size = self._calculate_minimum_size()
+        return min_size
+
+    def clear_all(self):
+        for ring in self._rings:
+            ring.cleanup()
+            del ring
+            self._rings = []
+        self.update()
+        self.initialize_bars()
+
+    def cleanup(self):
+        self.bec_dispatcher.disconnect_slot(
+            self.on_scan_queue_status, MessageEndpoints.scan_queue_status()
+        )
+        for ring in self._rings:
+            ring.cleanup()
+            del ring
+        super().cleanup()

docs/requirements.txt

@@ -6,5 +6,6 @@ pydata-sphinx-theme
 sphinx-copybutton
 myst-parser
 sphinx-design
+PyQt6
 bec-widgets
 tomli

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.53.3"
+version = "0.55.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -38,6 +38,7 @@ dev = [
 ]
 pyqt5 = ["PyQt5>=5.9"]
 pyqt6 = ["PyQt6>=6.7"]
+pyside6 = ["PySide6>=6.7"]
 
 [project.urls]
 "Bug Tracker" = "https://gitlab.psi.ch/bec/bec_widgets/issues"

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -3,6 +3,7 @@ import pytest
 from bec_lib.endpoints import MessageEndpoints
 
 from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
+from bec_widgets.utils import Colors
 
 
 def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
@@ -38,7 +39,7 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     assert fig2.__class__ == BECFigure
 
     mm = fig0.motor_map("samx", "samy")
-    plt = fig1.plot("samx", "bpm4i")
+    plt = fig1.plot(x_name="samx", y_name="bpm4i")
     im = fig2.image("eiger")
 
     assert mm.__class__.__name__ == "BECMotorMap"
@@ -143,3 +144,83 @@ def test_dock_manipulations_e2e(rpc_server_dock, qtbot):
 
     assert len(dock_server.docks) == 0
     assert len(dock_server.tempAreas) == 0
+
+
+def test_spiral_bar(rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock.gui_id)
+    dock_server = rpc_server_dock.gui
+
+    d0 = dock.add_dock("dock_0")
+
+    bar = d0.add_widget_bec("SpiralProgressBar")
+    assert bar.__class__.__name__ == "SpiralProgressBar"
+
+    bar.set_number_of_bars(5)
+    bar.set_colors_from_map("viridis")
+    bar.set_value([10, 20, 30, 40, 50])
+
+    bar_server = dock_server.docks["dock_0"].widgets[0]
+
+    expected_colors = Colors.golden_angle_color("viridis", 5, "RGB")
+    bar_colors = [ring.color.getRgb() for ring in bar_server.rings]
+    bar_values = [ring.value for ring in bar_server.rings]
+    assert bar_values == [10, 20, 30, 40, 50]
+    assert bar_colors == expected_colors
+
+
+def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
+    dock = BECDockArea(rpc_server_dock.gui_id)
+    dock_server = rpc_server_dock.gui
+
+    d0 = dock.add_dock("dock_0")
+
+    d0.add_widget_bec("SpiralProgressBar")
+
+    client = rpc_server_dock.client
+    dev = client.device_manager.devices
+    scans = client.scans
+
+    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
+
+    while not status.status == "COMPLETED":
+        qtbot.wait(200)
+
+    qtbot.wait(200)
+    bar_server = dock_server.docks["dock_0"].widgets[0]
+    assert bar_server.config.num_bars == 1
+    np.testing.assert_allclose(bar_server.rings[0].value, 10, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 10, atol=0.1)
+
+    status = scans.grid_scan(dev.samx, -5, 5, 4, dev.samy, -10, 10, 4, relative=True, exp_time=0.1)
+
+    while not status.status == "COMPLETED":
+        qtbot.wait(200)
+
+    qtbot.wait(200)
+    assert bar_server.config.num_bars == 1
+    np.testing.assert_allclose(bar_server.rings[0].value, 16, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 16, atol=0.1)
+
+    init_samx = dev.samx.read()["samx"]["value"]
+    init_samy = dev.samy.read()["samy"]["value"]
+    final_samx = init_samx + 5
+    final_samy = init_samy + 10
+
+    dev.samx.velocity.put(5)
+    dev.samy.velocity.put(5)
+
+    status = scans.umv(dev.samx, 5, dev.samy, 10, relative=True)
+
+    while not status.status == "COMPLETED":
+        qtbot.wait(200)
+
+    qtbot.wait(200)
+    assert bar_server.config.num_bars == 2
+    np.testing.assert_allclose(bar_server.rings[0].value, final_samx, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[1].value, final_samy, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.min_value, init_samx, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[1].config.min_value, init_samy, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[0].config.max_value, final_samx, atol=0.1)
+    np.testing.assert_allclose(bar_server.rings[1].config.max_value, final_samy, atol=0.1)

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -23,7 +23,7 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     fig = BECFigure(rpc_server_figure.gui_id)
     fig_server = rpc_server_figure.gui
 
-    plt = fig.plot("samx", "bpm4i")
+    plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     motor_map = fig.motor_map("samx", "samy")
     plt_z = fig.add_plot("samx", "samy", "bpm4i")
@@ -79,9 +79,9 @@ def test_rpc_waveform_scan(rpc_server_figure, qtbot):
     fig = BECFigure(rpc_server_figure.gui_id)
 
     # add 3 different curves to track
-    plt = fig.plot("samx", "bpm4i")
-    fig.plot("samx", "bpm3a")
-    fig.plot("samx", "bpm4d")
+    plt = fig.plot(x_name="samx", y_name="bpm4i")
+    fig.plot(x_name="samx", y_name="bpm3a")
+    fig.plot(x_name="samx", y_name="bpm4d")
 
     client = rpc_server_figure.client
     dev = client.device_manager.devices

tests/end-2-end/test_rpc_register_e2e.py

@@ -22,7 +22,7 @@ def test_rpc_register_list_connections(rpc_server_figure, rpc_register, qtbot):
     fig = BECFigure(rpc_server_figure.gui_id)
     fig_server = rpc_server_figure.gui
 
-    plt = fig.plot("samx", "bpm4i")
+    plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     motor_map = fig.motor_map("samx", "samy")
     plt_z = fig.add_plot("samx", "samy", "bpm4i")

tests/unit_tests/test_bec_dock.py

@@ -59,7 +59,7 @@ def test_bec_dock_area_add_remove_dock(bec_dock_area, qtbot):
 def test_add_remove_bec_figure_to_dock(bec_dock_area):
     d0 = bec_dock_area.add_dock()
     fig = d0.add_widget_bec("BECFigure")
-    plt = fig.plot("samx", "bpm4i")
+    plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     mm = fig.motor_map("samx", "samy")
 

tests/unit_tests/test_bec_figure.py

@@ -3,8 +3,10 @@
 import numpy as np
 import pytest
 
-from bec_widgets.widgets import BECFigure, BECMotorMap, BECWaveform
-from bec_widgets.widgets.plots import BECImageShow
+from bec_widgets.widgets import BECFigure
+from bec_widgets.widgets.figure.plots.image.image import BECImageShow
+from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
+from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
 
 from .client_mocks import mocked_client
 
@@ -63,7 +65,7 @@ def test_bec_figure_add_remove_plot(bec_figure):
 
 
 def test_add_different_types_of_widgets(bec_figure):
-    plt = bec_figure.plot("samx", "bpm4i")
+    plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
     im = bec_figure.image("eiger")
     motor_map = bec_figure.motor_map("samx", "samy")
 
@@ -226,7 +228,7 @@ def test_clear_all(bec_figure):
 
 
 def test_shortcuts(bec_figure):
-    plt = bec_figure.plot("samx", "bpm4i")
+    plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
     im = bec_figure.image("eiger")
     motor_map = bec_figure.motor_map("samx", "samy")
 

tests/unit_tests/test_bec_monitor.py

@@ -1,220 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import os
-from unittest.mock import MagicMock
-
-import pytest
-import yaml
-
-from bec_widgets.widgets import BECMonitor
-
-from .client_mocks import mocked_client
-
-
-def load_test_config(config_name):
-    """Helper function to load config from yaml file."""
-    config_path = os.path.join(os.path.dirname(__file__), "test_configs", f"{config_name}.yaml")
-    with open(config_path, "r") as f:
-        config = yaml.safe_load(f)
-    return config
-
-
-@pytest.fixture(scope="function")
-def monitor(bec_dispatcher, qtbot, mocked_client):
-    # client = MagicMock()
-    widget = BECMonitor(client=mocked_client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-
-
-@pytest.mark.parametrize(
-    "config_name, scan_type, number_of_plots",
-    [
-        ("config_device", False, 2),
-        ("config_device_no_entry", False, 2),
-        # ("config_scan", True, 4),
-    ],
-)
-def test_initialization_with_device_config(monitor, config_name, scan_type, number_of_plots):
-    config = load_test_config(config_name)
-    monitor.on_config_update(config)
-    assert isinstance(monitor, BECMonitor)
-    assert monitor.client is not None
-    assert len(monitor.plot_data) == number_of_plots
-    assert monitor.scan_types == scan_type
-
-
-@pytest.mark.parametrize(
-    "config_initial,config_update",
-    [("config_device", "config_scan"), ("config_scan", "config_device")],
-)
-def test_on_config_update(monitor, config_initial, config_update):
-    config_initial = load_test_config(config_initial)
-    config_update = load_test_config(config_update)
-    # validated config has to be compared
-    config_initial_validated = monitor.validator.validate_monitor_config(
-        config_initial
-    ).model_dump()
-    config_update_validated = monitor.validator.validate_monitor_config(config_update).model_dump()
-    monitor.on_config_update(config_initial)
-    assert monitor.config == config_initial_validated
-    monitor.on_config_update(config_update)
-    assert monitor.config == config_update_validated
-
-
-@pytest.mark.parametrize(
-    "config_name, expected_num_columns, expected_plot_names, expected_coordinates",
-    [
-        ("config_device", 1, ["BPM4i plots vs samx", "Gauss plots vs samx"], [(0, 0), (1, 0)]),
-        (
-            "config_scan",
-            3,
-            ["Grid plot 1", "Grid plot 2", "Grid plot 3", "Grid plot 4"],
-            [(0, 0), (0, 1), (0, 2), (1, 0)],
-        ),
-    ],
-)
-def test_render_initial_plots(
-    monitor, config_name, expected_num_columns, expected_plot_names, expected_coordinates
-):
-    config = load_test_config(config_name)
-    monitor.on_config_update(config)
-
-    # Validate number of columns
-    assert monitor.plot_settings["num_columns"] == expected_num_columns
-
-    # Validate the plots are created correctly
-    for expected_name in expected_plot_names:
-        assert expected_name in monitor.plots.keys()
-
-    # Validate the grid_coordinates
-    assert monitor.grid_coordinates == expected_coordinates
-
-
-def mock_getitem(dev_name):
-    """Helper function to mock the __getitem__ method of the 'dev'."""
-    mock_instance = MagicMock()
-    if dev_name == "samx":
-        mock_instance._hints = "samx"
-    elif dev_name == "bpm4i":
-        mock_instance._hints = "bpm4i"
-    elif dev_name == "gauss_bpm":
-        mock_instance._hints = "gauss_bpm"
-
-    return mock_instance
-
-
-def mock_get_scan_storage(scan_id, data):
-    """Helper function to mock the __getitem__ method of the 'dev'."""
-    mock_instance = MagicMock()
-    mock_instance.get_scan_storage.return_value = data
-    return mock_instance
-
-
-# mocked messages and metadata
-msg_1 = {
-    "data": {
-        "samx": {"samx": {"value": 10}},
-        "bpm4i": {"bpm4i": {"value": 5}},
-        "gauss_bpm": {"gauss_bpm": {"value": 6}},
-        "gauss_adc1": {"gauss_adc1": {"value": 8}},
-        "gauss_adc2": {"gauss_adc2": {"value": 9}},
-    },
-    "scan_id": 1,
-}
-metadata_grid = {"scan_name": "grid_scan"}
-metadata_line = {"scan_name": "line_scan"}
-
-
-@pytest.mark.parametrize(
-    "config_name, msg, metadata, expected_data",
-    [
-        # case: msg does not have 'scan_id'
-        (
-            "config_device",
-            {"data": {}},
-            {},
-            {
-                "scan_segment": {
-                    "bpm4i": {"bpm4i": []},
-                    "gauss_adc1": {"gauss_adc1": []},
-                    "gauss_adc2": {"gauss_adc2": []},
-                    "samx": {"samx": []},
-                }
-            },
-        ),
-        # case: scan_types is false, msg contains all valid fields, and entry is present in config
-        (
-            "config_device",
-            msg_1,
-            {},
-            {
-                "scan_segment": {
-                    "bpm4i": {"bpm4i": [5]},
-                    "gauss_adc1": {"gauss_adc1": [8]},
-                    "gauss_adc2": {"gauss_adc2": [9]},
-                    "samx": {"samx": [10]},
-                }
-            },
-        ),
-        # case: scan_types is false, msg contains all valid fields and entry is missing in config, should use hints
-        (
-            "config_device_no_entry",
-            msg_1,
-            {},
-            {
-                "scan_segment": {
-                    "bpm4i": {"bpm4i": [5]},
-                    "gauss_bpm": {"gauss_bpm": [6]},
-                    "samx": {"samx": [10]},
-                }
-            },
-        ),
-        # case: scan_types is true, msg contains all valid fields, metadata contains scan "line_scan:"
-        (
-            "config_scan",
-            msg_1,
-            metadata_line,
-            {
-                "scan_segment": {
-                    "bpm4i": {"bpm4i": [5]},
-                    "gauss_adc1": {"gauss_adc1": [8]},
-                    "gauss_adc2": {"gauss_adc2": [9]},
-                    "gauss_bpm": {"gauss_bpm": [6]},
-                    "samx": {"samx": [10]},
-                }
-            },
-        ),
-        (
-            "config_scan",
-            msg_1,
-            metadata_grid,
-            {
-                "scan_segment": {
-                    "bpm4i": {"bpm4i": [5]},
-                    "gauss_adc1": {"gauss_adc1": [8]},
-                    "gauss_adc2": {"gauss_adc2": [9]},
-                    "gauss_bpm": {"gauss_bpm": [6]},
-                    "samx": {"samx": [10]},
-                }
-            },
-        ),
-    ],
-)
-def test_on_scan_segment(monitor, config_name, msg, metadata, expected_data):
-    config = load_test_config(config_name)
-    monitor.on_config_update(config)
-
-    # Mock scan_storage.find_scan_by_ID
-    mock_scan_data = MagicMock()
-    mock_scan_data.data = {
-        device_name: {
-            entry: MagicMock(val=[msg["data"][device_name][entry]["value"]])
-            for entry in msg["data"][device_name]
-        }
-        for device_name in msg["data"]
-    }
-    monitor.queue.scan_storage.find_scan_by_ID.return_value = mock_scan_data
-
-    monitor.on_scan_segment(msg, metadata)
-    assert monitor.database == expected_data

tests/unit_tests/test_bec_motor_map.py

@@ -1,8 +1,7 @@
 import pytest
 
-from bec_widgets.widgets import BECMotorMap
-from bec_widgets.widgets.plots.motor_map import MotorMapConfig
-from bec_widgets.widgets.plots.waveform import Signal, SignalData
+from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
+from bec_widgets.widgets.figure.plots.waveform.waveform_curve import SignalData
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_config_dialog.py

@@ -1,178 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import os
-from unittest.mock import MagicMock
-
-import pytest
-import yaml
-from qtpy.QtWidgets import QTableWidgetItem, QTabWidget
-
-from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
-
-from .client_mocks import mocked_client
-
-
-def load_test_config(config_name):
-    """Helper function to load config from yaml file."""
-    config_path = os.path.join(os.path.dirname(__file__), "test_configs", f"{config_name}.yaml")
-    with open(config_path, "r") as f:
-        config = yaml.safe_load(f)
-    return config
-
-
-@pytest.fixture(scope="function")
-def config_dialog(qtbot, mocked_client):
-    client = mocked_client
-    widget = ConfigDialog(client=client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-
-
-@pytest.mark.parametrize("config_name", ["config_device", "config_scan"])
-def test_load_config(config_dialog, config_name):
-    config = load_test_config(config_name)
-    config_dialog.load_config(config)
-
-    assert (
-        config_dialog.comboBox_appearance.currentText()
-        == config["plot_settings"]["background_color"]
-    )
-    assert config_dialog.spinBox_n_column.value() == config["plot_settings"]["num_columns"]
-    assert config_dialog.comboBox_colormap.currentText() == config["plot_settings"]["colormap"]
-
-
-@pytest.mark.parametrize(
-    "config_name, scan_mode",
-    [("config_device", False), ("config_scan", True), ("config_device_no_entry", False)],
-)
-def test_initialization(config_dialog, config_name, scan_mode):
-    config = load_test_config(config_name)
-    config_dialog.load_config(config)
-
-    assert isinstance(config_dialog, ConfigDialog)
-    assert (
-        config_dialog.comboBox_appearance.currentText()
-        == config["plot_settings"]["background_color"]
-    )
-    assert config_dialog.spinBox_n_column.value() == config["plot_settings"]["num_columns"]
-    assert (config_dialog.comboBox_scanTypes.currentText() == "Enabled") == scan_mode
-    assert (
-        config_dialog.tabWidget_scan_types.count() > 0
-    )  # Ensures there's at least one tab created
-
-    # If there's a need to check the contents of the first tab (there has to be always at least one tab)
-    first_tab = config_dialog.tabWidget_scan_types.widget(0)
-    if scan_mode:
-        assert (
-            first_tab.findChild(QTabWidget, "tabWidget_plots") is not None
-        )  # Ensures plot tab widget exists in scan mode
-    else:
-        assert (
-            first_tab.findChild(QTabWidget) is not None
-        )  # Ensures plot tab widget exists in default mode
-
-
-def test_edit_and_apply_config(config_dialog):
-    config_device = load_test_config("config_device")
-    config_dialog.load_config(config_device)
-
-    config_dialog.comboBox_appearance.setCurrentText("white")
-    config_dialog.spinBox_n_column.setValue(2)
-    config_dialog.comboBox_colormap.setCurrentText("viridis")
-
-    applied_config = config_dialog.apply_config()
-
-    assert applied_config["plot_settings"]["background_color"] == "white"
-    assert applied_config["plot_settings"]["num_columns"] == 2
-    assert applied_config["plot_settings"]["colormap"] == "viridis"
-
-
-def test_edit_and_apply_config_scan_mode(config_dialog):
-    config_scan = load_test_config("config_scan")
-    config_dialog.load_config(config_scan)
-
-    config_dialog.comboBox_appearance.setCurrentText("white")
-    config_dialog.spinBox_n_column.setValue(2)
-    config_dialog.comboBox_colormap.setCurrentText("viridis")
-    config_dialog.comboBox_scanTypes.setCurrentText("Enabled")
-
-    applied_config = config_dialog.apply_config()
-
-    assert applied_config["plot_settings"]["background_color"] == "white"
-    assert applied_config["plot_settings"]["num_columns"] == 2
-    assert applied_config["plot_settings"]["colormap"] == "viridis"
-    assert applied_config["plot_settings"]["scan_types"] is True
-
-
-def test_add_new_scan(config_dialog):
-    # Ensure the tab count is initially 1 (from the default config)
-    assert config_dialog.tabWidget_scan_types.count() == 1
-
-    # Add a new scan tab
-    config_dialog.add_new_scan_tab(config_dialog.tabWidget_scan_types, "Test Scan Tab")
-
-    # Ensure the tab count is now 2
-    assert config_dialog.tabWidget_scan_types.count() == 2
-
-    # Ensure the new tab has the correct name
-    assert config_dialog.tabWidget_scan_types.tabText(1) == "Test Scan Tab"
-
-
-def test_add_new_plot_and_modify(config_dialog):
-    # Ensure the tab count is initially 1 and it is called "Default"
-    assert config_dialog.tabWidget_scan_types.count() == 1
-    assert config_dialog.tabWidget_scan_types.tabText(0) == "Default"
-
-    # Get the first tab (which should be a scan tab)
-    scan_tab = config_dialog.tabWidget_scan_types.widget(0)
-
-    # Ensure the plot tab count is initially 1 and it is called "Plot 1"
-    tabWidget_plots = scan_tab.findChild(QTabWidget)
-    assert tabWidget_plots.count() == 1
-    assert tabWidget_plots.tabText(0) == "Plot 1"
-
-    # Add a new plot tab
-    config_dialog.add_new_plot_tab(scan_tab)
-
-    # Ensure the plot tab count is now 2
-    assert tabWidget_plots.count() == 2
-
-    # Ensure the new tab has the correct name
-    assert tabWidget_plots.tabText(1) == "Plot 2"
-
-    # Access the new plot tab
-    new_plot_tab = tabWidget_plots.widget(1)
-
-    # Modify the line edits within the new plot tab
-    new_plot_tab.ui.lineEdit_plot_title.setText("Modified Plot Title")
-    new_plot_tab.ui.lineEdit_x_label.setText("Modified X Label")
-    new_plot_tab.ui.lineEdit_y_label.setText("Modified Y Label")
-    new_plot_tab.ui.lineEdit_x_name.setText("Modified X Name")
-    new_plot_tab.ui.lineEdit_x_entry.setText("Modified X Entry")
-
-    # Modify the table for signals
-    config_dialog.add_new_signal(new_plot_tab.ui.tableWidget_y_signals)
-
-    table = new_plot_tab.ui.tableWidget_y_signals
-    assert table.rowCount() == 1  # Ensure the new row is added
-
-    row_position = table.rowCount() - 1
-
-    # Modify the first row
-    table.setItem(row_position, 0, QTableWidgetItem("New Signal Name"))
-    table.setItem(row_position, 1, QTableWidgetItem("New Signal Entry"))
-
-    # Apply the configuration
-    config = config_dialog.apply_config()
-
-    # Check if the modifications are reflected in the configuration
-    modified_plot_config = config["plot_data"][1]  # Access the second plot in the plot_data list
-    sources = modified_plot_config["sources"][0]  # Access the first source in the sources list
-
-    assert modified_plot_config["plot_name"] == "Modified Plot Title"
-    assert modified_plot_config["x_label"] == "Modified X Label"
-    assert modified_plot_config["y_label"] == "Modified Y Label"
-    assert sources["signals"]["x"][0]["name"] == "Modified X Name"
-    assert sources["signals"]["x"][0]["entry"] == "Modified X Entry"
-    assert sources["signals"]["y"][0]["name"] == "New Signal Name"
-    assert sources["signals"]["y"][0]["entry"] == "New Signal Entry"

tests/unit_tests/test_motor_control.py

@@ -11,14 +11,15 @@ from bec_widgets.examples import (
     MotorControlPanelAbsolute,
     MotorControlPanelRelative,
 )
-from bec_widgets.widgets import (
+from bec_widgets.widgets.motor_control.motor_control import MotorActions, MotorThread
+from bec_widgets.widgets.motor_control.motor_table.motor_table import MotorCoordinateTable
+from bec_widgets.widgets.motor_control.movement_absolute.movement_absolute import (
     MotorControlAbsolute,
-    MotorControlRelative,
-    MotorControlSelection,
-    MotorCoordinateTable,
-    MotorThread,
 )
-from bec_widgets.widgets.motor_control.motor_control import MotorActions
+from bec_widgets.widgets.motor_control.movement_relative.movement_relative import (
+    MotorControlRelative,
+)
+from bec_widgets.widgets.motor_control.selection.selection import MotorControlSelection
 
 from .client_mocks import mocked_client
 
@@ -419,11 +420,11 @@ def test_delete_selected_row(motor_coordinate_table):
     motor_coordinate_table.add_coordinate((3.0, 4.0))
 
     # Select the row
-    motor_coordinate_table.table.selectRow(0)
+    motor_coordinate_table.ui.table.selectRow(0)
 
     # Delete the selected row
     motor_coordinate_table.delete_selected_row()
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
 
 def test_add_coordinate_and_table_update(motor_coordinate_table):
@@ -432,20 +433,24 @@ def test_add_coordinate_and_table_update(motor_coordinate_table):
 
     # Add coordinate in Individual mode
     motor_coordinate_table.add_coordinate((1.0, 2.0))
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
     # Check if the coordinates match
-    x_item_individual = motor_coordinate_table.table.cellWidget(0, 3)  # Assuming X is in column 3
-    y_item_individual = motor_coordinate_table.table.cellWidget(0, 4)  # Assuming Y is in column 4
+    x_item_individual = motor_coordinate_table.ui.table.cellWidget(
+        0, 3
+    )  # Assuming X is in column 3
+    y_item_individual = motor_coordinate_table.ui.table.cellWidget(
+        0, 4
+    )  # Assuming Y is in column 4
     assert float(x_item_individual.text()) == 1.0
     assert float(y_item_individual.text()) == 2.0
 
     # Switch to Start/Stop and add coordinates
-    motor_coordinate_table.comboBox_mode.setCurrentIndex(1)  # Switch mode
+    motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(1)  # Switch mode
 
     motor_coordinate_table.add_coordinate((3.0, 4.0))
     motor_coordinate_table.add_coordinate((5.0, 6.0))
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
 
 def test_plot_coordinates_signal(motor_coordinate_table):
@@ -465,26 +470,26 @@ def test_plot_coordinates_signal(motor_coordinate_table):
     assert received
 
 
-def test_move_motor_action(motor_coordinate_table):
-    # Add a coordinate
-    motor_coordinate_table.add_coordinate((1.0, 2.0))
-
-    # Mock the motor thread move_absolute function
-    motor_coordinate_table.motor_thread.move_absolute = MagicMock()
-
-    # Trigger the move action
-    move_button = motor_coordinate_table.table.cellWidget(0, 1)
-    move_button.click()
-
-    motor_coordinate_table.motor_thread.move_absolute.assert_called_with(
-        motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0)
-    )
+# def test_move_motor_action(motor_coordinate_table,qtbot):#TODO enable again after table refactor
+#     # Add a coordinate
+#     motor_coordinate_table.add_coordinate((1.0, 2.0))
+#
+#     # Mock the motor thread move_absolute function
+#     motor_coordinate_table.motor_thread.move_absolute = MagicMock()
+#
+#     # Trigger the move action
+#     move_button = motor_coordinate_table.table.cellWidget(0, 1)
+#     move_button.click()
+#
+#     motor_coordinate_table.motor_thread.move_absolute.assert_called_with(
+#         motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0)
+#     )
 
 
 def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
     motor_coordinate_table.warning_message = False
     motor_coordinate_table.set_precision(3)
-    motor_coordinate_table.comboBox_mode.setCurrentIndex(0)
+    motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(0)
 
     # This list will store the signals emitted during the test
     emitted_signals = []
@@ -505,8 +510,8 @@ def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
         assert len(coordinates) > 0, "Coordinates list is empty."
         assert reference_tag == "Individual"
         assert color == "green"
-        assert motor_coordinate_table.table.cellWidget(0, 3).text() == "1.000"
-        assert motor_coordinate_table.table.cellWidget(0, 4).text() == "2.000"
+        assert motor_coordinate_table.ui.table.cellWidget(0, 3).text() == "1.000"
+        assert motor_coordinate_table.ui.table.cellWidget(0, 4).text() == "2.000"
 
 
 #######################################################

tests/unit_tests/test_motor_map.py

@@ -1,171 +0,0 @@
-# pylint: disable = no-name-in-module,missing-module-docstring, missing-function-docstring
-from unittest.mock import MagicMock
-
-import pytest
-
-from bec_widgets.widgets import MotorMap
-
-from .client_mocks import mocked_client
-
-CONFIG_DEFAULT = {
-    "plot_settings": {
-        "colormap": "Greys",
-        "scatter_size": 5,
-        "max_points": 1000,
-        "num_dim_points": 100,
-        "precision": 2,
-        "num_columns": 1,
-        "background_value": 25,
-    },
-    "motors": [
-        {
-            "plot_name": "Motor Map",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "samx", "entry": "samx"}],
-                "y": [{"name": "samy", "entry": "samy"}],
-            },
-        },
-        {
-            "plot_name": "Motor Map 2 ",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "aptrx", "entry": "aptrx"}],
-                "y": [{"name": "aptry", "entry": "aptry"}],
-            },
-        },
-    ],
-}
-
-CONFIG_ONE_DEVICE = {
-    "plot_settings": {
-        "colormap": "Greys",
-        "scatter_size": 5,
-        "max_points": 1000,
-        "num_dim_points": 100,
-        "precision": 2,
-        "num_columns": 1,
-        "background_value": 25,
-    },
-    "motors": [
-        {
-            "plot_name": "Motor Map",
-            "x_label": "Motor X",
-            "y_label": "Motor Y",
-            "signals": {
-                "x": [{"name": "samx", "entry": "samx"}],
-                "y": [{"name": "samy", "entry": "samy"}],
-            },
-        }
-    ],
-}
-
-
-@pytest.fixture(scope="function")
-def motor_map(qtbot, mocked_client):
-    widget = MotorMap(client=mocked_client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-
-
-def test_motor_limits_initialization(motor_map):
-    # Example test to check if motor limits are correctly initialized
-    expected_limits = {"samx": [-10, 10], "samy": [-5, 5]}
-    for motor_name, expected_limit in expected_limits.items():
-        actual_limit = motor_map._get_motor_limit(motor_name)
-        assert actual_limit == expected_limit
-
-
-def test_motor_initial_position(motor_map):
-    motor_map.precision = 2
-
-    motor_map_dev = motor_map.client.device_manager.devices
-
-    # Example test to check if motor initial positions are correctly initialized
-    expected_positions = {
-        ("samx", "samx"): motor_map_dev["samx"].read()["samx"]["value"],
-        ("samy", "samy"): motor_map_dev["samy"].read()["samy"]["value"],
-        ("aptrx", "aptrx"): motor_map_dev["aptrx"].read()["aptrx"]["value"],
-        ("aptry", "aptry"): motor_map_dev["aptry"].read()["aptry"]["value"],
-    }
-    for (motor_name, entry), expected_position in expected_positions.items():
-        actual_position = motor_map._get_motor_init_position(motor_name, entry)
-        assert actual_position == expected_position
-
-
-@pytest.mark.parametrize("config, number_of_plots", [(CONFIG_DEFAULT, 2), (CONFIG_ONE_DEVICE, 1)])
-def test_initialization(motor_map, config, number_of_plots):
-    config_load = config
-    motor_map.on_config_update(config_load)
-    assert isinstance(motor_map, MotorMap)
-    assert motor_map.client is not None
-    assert motor_map.config == config_load
-    assert len(motor_map.plot_data) == number_of_plots
-
-
-def test_motor_movement_updates_position_and_database(motor_map):
-    motor_map.on_config_update(CONFIG_DEFAULT)
-
-    # Initial positions
-    initial_position_samx = 2.0
-    initial_position_samy = 3.0
-
-    # Set initial positions in the mocked database
-    motor_map.database["samx"]["samx"] = [initial_position_samx]
-    motor_map.database["samy"]["samy"] = [initial_position_samy]
-
-    # Simulate motor movement for 'samx' only
-    new_position_samx = 4.0
-    motor_map.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
-
-    # Verify database update for 'samx'
-    assert motor_map.database["samx"]["samx"] == [initial_position_samx, new_position_samx]
-
-    # Verify 'samy' retains its last known position
-    assert motor_map.database["samy"]["samy"] == [initial_position_samy, initial_position_samy]
-
-
-def test_scatter_plot_rendering(motor_map):
-    motor_map.on_config_update(CONFIG_DEFAULT)
-    # Set initial positions
-    initial_position_samx = 2.0
-    initial_position_samy = 3.0
-    motor_map.database["samx"]["samx"] = [initial_position_samx]
-    motor_map.database["samy"]["samy"] = [initial_position_samy]
-
-    # Simulate motor movement for 'samx' only
-    new_position_samx = 4.0
-    motor_map.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
-    motor_map._update_plots()
-
-    # Get the scatter plot item
-    plot_name = "Motor Map"  # Update as per your actual plot name
-    scatter_plot_item = motor_map.curves_data[plot_name]["pos"]
-
-    # Check the scatter plot item properties
-    assert len(scatter_plot_item.data) > 0, "Scatter plot data is empty"
-    x_data = scatter_plot_item.data["x"]
-    y_data = scatter_plot_item.data["y"]
-    assert x_data[-1] == new_position_samx, "Scatter plot X data not updated correctly"
-    assert (
-        y_data[-1] == initial_position_samy
-    ), "Scatter plot Y data should retain last known position"
-
-
-def test_plot_visualization_consistency(motor_map):
-    motor_map.on_config_update(CONFIG_DEFAULT)
-    # Simulate updating the plot with new data
-    motor_map.on_device_readback({"signals": {"samx": {"value": 5}}})
-    motor_map.on_device_readback({"signals": {"samy": {"value": 9}}})
-    motor_map._update_plots()
-
-    plot_name = "Motor Map"
-    scatter_plot_item = motor_map.curves_data[plot_name]["pos"]
-
-    # Check if the scatter plot reflects the new data correctly
-    assert (
-        scatter_plot_item.data["x"][-1] == 5 and scatter_plot_item.data["y"][-1] == 9
-    ), "Plot not updated correctly with new data"

tests/unit_tests/test_spiral_progress_bar.py

@@ -0,0 +1,338 @@
+# pylint: disable=missing-function-docstring, missing-module-docstring, unused-import
+
+import pytest
+from bec_lib.endpoints import MessageEndpoints
+from pydantic import ValidationError
+
+from bec_widgets.utils import Colors
+from bec_widgets.widgets import SpiralProgressBar
+from bec_widgets.widgets.spiral_progress_bar.ring import RingConfig, RingConnections
+from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBarConfig
+
+from .client_mocks import mocked_client
+
+
+@pytest.fixture
+def spiral_progress_bar(qtbot, mocked_client):
+    widget = SpiralProgressBar(client=mocked_client)
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
+    yield widget
+    widget.close()
+
+
+def test_bar_init(spiral_progress_bar):
+    assert spiral_progress_bar is not None
+    assert spiral_progress_bar.client is not None
+    assert isinstance(spiral_progress_bar, SpiralProgressBar)
+    assert spiral_progress_bar.config.widget_class == "SpiralProgressBar"
+    assert spiral_progress_bar.config.gui_id is not None
+    assert spiral_progress_bar.gui_id == spiral_progress_bar.config.gui_id
+
+
+def test_config_validation_num_of_bars():
+    config = SpiralProgressBarConfig(num_bars=100, min_num_bars=1, max_num_bars=10)
+
+    assert config.num_bars == 10
+
+
+def test_config_validation_num_of_ring_error():
+    ring_config_0 = RingConfig(index=0)
+    ring_config_1 = RingConfig(index=1)
+
+    with pytest.raises(ValidationError) as excinfo:
+        SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=1)
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "different number of configs"
+    assert "Length of rings configuration (2) does not match the number of bars (1)." in str(
+        excinfo.value
+    )
+
+
+def test_config_validation_ring_indices_wrong_order():
+    ring_config_0 = RingConfig(index=2)
+    ring_config_1 = RingConfig(index=5)
+
+    with pytest.raises(ValidationError) as excinfo:
+        SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=2)
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "wrong indices"
+    assert (
+        "Indices of ring configurations must be unique and in order from 0 to num_bars 2."
+        in str(excinfo.value)
+    )
+
+
+def test_config_validation_ring_same_indices():
+    ring_config_0 = RingConfig(index=0)
+    ring_config_1 = RingConfig(index=0)
+
+    with pytest.raises(ValidationError) as excinfo:
+        SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=2)
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "wrong indices"
+    assert (
+        "Indices of ring configurations must be unique and in order from 0 to num_bars 2."
+        in str(excinfo.value)
+    )
+
+
+def test_config_validation_invalid_colormap():
+    with pytest.raises(ValueError) as excinfo:
+        SpiralProgressBarConfig(color_map="crazy_colors")
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "unsupported colormap"
+    assert "Colormap 'crazy_colors' not found in the current installation of pyqtgraph" in str(
+        excinfo.value
+    )
+
+
+def test_ring_connection_endpoint_validation():
+    with pytest.raises(ValueError) as excinfo:
+        RingConnections(slot="on_scan_progress", endpoint="non_existing")
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "unsupported endpoint"
+    assert (
+        "For slot 'on_scan_progress', endpoint must be MessageEndpoint.scan_progress or 'scans/scan_progress'."
+        in str(excinfo.value)
+    )
+
+    with pytest.raises(ValueError) as excinfo:
+        RingConnections(slot="on_device_readback", endpoint="non_existing")
+    errors = excinfo.value.errors()
+    assert len(errors) == 1
+    assert errors[0]["type"] == "unsupported endpoint"
+    assert (
+        "For slot 'on_device_readback', endpoint must be MessageEndpoint.device_readback(device) or 'internal/devices/readback/{device}'."
+        in str(excinfo.value)
+    )
+
+
+def test_bar_add_number_of_bars(spiral_progress_bar):
+    assert spiral_progress_bar.config.num_bars == 1
+
+    spiral_progress_bar.set_number_of_bars(5)
+    assert spiral_progress_bar.config.num_bars == 5
+
+    spiral_progress_bar.set_number_of_bars(2)
+    assert spiral_progress_bar.config.num_bars == 2
+
+
+def test_add_remove_bars_individually(spiral_progress_bar):
+    spiral_progress_bar.add_ring()
+    spiral_progress_bar.add_ring()
+
+    assert spiral_progress_bar.config.num_bars == 3
+    assert len(spiral_progress_bar.config.rings) == 3
+
+    spiral_progress_bar.remove_ring(1)
+    assert spiral_progress_bar.config.num_bars == 2
+    assert len(spiral_progress_bar.config.rings) == 2
+    assert spiral_progress_bar.rings[0].config.index == 0
+    assert spiral_progress_bar.rings[1].config.index == 1
+
+
+def test_bar_set_value(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(5)
+
+    assert spiral_progress_bar.config.num_bars == 5
+    assert len(spiral_progress_bar.config.rings) == 5
+    assert len(spiral_progress_bar.rings) == 5
+
+    spiral_progress_bar.set_value([10, 20, 30, 40, 50])
+    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    assert ring_values == [10, 20, 30, 40, 50]
+
+    # update just one bar
+    spiral_progress_bar.set_value(90, 1)
+    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    assert ring_values == [10, 90, 30, 40, 50]
+
+
+def test_bar_set_precision(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(3)
+
+    assert spiral_progress_bar.config.num_bars == 3
+    assert len(spiral_progress_bar.config.rings) == 3
+    assert len(spiral_progress_bar.rings) == 3
+
+    spiral_progress_bar.set_precision(2)
+    ring_precision = [ring.config.precision for ring in spiral_progress_bar.rings]
+    assert ring_precision == [2, 2, 2]
+
+    spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
+    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    assert ring_values == [10.12, 20.12, 30.12]
+
+    spiral_progress_bar.set_precision(4, 1)
+    ring_precision = [ring.config.precision for ring in spiral_progress_bar.rings]
+    assert ring_precision == [2, 4, 2]
+
+    spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
+    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    assert ring_values == [10.12, 20.1234, 30.12]
+
+
+def test_set_min_max_value(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(2)
+
+    spiral_progress_bar.set_min_max_values(0, 10)
+    ring_min_values = [ring.config.min_value for ring in spiral_progress_bar.rings]
+    ring_max_values = [ring.config.max_value for ring in spiral_progress_bar.rings]
+
+    assert ring_min_values == [0, 0]
+    assert ring_max_values == [10, 10]
+
+    spiral_progress_bar.set_value([5, 15])
+    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    assert ring_values == [5, 10]
+
+
+def test_setup_colors_from_colormap(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(5)
+    spiral_progress_bar.set_colors_from_map("viridis", "RGB")
+
+    expected_colors = Colors.golden_angle_color("viridis", 5, "RGB")
+    converted_colors = [ring.color.getRgb() for ring in spiral_progress_bar.rings]
+    ring_config_colors = [ring.config.color for ring in spiral_progress_bar.rings]
+
+    assert expected_colors == converted_colors
+    assert ring_config_colors == expected_colors
+
+
+def get_colors_from_rings(rings):
+    converted_colors = [ring.color.getRgb() for ring in rings]
+    ring_config_colors = [ring.config.color for ring in rings]
+    return converted_colors, ring_config_colors
+
+
+def test_set_colors_from_colormap_and_change_num_of_bars(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(2)
+    spiral_progress_bar.set_colors_from_map("viridis", "RGB")
+
+    expected_colors = Colors.golden_angle_color("viridis", 2, "RGB")
+    converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
+
+    assert expected_colors == converted_colors
+    assert ring_config_colors == expected_colors
+
+    # increase the number of bars to 6
+    spiral_progress_bar.set_number_of_bars(6)
+    expected_colors = Colors.golden_angle_color("viridis", 6, "RGB")
+    converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
+
+    assert expected_colors == converted_colors
+    assert ring_config_colors == expected_colors
+
+    # decrease the number of bars to 3
+    spiral_progress_bar.set_number_of_bars(3)
+    expected_colors = Colors.golden_angle_color("viridis", 3, "RGB")
+    converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
+
+    assert expected_colors == converted_colors
+    assert ring_config_colors == expected_colors
+
+
+def test_set_colors_directly(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(3)
+
+    # setting as a list of rgb tuples
+    colors = [(255, 0, 0, 255), (0, 255, 0, 255), (0, 0, 255, 255)]
+    spiral_progress_bar.set_colors_directly(colors)
+    converted_colors = get_colors_from_rings(spiral_progress_bar.rings)[0]
+
+    assert colors == converted_colors
+
+    spiral_progress_bar.set_colors_directly((255, 0, 0, 255), 1)
+    converted_colors = get_colors_from_rings(spiral_progress_bar.rings)[0]
+
+    assert converted_colors == [(255, 0, 0, 255), (255, 0, 0, 255), (0, 0, 255, 255)]
+
+
+def test_set_line_width(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(3)
+
+    spiral_progress_bar.set_line_widths(5)
+    line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
+
+    assert line_widths == [5, 5, 5]
+
+    spiral_progress_bar.set_line_widths([10, 20, 30])
+    line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
+
+    assert line_widths == [10, 20, 30]
+
+    spiral_progress_bar.set_line_widths(15, 1)
+    line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
+
+    assert line_widths == [10, 15, 30]
+
+
+def test_set_gap(spiral_progress_bar):
+    spiral_progress_bar.set_number_of_bars(3)
+    spiral_progress_bar.set_gap(20)
+
+    assert spiral_progress_bar.config.gap == 20
+
+
+def test_auto_update(spiral_progress_bar):
+    spiral_progress_bar.enable_auto_updates(True)
+
+    scan_queue_status_scan_progress = {
+        "queue": {
+            "primary": {
+                "info": [{"active_request_block": {"report_instructions": [{"scan_progress": 10}]}}]
+            }
+        }
+    }
+    meta = {}
+
+    spiral_progress_bar.on_scan_queue_status(scan_queue_status_scan_progress, meta)
+
+    assert spiral_progress_bar._auto_updates is True
+    assert len(spiral_progress_bar._rings) == 1
+    assert spiral_progress_bar._rings[0].config.connections == RingConnections(
+        slot="on_scan_progress", endpoint=MessageEndpoints.scan_progress()
+    )
+
+    scan_queue_status_device_readback = {
+        "queue": {
+            "primary": {
+                "info": [
+                    {
+                        "active_request_block": {
+                            "report_instructions": [
+                                {
+                                    "readback": {
+                                        "devices": ["samx", "samy"],
+                                        "start": [1, 2],
+                                        "end": [10, 20],
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        }
+    }
+    spiral_progress_bar.on_scan_queue_status(scan_queue_status_device_readback, meta)
+
+    assert spiral_progress_bar._auto_updates is True
+    assert len(spiral_progress_bar._rings) == 2
+    assert spiral_progress_bar._rings[0].config.connections == RingConnections(
+        slot="on_device_readback", endpoint=MessageEndpoints.device_readback("samx")
+    )
+    assert spiral_progress_bar._rings[1].config.connections == RingConnections(
+        slot="on_device_readback", endpoint=MessageEndpoints.device_readback("samy")
+    )
+
+    assert spiral_progress_bar._rings[0].config.min_value == 1
+    assert spiral_progress_bar._rings[0].config.max_value == 10
+    assert spiral_progress_bar._rings[1].config.min_value == 2
+    assert spiral_progress_bar._rings[1].config.max_value == 20

tests/unit_tests/test_validator_errors.py

@@ -1,110 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import pytest
-from pydantic import ValidationError
-
-from bec_widgets.validation.monitor_config_validator import (
-    AxisSignal,
-    MonitorConfigValidator,
-    PlotConfig,
-    Signal,
-)
-
-from .test_bec_monitor import mocked_client
-
-
-@pytest.fixture(scope="function")
-def setup_devices(mocked_client):
-    MonitorConfigValidator.devices = mocked_client.device_manager.devices
-
-
-def test_signal_validation_name_missing(setup_devices):
-    with pytest.raises(ValidationError) as excinfo:
-        Signal(name=None)
-    errors = excinfo.value.errors()
-    assert len(errors) == 1
-    assert errors[0]["type"] == "no_device_name"
-    assert "Device name must be provided" in str(excinfo.value)
-
-
-def test_signal_validation_name_not_in_bec(setup_devices):
-    with pytest.raises(ValidationError) as excinfo:
-        Signal(name="non_existent_device")
-    errors = excinfo.value.errors()
-    assert len(errors) == 1
-    assert errors[0]["type"] == "no_device_bec"
-    assert 'Device "non_existent_device" not found in current BEC session' in str(excinfo.value)
-
-
-def test_signal_validation_entry_not_in_device(setup_devices):
-    with pytest.raises(ValidationError) as excinfo:
-        Signal(name="samx", entry="non_existent_entry")
-
-    errors = excinfo.value.errors()
-    assert len(errors) == 1
-    assert errors[0]["type"] == "no_entry_for_device"
-    assert 'Entry "non_existent_entry" not found in device "samx" signals' in errors[0]["msg"]
-
-
-def test_signal_validation_success(setup_devices):
-    signal = Signal(name="samx")
-    assert signal.name == "samx"
-
-
-def test_plot_config_x_axis_signal_validation(setup_devices):
-    # Setup a valid signal
-    valid_signal = Signal(name="samx")
-
-    with pytest.raises(ValidationError) as excinfo:
-        AxisSignal(x=[valid_signal, valid_signal], y=[valid_signal, valid_signal])
-
-    errors = excinfo.value.errors()
-    assert len(errors) == 1
-    assert errors[0]["type"] == "x_axis_multiple_signals"
-    assert "There must be exactly one signal for x axis" in errors[0]["msg"]
-
-
-def test_plot_config_unsupported_source_type(setup_devices):
-    with pytest.raises(ValidationError) as excinfo:
-        PlotConfig(sources=[{"type": "unsupported_type", "signals": {}}])
-
-    errors = excinfo.value.errors()
-    print(errors)
-    assert len(errors) == 1
-    assert errors[0]["type"] == "literal_error"
-
-
-def test_plot_config_no_source_type_provided(setup_devices):
-    with pytest.raises(ValidationError) as excinfo:
-        PlotConfig(sources=[{"signals": {}}])
-
-    errors = excinfo.value.errors()
-    assert len(errors) == 1
-    assert errors[0]["type"] == "missing"
-
-
-def test_plot_config_history_source_type(setup_devices):
-    history_source = {
-        "type": "history",
-        "scan_id": "valid_scan_id",
-        "signals": {"x": [{"name": "samx"}], "y": [{"name": "samx"}]},
-    }
-
-    plot_config = PlotConfig(sources=[history_source])
-
-    assert len(plot_config.sources) == 1
-    assert plot_config.sources[0].type == "history"
-    assert plot_config.sources[0].scan_id == "valid_scan_id"
-
-
-def test_plot_config_redis_source_type(setup_devices):
-    history_source = {
-        "type": "redis",
-        "endpoint": "valid_endpoint",
-        "update": "append",
-        "signals": {"x": [{"name": "samx"}], "y": [{"name": "samx"}]},
-    }
-
-    plot_config = PlotConfig(sources=[history_source])
-
-    assert len(plot_config.sources) == 1
-    assert plot_config.sources[0].type == "redis"

tests/unit_tests/test_waveform1d.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 import numpy as np
 import pytest
 
-from bec_widgets.widgets.plots.waveform import CurveConfig, Signal, SignalData
+from bec_widgets.widgets.figure.plots.waveform.waveform_curve import CurveConfig, Signal, SignalData
 
 from .client_mocks import mocked_client
 from .test_bec_figure import bec_figure
@@ -304,6 +304,18 @@ def test_set_custom_curve_data(bec_figure, qtbot):
     assert np.array_equal(y_new, [7, 8, 9])
 
 
+def test_custom_data_2D_array(bec_figure, qtbot):
+
+    data = np.random.rand(10, 2)
+
+    plt = bec_figure.plot(data)
+
+    x, y = plt.curves[0].get_data()
+
+    assert np.array_equal(x, data[:, 0])
+    assert np.array_equal(y, data[:, 1])
+
+
 def test_get_all_data(bec_figure):
     w1 = bec_figure.add_plot()