bec-widgets 0.53.2__py3-none-any.whl → 0.54.0__py3-none-any.whl

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/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-0.53.2.dist-info → bec_widgets-0.54.0.dist-info}/METADATA

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

{bec_widgets-0.53.2.dist-info → bec_widgets-0.54.0.dist-info}/RECORD

@@ -2,34 +2,34 @@
 .gitlab-ci.yml,sha256=_PqbjtXpiMv7OxzoU-B47YU7majkBeE_JSKBtjGC5bQ,7431
 .pylintrc,sha256=OstrgmEyP0smNFBKoIN5_26-UmNZgMHnbjvAWX0UrLs,18535
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=bnzC8RWkjZxz_Fztht4Vd0Fd47SxINN_nQfZXJCOSTQ,6890
+CHANGELOG.md,sha256=WvYpUPepbaVY0ekmMlIfdQauN2zBi05qT2HbAGGfo28,7064
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=J6k1s4Wh3sKQNB2flOk5lwfRkCUAKUDFbGwXYfMF6Tk,1063
+PKG-INFO,sha256=apS5ixyctj9LOrWzs0N1yFvgfM4L2M-MuzdiPWV_-ck,1063
 README.md,sha256=y4jB6wvArS7N8_iTbKWnSM_oRAqLA2GqgzUR-FMh5sU,2645
-pyproject.toml,sha256=5gV_xHg0yZ-pGSUwgMz8CEkhbEtBvnCuc3POCuA1lbY,1776
+pyproject.toml,sha256=UcAdJ8fUfKwv8JZUD79z0YWEMxEte8nwtFfihxcZQcM,1776
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
 .gitlab/issue_templates/feature_request_template.md,sha256=vjxCnmj53Mp4FPzCrNxhkO-8StRQUZ36PlXu4K8VGaI,1543
 .gitlab/merge_request_templates/default.md,sha256=tfyFA0hRCsIunbLGSlGbxWBQFeB3USpsA3H7IvwQ5UY,715
 bec_widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/assets/bec_widgets_icon.png,sha256=K8dgGwIjalDh9PRHUsSQBqgdX7a00nM3igZdc20pkYM,1747017
+bec_widgets/assets/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uftXCH9ws,3889
 bec_widgets/cli/__init__.py,sha256=v5oaQMydRVEaqKNI73A3_AbQ0efXxBt2SLoUBKANrV8,301
 bec_widgets/cli/auto_updates.py,sha256=ptZeBKr13o9THc8oKLn93K_16i6G3pxzw8hZ4MUgjW4,3845
-bec_widgets/cli/bec_widgets_icon.png,sha256=K8dgGwIjalDh9PRHUsSQBqgdX7a00nM3igZdc20pkYM,1747017
-bec_widgets/cli/client.py,sha256=0qM-Zve4cXKNXrSNkxvTDtiWo6NvsYZGauOwLn4Rk3w,45622
-bec_widgets/cli/client_utils.py,sha256=eQ7eDjyrXToQ5es_INFA5YIzhH166E1s4zIEVYj95mA,10676
-bec_widgets/cli/generate_cli.py,sha256=FFDAogkEewfXMP20jkBBB08vcQdg5k1gnHpldXUcgOw,4101
+bec_widgets/cli/client.py,sha256=MrLr7pg3Fn4AuVBNdZ_GWppjC2C6woI79_mXH14BYsE,45669
+bec_widgets/cli/client_utils.py,sha256=IPWfseFBYFjCmBp4LsXyNUOcV5KTTdiW1jsLvG3jF5A,10536
+bec_widgets/cli/generate_cli.py,sha256=SrcDnvSdvJs2IJe3CdONACApsS6F07CgC84cjfX64vM,4305
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
 bec_widgets/cli/rpc_wigdet_handler.py,sha256=u54ctT3-pHIf_4788didF4YBXbvNFQI1TqleSILEaZU,783
