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

bec_widgets/widgets/{device_inputs/device_combobox → 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/widgets/device_combobox/device_combobox.pyproject

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

bec_widgets/widgets/{device_inputs/device_combobox → 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/widgets/{device_inputs/device_combobox → 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/widgets/{device_inputs/device_line_edit → 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/widgets/device_line_edit/device_line_edit.pyproject

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

bec_widgets/widgets/{device_inputs/device_line_edit → 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/widgets/{device_inputs/device_line_edit → 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/widgets/figure/plots/waveform/waveform.py

@@ -221,6 +221,7 @@ class BECWaveform(BECPlotBase):
         label: str | None = None,
         validate: bool = True,
         dap: str | None = None,  # TODO add dap custom curve wrapper
+        **kwargs,
     ) -> BECCurve:
         """
         Plot a curve to the plot widget.
@@ -244,7 +245,7 @@ class BECWaveform(BECPlotBase):
         """
 
         if x is not None and y is not None:
-            return self.add_curve_custom(x=x, y=y, label=label, color=color)
+            return self.add_curve_custom(x=x, y=y, label=label, color=color, **kwargs)
         else:
             if dap:
                 self.add_dap(x_name=x_name, y_name=y_name, dap=dap)
@@ -259,6 +260,7 @@ class BECWaveform(BECPlotBase):
                 color_map_z=color_map_z,
                 label=label,
                 validate_bec=validate,
+                **kwargs,
             )
 
     def add_curve_custom(
@@ -754,7 +756,11 @@ class BECWaveform(BECPlotBase):
             self.update_dap, MessageEndpoints.dap_response(self.scan_id)
         )
         if scan_index is not None:
-            self.scan_id = self.queue.scan_storage.storage[scan_index].scan_id
+            try:
+                self.scan_id = self.queue.scan_storage.storage[scan_index].scan_id
+            except IndexError:
+                print(f"Scan index {scan_index} out of range.")
+                return
         elif scan_id is not None:
             self.scan_id = scan_id
 

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -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)

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py

@@ -4,7 +4,7 @@ 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.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.toolbar.toolbar import ToolBarAction
 
 

bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import sys
 
-from qtpy import PYSIDE6
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.utils import BECConnector
@@ -37,10 +36,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:
@@ -216,13 +211,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/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/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/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/widgets/{buttons/stop_button → 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/widgets/stop_button/stop_button.pyproject

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

bec_widgets/widgets/stop_button/stop_button_plugin.py

@@ -0,0 +1,57 @@
+# 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.stop_button.stop_button import StopButton
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='StopButton' name='stop_button'>
+    </widget>
+</ui>
+"""
+
+
+class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = StopButton(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Buttons"
+
+    def icon(self):
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "stop.png")
+        return QIcon(icon_path)
+
+    def includeFile(self):
+        return "stop_button"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "StopButton"
+
+    def toolTip(self):
+        return "A button that stops the current scan."
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/widgets/toggle/register_toggle_switch.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.toggle.toggle_switch_plugin import ToggleSwitchPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(ToggleSwitchPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

bec_widgets/widgets/toggle/toggle.py

@@ -0,0 +1,149 @@
+import sys
+
+from qtpy.QtCore import Property, QEasingCurve, QPointF, QPropertyAnimation, Qt
+from qtpy.QtGui import QColor, QPainter
+from qtpy.QtWidgets import QApplication, QWidget
+
+
+class ToggleSwitch(QWidget):
+    """
+    A simple toggle.
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setFixedSize(40, 21)
+
+        self._thumb_pos = QPointF(3, 2)  # Use QPointF for the thumb position
+        self._active_track_color = QColor(33, 150, 243)
+        self._active_thumb_color = QColor(255, 255, 255)
+        self._inactive_track_color = QColor(200, 200, 200)
+        self._inactive_thumb_color = QColor(255, 255, 255)
+
+        self._checked = False
+        self._track_color = self.inactive_track_color
+        self._thumb_color = self.inactive_thumb_color
+
+        self._animation = QPropertyAnimation(self, b"thumb_pos")
+        self._animation.setDuration(200)
+        self._animation.setEasingCurve(QEasingCurve.Type.OutBack)
+        self.setProperty("checked", True)
+
+    @Property(bool)
+    def checked(self):
+        """
+        The checked state of the toggle switch.
+        """
+        return self._checked
+
+    @checked.setter
+    def checked(self, state):
+        self._checked = state
+        self.update_colors()
+        self.set_thumb_pos_to_state()
+
+    @Property(QPointF)
+    def thumb_pos(self):
+        return self._thumb_pos
+
+    @thumb_pos.setter
+    def thumb_pos(self, pos):
+        self._thumb_pos = pos
+        self.update()
+
+    @Property(QColor)
+    def active_track_color(self):
+        return self._active_track_color
+
+    @active_track_color.setter
+    def active_track_color(self, color):
+        self._active_track_color = color
+        self.update_colors()
+        self.update()
+
+    @Property(QColor)
+    def active_thumb_color(self):
+        return self._active_thumb_color
+
+    @active_thumb_color.setter
+    def active_thumb_color(self, color):
+        self._active_thumb_color = color
+        self.update_colors()
+        self.update()
+
+    @Property(QColor)
+    def inactive_track_color(self):
+        return self._inactive_track_color
+
+    @inactive_track_color.setter
+    def inactive_track_color(self, color):
+        self._inactive_track_color = color
+        self.update_colors()
+        self.update()
+
+    @Property(QColor)
+    def inactive_thumb_color(self):
+        return self._inactive_thumb_color
+
+    @inactive_thumb_color.setter
+    def inactive_thumb_color(self, color):
+        self._inactive_thumb_color = color
+        self.update_colors()
+        self.update()
+
+    def paintEvent(self, event):
+        painter = QPainter(self)
+        painter.setRenderHint(QPainter.Antialiasing)
+
+        # Draw track
+        painter.setBrush(self._track_color)
+        painter.setPen(Qt.NoPen)
+        painter.drawRoundedRect(
+            0, 0, self.width(), self.height(), self.height() / 2, self.height() / 2
+        )
+
+        # Draw thumb
+        painter.setBrush(self._thumb_color)
+        diameter = int(self.height() * 0.8)
+        painter.drawEllipse(int(self._thumb_pos.x()), int(self._thumb_pos.y()), diameter, diameter)
+
+    def mousePressEvent(self, event):
+        if event.button() == Qt.LeftButton:
+            self._checked = not self._checked
+            self.update_colors()
+            self.animate_thumb()
+
+    def update_colors(self):
+
+        self._thumb_color = self.active_thumb_color if self._checked else self.inactive_thumb_color
+        self._track_color = self.active_track_color if self._checked else self.inactive_track_color
+
+    def get_thumb_pos(self, checked):
+        return QPointF(self.width() - self.height() + 3, 2) if checked else QPointF(3, 2)
+
+    def set_thumb_pos_to_state(self):
+        # this is to avoid that linter complains about the thumb_pos setter
+        self.setProperty("thumb_pos", self.get_thumb_pos(self._checked))
+        self.update_colors()
+
+    def animate_thumb(self):
+        start_pos = self.thumb_pos
+        end_pos = self.get_thumb_pos(self._checked)
+
+        self._animation.stop()
+        self._animation.setStartValue(start_pos)
+        self._animation.setEndValue(end_pos)
+        self._animation.start()
+
+    def sizeHint(self):
+        return self.minimumSizeHint()
+
+    def minimumSizeHint(self):
+        return self.size()
+
+
+if __name__ == "__main__":  # pragma: no cover
+    app = QApplication(sys.argv)
+    window = ToggleSwitch()
+    window.show()
+    sys.exit(app.exec())

bec_widgets/widgets/toggle/toggle_switch.pyproject

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

bec_widgets/widgets/toggle/toggle_switch_plugin.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.toggle.toggle import ToggleSwitch
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='ToggleSwitch' name='toggle_switch'>
+    </widget>
+</ui>
+"""
+
+
+class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = ToggleSwitch(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return ""
+
+    def icon(self):
+        return QIcon()
+
+    def includeFile(self):
+        return "toggle_switch"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "ToggleSwitch"
+
+    def toolTip(self):
+        return "ToggleSwitch"
+
+    def whatsThis(self):
+        return self.toolTip()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.79.3
+Version: 0.82.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
@@ -28,9 +28,6 @@ Requires-Dist: pytest-random-order~=1.1; extra == 'dev'
 Requires-Dist: pytest-timeout~=2.2; extra == 'dev'
 Requires-Dist: pytest-xvfb~=3.0; extra == 'dev'
 Requires-Dist: pytest~=8.0; extra == 'dev'
-Provides-Extra: pyqt5
-Requires-Dist: pyqt5>=5.9; extra == 'pyqt5'
-Requires-Dist: pyqtwebengine>=5.9; extra == 'pyqt5'
 Provides-Extra: pyqt6
 Requires-Dist: pyqt6-webengine>=6.7; extra == 'pyqt6'
 Requires-Dist: pyqt6>=6.7; extra == 'pyqt6'