bec-widgets 0.81.2__tar.gz → 0.82.1__tar.gz

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/CHANGELOG.md

@@ -1,5 +1,43 @@
 # CHANGELOG
 
+## v0.82.1 (2024-07-07)
+
+### Fix
+
+* fix(motor_map): bug where motors without limits were selected ([`c78cd89`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c78cd898f203f950d7cb589eb5609feaa88062cf))
+
+### Refactor
+
+* refactor(setting_dialog): moved to qt_utils ([`3826bb3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3826bb3d9e870e85709b5b20ef09a4d22641280c))
+
+* refactor(toolbar): toolbar moved from widgets to qt_utils ([`7ffc06f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7ffc06f3c7ddd86a1681408a75221b9bbadb236b))
+
+### Test
+
+* test(setting_dialog): tests added ([`74a249b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/74a249bd065d01006cb532bfff2a9bfedb34b592))
+
+### Unknown
+
+* tests(motor_map_widget): tests added ([`734f4c7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/734f4c77507a1edafd477d81b5f7401d8e759be2))
+
+* feat(settings_dialog):apply button ([`2020953`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2020953b933b6fcad61ecc770588d39518c26fdd))
+
+## v0.82.0 (2024-07-07)
+
+### Feature
+
+* feat(toggle): added angular component-like toggle ([`b9bff38`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b9bff38b64b86f06b3bc047922ef9df0c7d32e71))
+
+### Refactor
+
+* refactor(device_input): DeviceComboBox and DeviceLineEdit moved to top layer of widgets ([`f048629`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f04862933f049030554086adef3ec9e1aebd3eda))
+
+* refactor(stop_button): moved to top layer, plugin added ([`f5b8375`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f5b8375fd36e3bb681de571da86a6c0bdb3cb6f0))
+
+* refactor(motor_map_widget): removed restriction of only PySide6 for widget ([`db1cdf4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/db1cdf42806fef6d7c6d2db83528f32df3f9751d))
+
+* refactor(color_button): ColorButton moved to top level of widgets ([`fa1e86f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fa1e86ff07b25d2c47c73117b00765b8e2f25da4))
+
 ## v0.81.2 (2024-07-07)
 
 ### Fix
@@ -98,8 +136,6 @@
 
 * feat(bec_connector): export config to yaml ([`a391f30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a391f3018c50fee6a4a06884491b957df80c3cd3))
 
-* feat(utils): colors added convertor for rgba to hex ([`572f2fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/572f2fb8110d5cb0e80f3ca45ce57ef405572456))
-
 ### Fix
 
 * fix(waveform): scatter 2D brush error ([`215d59c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/215d59c8bfe7fda9aff8cec8353bef9e1ce2eca1))
@@ -109,33 +145,3 @@
 * fix(figure): if/else logic corrected in subplot_factory ([`3e78723`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3e787234c7274b0698423d7bf9a4c54ec46bad5f))
 
 * fix(image): processing of already displayed data; closes #106 ([`1173510`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1173510105d2d70d7e498c2ac1e122cea3a16597))
-
-* fix(bec_figure): full reconstruction with config from other bec figure ([`b6e1e20`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b6e1e20b7c8549bb092e981062329e601411dda6))
-
-* fix(motor_map): API changes updates current visualisation; motor_map can be initialised from config ([`2e2d422`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2e2d422910685a2527a3d961a468c787f771ca44))
-
-* fix(image): image add_custom_image fixed, closes #225 ([`f0556e4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0556e44113ffee66cf735aa2dd758c62cb634f4))
-
-* fix(figure): subplot methods consolidated; added subplot factory ([`4a97105`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a97105e4bd2ce77d72dfe5f8307dd9ee65b21b0))
-
-* fix(image): image can be fully reconstructed from config ([`797f73c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/797f73c39aa73e07d6311f3de4baea53f6c380e0))
-
-* fix(image_item): vrange added int for pydantic model check ([`b8f796f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8f796fd3fcc15641e8fc6a3ca75c344ce90fc45))
-
-* fix(bec_figure): waveforms can be initialised from the config; widgets are deleteLater after removal ([`78673ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/78673ea11a47aad878128197ae6213925228ed59))
-
-### Unknown
-
-* Resolve "add VT100 console executing BEC as a widget" ([`c6a14c0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c6a14c0768a90695567a83a7895247ed0c64f3ce))
-
-## v0.76.1 (2024-06-29)
-
-### Fix
-
-* fix(plugins): fixes and tests for auto-gen plugins ([`c42511d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c42511dd44cc13577e108a6cef3166376e594f54))
-
-## v0.76.0 (2024-06-28)
-
-### Fix
-
-* fix: fixed qwidget inheritance for ring progress bar ([`0610d2f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0610d2f9f027f8659e7149f2dfbb316ff30e337d))

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.81.2
+Version: 0.82.1
 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.81.2 → bec_widgets-0.82.1}/bec_widgets/cli/client.py