-bec_widgets/cli/server.py,sha256=puRWFzb2HAjeWQYgTFp2gw9RVlNZh95Dd7JUeGVf0Uk,5868
+bec_widgets/cli/server.py,sha256=rsj31Vsx6ayThNe4PQelQFahGjYXFZjfrNyB2fnm6Ro,5737
 bec_widgets/examples/__init__.py,sha256=WWQ0cu7m8sA4Ehy-DWdTIqSISjaHsbxhsNmNrMnhDZU,202
 bec_widgets/examples/eiger_plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/eiger_plot/eiger_plot.py,sha256=Uxl2Usf8jEzaX7AT8zVqa1x8ZIEgI1HmazSlb-tRFWE,10359
 bec_widgets/examples/eiger_plot/eiger_plot.ui,sha256=grHfnO3OG_lelJhdRsnA0badCvRdDunPrIMIyNQ5N-w,5809
 bec_widgets/examples/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=s8ysnlktLv3932ody8pRA1mghH1QQcxLjQK1HTZ59b8,5642
+bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=eY_sSzc-XvH2S9xsoyeU1S6Qd99jaQOZ0wVBTwDeiP4,5788
 bec_widgets/examples/jupyter_console/jupyter_console_window.ui,sha256=2A2mNTUMZBYygz8K4qWzrcjnNqZBMVyeHm26iLZVRWI,1473
-bec_widgets/examples/jupyter_console/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uftXCH9ws,3889
 bec_widgets/examples/mca_readout/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/mca_readout/mca_plot.py,sha256=vjIOcTtHIsLmHW6N-bI7RTyjeYg0r8Ob-nZvvGC0kro,5124
 bec_widgets/examples/mca_readout/mca_sim.py,sha256=IbVW10lmorsxP0Ctqe81-b_WBi96jBPgzAHCUBoPzTY,818
@@ -40,7 +40,7 @@ bec_widgets/examples/motor_movement/__init__.py,sha256=LzPJkxLAxOsZCbXR-fRCPmeYo
 bec_widgets/examples/motor_movement/config_example.yaml,sha256=YT8Bl3ViTaP03cX9X8kIgWnkoxaQOFqS-oRrclGS2hc,356
 bec_widgets/examples/motor_movement/csax_bec_config.yaml,sha256=cqhzwfIhFgHfCt90oVW3no8aVlWg7V42t4iiJCnydSw,146
 bec_widgets/examples/motor_movement/csaxs_config.yaml,sha256=poNndp-1ptdnriIJ_RTnbAimFlOJ45VdxfkclGEQlgc,344
-bec_widgets/examples/motor_movement/motor_control_compilations.py,sha256=gj7SRjdKXDuX4jl4e8bnpM9U6l7B1wvwgGUPcVFOGCU,8978
+bec_widgets/examples/motor_movement/motor_control_compilations.py,sha256=hEkhCOjRgY1t7vZ1e_Olus2IeYDorybd8waHoVaM53Y,9303
 bec_widgets/examples/motor_movement/motor_controller.ui,sha256=83XX6NGILwntoUIghvzWnMuGf80O8khK3SduVKTAEFM,29105
 bec_widgets/examples/motor_movement/motor_example.py,sha256=P7gYgHldDR1tmAsEBePQRT7xIylsaN_jNWviwpDNek4,53350
 bec_widgets/examples/stream_plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,34 +61,37 @@ bec_widgets/utils/thread_checker.py,sha256=rDNuA3X6KQyA7JPb67mccTg0z8YkInynLAENQ
 bec_widgets/utils/validator_delegate.py,sha256=Emj1WF6W8Ke1ruBWUfmHdVJpmOSPezuOt4zvQTay_44,442
 bec_widgets/utils/widget_io.py,sha256=f36198CvT_EzWQ_cg2G-4tRRsaMdJ3yVqsZWKJCQEfA,10880
 bec_widgets/utils/yaml_dialog.py,sha256=cMVif-39SB9WjwGH5FWBJcFs4tnfFJFs5cacydRyhy0,1853
-bec_widgets/validation/__init__.py,sha256=ismd1bU5FhFb0zFPwNKuq7oT48G4Y2GfaMZOdNKUtGk,132
-bec_widgets/validation/monitor_config_validator.py,sha256=LJ0kk1cT0x6rAMuEM5XnmlUb-7caP-jqn4-UXe0Jjho,8145
-bec_widgets/widgets/__init__.py,sha256=NOgRDV9-uwrH1OK2JdfG5c0WcW77TSRz3PeNlGw22Lc,392
+bec_widgets/widgets/__init__.py,sha256=Pit_duh28VlsEIRfjLIVJ0EIRHJj7WFb-33SpMCmAEg,121
 bec_widgets/widgets/dock/__init__.py,sha256=B7foHt02gnhM7mFksa7GJVwT7n0j_JvYDCt6wc6XR5g,61
 bec_widgets/widgets/dock/dock.py,sha256=vnOQnOWWnd-3X07kniSW_I5l0uEHZOaWhfuqZkDGIqE,8467
 bec_widgets/widgets/dock/dock_area.py,sha256=UaI5Z-c9C16lhTbXmEVzfl55Y8ymKSk4sPWGleIsUVY,7182
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
-bec_widgets/widgets/figure/figure.py,sha256=OSF5y9iMEjhZmPC1MvjCVASfDXapf_o4jeUH3JRhAl0,28565
-bec_widgets/widgets/monitor/__init__.py,sha256=afXuZcBOxNAuYdCkIQXX5J60R5A3Q_86lNEW2vpFtPI,32
-bec_widgets/widgets/monitor/config_dialog.py,sha256=ThR1ZGnIUHqsW4t6ns9pBLTINYLBQwDtS-ipjOg4snU,19993
-bec_widgets/widgets/monitor/config_dialog.ui,sha256=ISMcF7CLTAMXhfZh2Yv5yezzAjMtb9fxY1pmX4B_jCg,5932
-bec_widgets/widgets/monitor/monitor.py,sha256=3PU0NnbnE-CjGggT7IadDfiOjXGY_85g2HSyU8BmrBM,30229
-bec_widgets/widgets/monitor/tab_template.ui,sha256=JVB5fkzVhTjxMn9EdZCXsnfzBkeZpFMdTRuqTNSDSSo,4904
-bec_widgets/widgets/monitor/example_configs/config_device.yaml,sha256=jn8EGvL_fk4gizCAA8P--OGn1RZGnz2aSlzQI9BcYlU,1172
-bec_widgets/widgets/monitor/example_configs/config_scans.yaml,sha256=TwMhiE_4p88gBlaeoztmkwNObAeoVXLeBFIUsV1Nwu0,1889
-bec_widgets/widgets/motor_control/__init__.py,sha256=_4-G9AKcEnOyS6qVE26meRw3grEohNeMzACNMU5Sig0,153
-bec_widgets/widgets/motor_control/motor_control.py,sha256=sfH_uGes4B3mOFPP9BYVMtqMSCFD5fWJNQwNxV06288,42458
-bec_widgets/widgets/motor_control/motor_control_absolute.ui,sha256=nR3p6oevAkIBTLW5wM_zYOVWsCAUgeMZdRm10Q77COE,4126
-bec_widgets/widgets/motor_control/motor_control_relative.ui,sha256=PulNJNiws7TRAxHM2snNyvlmQ0tRShdArHmtaC85h4U,8684
-bec_widgets/widgets/motor_control/motor_control_selection.ui,sha256=vXXpvNWuL6xyHhW7Lx1zmVFX-95Z5AXGlhKQD2HmM1A,1779
-bec_widgets/widgets/motor_control/motor_control_table.ui,sha256=t6aRKiSmutMfp0AyupavbCs0cal-FANEnlKQiPzC9PQ,2792
-bec_widgets/widgets/motor_map/__init__.py,sha256=K3c-3A_LbxK0UJ0_bV3opL-wGLTwBLendsJXsg8GAqE,32
-bec_widgets/widgets/motor_map/motor_map.py,sha256=Gd6pl5kPwWwMn_guKA6znz5Rbkw711uoAAUzmdWvi2I,21723
-bec_widgets/widgets/plots/__init__.py,sha256=yaCWQEXiEVj3Oh9qvD3UDzY2HE2PiDKKyKINEcVeL2k,238
-bec_widgets/widgets/plots/image.py,sha256=cfxdd_CQsEy-N_jgcjJICLIY4FZH9yJ7qcBsfjrqTdo,32444
-bec_widgets/widgets/plots/motor_map.py,sha256=CVlPG_zO1Di_v1Vs4AMxZFtlGjm_R8Lrw9cBe6bRGS4,15223
-bec_widgets/widgets/plots/plot_base.py,sha256=oNUXEe94bD0_fVu-HPMRaoAuwPMW0DOAN8vvOeRz254,8513
-bec_widgets/widgets/plots/waveform.py,sha256=MEtgEVgZrz7K5axO4nuGXU0KJPngb0bqWABhi_eRUao,28621
+bec_widgets/widgets/figure/figure.py,sha256=MbnG6d738aYgNiFuOFHgyaGre0eVLA8OdSg-Xx7XIYU,29712
+bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/figure/plots/plot_base.py,sha256=oNUXEe94bD0_fVu-HPMRaoAuwPMW0DOAN8vvOeRz254,8513
+bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/figure/plots/image/image.py,sha256=fdANm_lMzmKeddwCq3Arc1p48VakAYRlhY2q3pZspDI,19669
+bec_widgets/widgets/figure/plots/image/image_item.py,sha256=1oytCY2IIgRbtS3GRrp9JV02KOif78O2-iaK0qYuHFU,9058
+bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=59JwHMEBjLo72fmrAB7W1PFBT2oBe16heBaZfYM6MAk,4368
+bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=HKRbt8sD8fmzpYcEWD8-nYs1Mv7pLup1BfRAEVmKN3A,15246
+bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=k6Lh08V00N9gATppaLgaSaij4Husf8sYU_HXTvF3oB4,21664
+bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=9q7nJfyH8y9rWw_AIOd6tk7cbckoAGNLHv2oHEKCCyo,7229
+bec_widgets/widgets/motor_control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/motor_control/motor_control.py,sha256=UrLCvp3J6uiVxWV2jqQbsA2nsMf9s_rrDH2KjnUm-bk,7890
+bec_widgets/widgets/motor_control/motor_table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/motor_control/motor_table/motor_table.py,sha256=XSTaNfTXg6qeycxxQ0Y0SBwJLW2toRPj7cGGbkzcEB0,17387
+bec_widgets/widgets/motor_control/motor_table/motor_table.ui,sha256=t6aRKiSmutMfp0AyupavbCs0cal-FANEnlKQiPzC9PQ,2792
+bec_widgets/widgets/motor_control/movement_absolute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.py,sha256=Ol50UpMvF2_MJR7wesETUG5gUkNBmqRP5qTOeA4prH8,5516
+bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.ui,sha256=nR3p6oevAkIBTLW5wM_zYOVWsCAUgeMZdRm10Q77COE,4126
+bec_widgets/widgets/motor_control/movement_relative/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/motor_control/movement_relative/movement_relative.py,sha256=5gqdWvDfadT_DZm6o3qYw8UgdKlcpEwKDtU7_usP3oo,8706
+bec_widgets/widgets/motor_control/movement_relative/movement_relative.ui,sha256=PulNJNiws7TRAxHM2snNyvlmQ0tRShdArHmtaC85h4U,8684
+bec_widgets/widgets/motor_control/selection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bec_widgets/widgets/motor_control/selection/selection.py,sha256=WNHndvv4JvxeAMnDFBMTvUILcn9u_0mWGRsgNiBZEsM,3988
+bec_widgets/widgets/motor_control/selection/selection.ui,sha256=vXXpvNWuL6xyHhW7Lx1zmVFX-95Z5AXGlhKQD2HmM1A,1779
 bec_widgets/widgets/scan_control/__init__.py,sha256=IOfHl15vxb_uC6KN62-PeUzbBha_vQyqkkXbJ2HU674,38
 bec_widgets/widgets/scan_control/scan_control.py,sha256=B5n2U2iVtTCY3Tx93JyBqzGCDCmWhWwAOhbPelLI-bs,17168
 bec_widgets/widgets/toolbar/__init__.py,sha256=d-TP4_cr_VbpwreMM4ePnfZ5YXsEPQ45ibEf75nuGoE,36