@@ -21,6 +21,7 @@ class Widgets(str, enum.Enum):
     BECStatusBox = "BECStatusBox"
     RingProgressBar = "RingProgressBar"
     ScanControl = "ScanControl"
+    StopButton = "StopButton"
     TextBox = "TextBox"
     VSCodeEditor = "VSCodeEditor"
     WebsiteWidget = "WebsiteWidget"

bec_widgets-0.82.1/bec_widgets/qt_utils/settings_dialog.py

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

{bec_widgets-0.81.2/bec_widgets/widgets/toolbar → bec_widgets-0.82.1/bec_widgets/qt_utils}/toolbar.py

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

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets/base_classes}/device_input_base.py

@@ -25,6 +25,7 @@ class DeviceInputBase(BECConnector):
         super().__init__(client=client, config=config, gui_id=gui_id)
 
         self.get_bec_shortcuts()
+        self._device_filter = None
         self._devices = []
 
     @property
@@ -56,6 +57,7 @@ class DeviceInputBase(BECConnector):
         """
         self.validate_device_filter(device_filter)
         self.config.device_filter = device_filter
+        self._device_filter = device_filter
 
     def set_default_device(self, default_device: str):
         """

{bec_widgets-0.81.2/bec_widgets/widgets/buttons → bec_widgets-0.82.1/bec_widgets/widgets}/color_button/color_button_plugin.py