@@ -97,7 +100,7 @@ docs/Makefile,sha256=i2WHuFlgfyAPEW4ssEP8NY4cOibDJrVjvzSEU8_Ggwc,634
 docs/conf.py,sha256=pASMheaNEMnHl91PHQWUW0uu3OqXByYnDeSrlrVAUeI,2474
 docs/index.md,sha256=6HrqaPXb5uUPEtM2gZaVUi1wM1kUYmdC2aIFpmItzZ0,453
 docs/make.bat,sha256=vKazJE8RW49Cy8K7hm8QYbletvAd8YkeKsaPA_dWnXs,800
-docs/requirements.txt,sha256=5IJN7-VApjTeFouHsaWAb5b4p6wS6wI9fKcJBxcX9QY,134
+docs/requirements.txt,sha256=SbcWrLYX6tEZNMCUETgsE50Y7VioR1VX6YCeifuJWEc,140
 docs/_templates/custom-class-template.rst,sha256=HPuPaGJob2zXlWOl5FmA-hAZRbUTGQmdqo3HS1iIFog,711
 docs/_templates/custom-module-template.rst,sha256=MXYXAz06HP_mbblO--iFwL08xROmSBo7U4O-hPbMcZU,1228
 docs/developer/developer.md,sha256=xJvO-EAf-9SqDARRnqFLRd8k_o258U97V0DmvgZKMos,477
@@ -118,31 +121,27 @@ docs/user/widgets/w1D.gif,sha256=tuHbleJpl6bJFNNC2OdndF5LF7IyfvlkFCMGZajrQPs,622
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/end-2-end/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/end-2-end/conftest.py,sha256=b5Yebbj8C1-IcXq23XGbOnXF0kOZD_Po46Z-p4cBwfs,1346
-tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=NnvlTpyHrA8DJ0RHXtQfp4rApuszv7NXZuWrlvthkC0,4558
-tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=rQh9H6k-Ln4yDfCYIYv2DW-l70PXY_MjzshmZdirBgQ,5471
-tests/end-2-end/test_rpc_register_e2e.py,sha256=Jrv46F-fyJa0tls1KPTeIxXQ4oUNgWkhAMwzvMQBRR8,1581
+tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=V4GC1G_qjtOapwkj7jrR8xfeALBsXeQBmEtAJd2uyB4,4572
+tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=X8lQLx2NsB6-nU61IhVtAw1-pJ4A2qFgx5PxOWC0V7Q,5527
+tests/end-2-end/test_rpc_register_e2e.py,sha256=M7sSq3us2yQIW5tAIFOFfBULatZTQNLdt0frh1bINts,1595
 tests/unit_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/client_mocks.py,sha256=ErrklY7446jXE2_XGKebs_a-2Pqif5ECOPvxVAKRZXY,4170
 tests/unit_tests/conftest.py,sha256=KrnktXPWmZhnKNue-xGWOLD1XGEvdz9Vf7V2eO3XQ3A,596
 tests/unit_tests/test_bec_connector.py,sha256=f2XXGGw3NoZLIUrDuZuEWwF_ttOYmmquCgUrV5XkIOY,1951
 tests/unit_tests/test_bec_dispatcher.py,sha256=rYPiRizHaswhGZw55IBMneDFxmPiCCLAZQBqjEkpdyY,3992
-tests/unit_tests/test_bec_dock.py,sha256=ZnHUoVQCGbikd0mM64XBL_k0Kxp0d3UqCHpcyY59emg,3596
-tests/unit_tests/test_bec_figure.py,sha256=1nRSX2lJE_wv_R4WteECBxD0NwpQT8NaZH5q66gT-jo,7829
-tests/unit_tests/test_bec_monitor.py,sha256=mN7gBY7oXY6j65zzihpy8r-FvwVoCQlie3F6SoVq0mo,7042
-tests/unit_tests/test_bec_motor_map.py,sha256=oAhnahV9UcPknsCgoP_TwTIlagKola2HFajmtkxzSyo,4588
+tests/unit_tests/test_bec_dock.py,sha256=gvtNkkCPrDFY_1qZ53ZXChdgmQFSwwQrr1VeZC5ybKc,3610
+tests/unit_tests/test_bec_figure.py,sha256=xYAftY8bI_EH-SlNPD0Tjd7FS_47ouZ1E4hrpjPt7O4,8002
+tests/unit_tests/test_bec_motor_map.py,sha256=AfD_9-x6VV3TPnkQgNfFYRndPHDsGx-a_YknFeDr6hc,4588
 tests/unit_tests/test_client_utils.py,sha256=fIApd5WgnJuyIzV-hdSABn6T-aOel2Wr2xuUX4Z651A,774