@@ -3,7 +3,7 @@ import os
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
-from bec_widgets.widgets.buttons.color_button.color_button import ColorButton
+from bec_widgets.widgets.color_button.color_button import ColorButton
 
 DOM_XML = """
 <ui language='c++'>

{bec_widgets-0.81.2/bec_widgets/widgets/buttons → bec_widgets-0.82.1/bec_widgets/widgets}/color_button/register_color_button.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.buttons.color_button.color_button_plugin import ColorButtonPlugin
+    from bec_widgets.widgets.color_button.color_button_plugin import ColorButtonPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(ColorButtonPlugin())
 

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_combobox/device_combobox.py

@@ -2,10 +2,10 @@ from typing import TYPE_CHECKING
 
 from qtpy.QtWidgets import QComboBox
 
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig
 
 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig
 
 
 class DeviceComboBox(DeviceInputBase, QComboBox):

bec_widgets-0.82.1/bec_widgets/widgets/device_combobox/device_combobox.pyproject

@@ -0,0 +1,3 @@
+{
+    "files": ["device_combobox.py"]
+}

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_combobox/device_combobox_plugin.py

@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
-from bec_widgets.widgets.device_inputs import DeviceComboBox
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Device Inputs"
 
     def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "device_combobox_icon.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "device_combobox"

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_combobox/register_device_combobox.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
-        DeviceComboBoxPlugin,
-    )
+    from bec_widgets.widgets.device_combobox.device_combobox_plugin import DeviceComboBoxPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
 

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_line_edit/device_line_edit.py

@@ -3,10 +3,10 @@ from typing import TYPE_CHECKING
 from qtpy.QtCore import QSize
 from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy
 
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig
 
 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig
 
 
 class DeviceLineEdit(DeviceInputBase, QLineEdit):

bec_widgets-0.82.1/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject

@@ -0,0 +1,3 @@
+{
+    "files": ["device_line_edit.py"]
+}

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_line_edit/device_line_edit_plugin.py

@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Device Inputs"
 
     def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "line_edit_icon.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "device_line_edit"

{bec_widgets-0.81.2/bec_widgets/widgets/device_inputs → bec_widgets-0.82.1/bec_widgets/widgets}/device_line_edit/register_device_line_edit.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit_plugin import (
-        DeviceLineEditPlugin,
-    )
+    from bec_widgets.widgets.device_line_edit.device_line_edit_plugin import DeviceLineEditPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())
 

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/figure/plots/motor_map/motor_map.py

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

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

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

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py

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

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -2,20 +2,20 @@ from __future__ import annotations
 
 import sys
 
-from qtpy import PYSIDE6
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.settings_dialog import SettingsDialog
+from bec_widgets.qt_utils.toolbar import ModularToolBar
 from bec_widgets.utils import BECConnector
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import MotorMapConfig
-from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapDialog
+from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
 from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_toolbar import (
     ConnectAction,
     DeviceSelectionAction,
     ResetHistoryAction,
     SettingsAction,
 )
-from bec_widgets.widgets.toolbar import ModularToolBar
 
 
 class BECMotorMapWidget(BECConnector, QWidget):
@@ -37,10 +37,6 @@ class BECMotorMapWidget(BECConnector, QWidget):
         client=None,
         gui_id: str | None = None,
     ) -> None:
-        if not PYSIDE6:
-            raise RuntimeError(
-                "PYSIDE6 is not available in the environment. This widget is compatible only with PySide6."
-            )
         if config is None:
             config = MotorMapConfig(widget_class=self.__class__.__name__)
         else:
@@ -97,7 +93,9 @@ class BECMotorMapWidget(BECConnector, QWidget):
         toolbar_y.setStyleSheet("QComboBox {{ background-color: " "; }}")
 
     def show_settings(self) -> None:
-        dialog = MotorMapDialog(self, target_widget=self)
+        dialog = SettingsDialog(
+            self, settings_widget=MotorMapSettings(), window_title="Motor Map Settings"
+        )
         dialog.exec()
 
     ###################################
@@ -216,13 +214,6 @@ class BECMotorMapWidget(BECConnector, QWidget):
 
 
 def main():  # pragma: no cover
-
-    if not PYSIDE6:
-        print(
-            "PYSIDE6 is not available in the environment. UI files with BEC custom widgets are runnable only with PySide6."
-        )
-        return
-
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/scan_control/scan_control.py

@@ -12,8 +12,8 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets.utils import BECConnector
-from bec_widgets.widgets.buttons.stop_button.stop_button import StopButton
 from bec_widgets.widgets.scan_control.scan_group_box import ScanGroupBox
+from bec_widgets.widgets.stop_button.stop_button import StopButton
 
 
 class ScanControl(BECConnector, QWidget):

{bec_widgets-0.81.2 → bec_widgets-0.82.1}/bec_widgets/widgets/scan_control/scan_group_box.py

@@ -12,7 +12,7 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 
 class ScanArgType:

bec_widgets-0.82.1/bec_widgets/widgets/stop_button/register_stop_button.py

@@ -0,0 +1,15 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.stop_button.stop_button_plugin import StopButtonPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(StopButtonPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

{bec_widgets-0.81.2/bec_widgets/widgets/buttons → bec_widgets-0.82.1/bec_widgets/widgets}/stop_button/stop_button.py

@@ -1,3 +1,4 @@
+from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QPushButton
 
 from bec_widgets.utils import BECConnector
@@ -12,21 +13,13 @@ class StopButton(BECConnector, QPushButton):
 
         self.get_bec_shortcuts()
         self.setText("Stop")
-        self.setStyleSheet("background-color:  #cc181e; color: white")
+        self.setStyleSheet(
+            "background-color:  #cc181e; color: white; font-weight: bold; font-size: 12px;"
+        )
         self.clicked.connect(self.stop_scan)
 
+    @Slot()
     def stop_scan(self):
         """Stop the scan."""
         self.queue.request_scan_abortion()
         self.queue.request_queue_reset()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    widget = StopButton()
-    widget.show()
-    sys.exit(app.exec_())

bec_widgets-0.82.1/bec_widgets/widgets/stop_button/stop_button.pyproject

@@ -0,0 +1 @@
+{'files': ['stop_button.py']}