-tests/unit_tests/test_config_dialog.py,sha256=Y8I9zGG8G9jh0MRCsNl5dQT17bZL6BWaDja7fW1ncCs,6924
 tests/unit_tests/test_crosshair.py,sha256=d7fX-ymboZPALNqqiAj86PZ96llmGZ_3jf0yjVP0S94,5039
 tests/unit_tests/test_eiger_plot.py,sha256=bWnKBQid0YcLMQeBLy6ojb4ZpwTG-rFVT0kMg9Y08p8,4427
 tests/unit_tests/test_generate_cli_client.py,sha256=J7CFoO67txGu_u1Mwk32EejRX204FRuvmVg_yhAr1WM,2397
-tests/unit_tests/test_motor_control.py,sha256=210qBSZdg4hSDflgwez-pWsoU4m3W8hmGCJEdCeu6MA,20321
-tests/unit_tests/test_motor_map.py,sha256=aKhJtgHOLMOlpniguuH5iGKh72ihYZ1L2S2KEmZUC0k,5875
+tests/unit_tests/test_motor_control.py,sha256=ksjzcml9hAr-mMxL4NVAeEYGBaSDvE2pR_n3Rvz8fEQ,20579
 tests/unit_tests/test_plot_base.py,sha256=bOdlgAxh9oKk5PwiQ_MSFmzr44uJ61Tlg242RCIhl5c,2610
 tests/unit_tests/test_rpc_register.py,sha256=hECjZEimd440mwRrO0rg7L3PKN7__3DgjmESN6wx3bo,1179
 tests/unit_tests/test_scan_control.py,sha256=7dtGpE0g4FqUhhQeCkyJl-9o7NH3DFZJgEaqDmBYbBc,7551
 tests/unit_tests/test_stream_plot.py,sha256=gMd-ga72OCGzE09vRuoLDH8dqeEJOnrvK-4Lu-TG5RY,5760
-tests/unit_tests/test_validator_errors.py,sha256=NFxyv0TIOXeZKZRRUBfVQ7bpunwY4KkG95yTUdQmvns,3532
-tests/unit_tests/test_waveform1d.py,sha256=cBtESTQgsVQdv-Wl75eHK9D8YY-b60Z5wqtPCo9ohu0,15002
+tests/unit_tests/test_waveform1d.py,sha256=Xi9TdZmxoMmmje37lq03FG9lytEdZCTUEjtOC0LvZjA,15263
 tests/unit_tests/test_widget_io.py,sha256=FeL3ZYSBQnRt6jxj8VGYw1cmcicRQyHKleahw7XIyR0,3475
 tests/unit_tests/test_yaml_dialog.py,sha256=HNrqferkdg02-9ieOhhI2mr2Qvt7GrYgXmQ061YCTbg,5794
 tests/unit_tests/test_configs/config_device.yaml,sha256=h3zNb5ZaT_sA59Sf-24qsXs54MgUsspo-GOJmKWHx3o,695
@@ -150,7 +149,7 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.53.2.dist-info/METADATA,sha256=J6k1s4Wh3sKQNB2flOk5lwfRkCUAKUDFbGwXYfMF6Tk,1063
-bec_widgets-0.53.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-bec_widgets-0.53.2.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.53.2.dist-info/RECORD,,
+bec_widgets-0.54.0.dist-info/METADATA,sha256=apS5ixyctj9LOrWzs0N1yFvgfM4L2M-MuzdiPWV_-ck,1063
+bec_widgets-0.54.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+bec_widgets-0.54.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.54.0.dist-info/RECORD,,

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.2"
+version = "0.54.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -38,7 +38,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"

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_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