bec-widgets 0.99.9__tar.gz → 0.99.10__tar.gz

{bec_widgets-0.99.9 → bec_widgets-0.99.10}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## v0.99.10 (2024-08-29)
+
+### Fix
+
+* fix(stop_button): queue logic scan changed to halt instead of abort and reset ([`4a89028`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a890281f7eaef02d0ec9f4c5bf080be11fe0fe3))
+
+### Refactor
+
+* refactor(stop_button): stop button changed to QWidget and adapted for toolbar ([`097946f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/097946fd688b8faf770e7cc0e689ea668206bc7a))
+
+* refactor: added hide option for device selection button ([`cdd1752`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cdd175207e922904b2efbb2d9ecf7c556c617f2e))
+
 ## v0.99.9 (2024-08-28)
 
 ### Fix
@@ -142,20 +154,6 @@ If not theme is set, the init of the BECWidget base class sets the default theme
 
 ## v0.97.0 (2024-08-23)
 
-### Feature
-
-* feat(designer): added designer icon factory ([`82a55dd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/82a55ddf3eafb589cb63408db1c0e7e5c9d629da))
-
 ### Fix
 
 * fix(toolbar icon): fixed material icon toolbar for theme changes ([`3ecbd60`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3ecbd60627994417c9175364e5909710dbcdceb2))
-
-## v0.96.3 (2024-08-23)
-
-### Documentation
-
-* docs(dispatcher): docs added ([`dd7c71b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dd7c71bb1e0b7ef5398b1e1a05fc1147c772420a))
-
-### Fix
-
-* fix: minor fixes for type annotations ([`8c2e7c8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8c2e7c82592ace50e4e1f47e392a0ddc988f57ae))

{bec_widgets-0.99.9 → bec_widgets-0.99.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.99.9
+Version: 0.99.10
 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.99.9 → bec_widgets-0.99.10}/bec_widgets/widgets/positioner_box/positioner_box.py

@@ -32,7 +32,7 @@ class PositionerBox(BECWidget, QWidget):
     USER_ACCESS = ["set_positioner"]
     device_changed = Signal(str, str)
 
-    def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
+    def __init__(self, parent=None, device: Positioner = None, **kwargs):
         """Initialize the PositionerBox widget.
 
         Args:
@@ -97,15 +97,6 @@ class PositionerBox(BECWidget, QWidget):
         dialog.setLayout(layout)
         dialog.exec()
 
-    @Slot(str)
-    def _positioner_changed(self, positioner_name: str):
-        """Changed input in combobox.
-
-        Args:
-            positioner_name (str): name of the positioner
-        """
-        self.set_positioner(positioner_name)
-
     def init_device(self):
         """Init the device view and readback"""
         if self._check_device_is_valid(self.device):
@@ -138,7 +129,27 @@ class PositionerBox(BECWidget, QWidget):
         self._device = value
         self.device_changed.emit(old_device, value)
 
-    def set_positioner(self, positioner: str):
+    @Property(bool)
+    def hide_device_selection(self):
+        """Hide the device selection"""
+        return not self.ui.tool_button.isVisible()
+
+    @hide_device_selection.setter
+    def hide_device_selection(self, value: bool):
+        """Set the device selection visibility"""
+        self.ui.tool_button.setVisible(not value)
+
+    @Slot(bool)
+    def show_device_selection(self, value: bool):
+        """Show the device selection
+
+        Args:
+            value (bool): Show the device selection
+        """
+        self.hide_device_selection = not value
+
+    @Slot(str)
+    def set_positioner(self, positioner: str | Positioner):
         """Set the device
 
         Args:
@@ -191,6 +202,7 @@ class PositionerBox(BECWidget, QWidget):
             self.ui.step_size.setDecimals(precision)
             self.ui.step_size.setValue(10**-precision * 10)
 
+    # pylint: disable=unused-argument
     @Slot(dict, dict)
     def on_device_readback(self, msg_content: dict, metadata: dict):
         """Callback for device readback.

bec_widgets-0.99.10/bec_widgets/widgets/stop_button/stop_button.py

@@ -0,0 +1,44 @@
+from bec_qthemes import material_icon
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
+
+from bec_widgets.qt_utils.error_popups import SafeSlot
+from bec_widgets.utils.bec_widget import BECWidget
+
+
+class StopButton(BECWidget, QWidget):
+    """A button that stops the current scan."""
+
+    ICON_NAME = "dangerous"
+
+    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QWidget.__init__(self, parent=parent)
+
+        self.get_bec_shortcuts()
+
+        self.layout = QHBoxLayout(self)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
+
+        if toolbar:
+            icon = material_icon(
+                "stop", size=(20, 20), color="#cc181e", filled=True, convert_to_pixmap=False
+            )
+            self.button = QToolButton(icon=icon)
+            self.button.triggered.connect(self.stop_scan)
+        else:
+            self.button = QPushButton()
+            self.button.setText("Stop")
+            self.button.setStyleSheet(
+                "background-color:  #cc181e; color: white; font-weight: bold; font-size: 12px;"
+            )
+            self.button.clicked.connect(self.stop_scan)
+
+        self.layout.addWidget(self.button)
+
+    @SafeSlot()
+    def stop_scan(self):
+        """Stop the scan."""
+        self.queue.request_scan_halt()

{bec_widgets-0.99.9 → bec_widgets-0.99.10}/pyproject.toml

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

bec_widgets-0.99.9/bec_widgets/widgets/stop_button/stop_button.py

@@ -1,27 +0,0 @@
-from qtpy.QtWidgets import QPushButton
-
-from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
-from bec_widgets.utils.bec_widget import BECWidget
-
-
-class StopButton(BECWidget, QPushButton):
-    """A button that stops the current scan."""
-
-    ICON_NAME = "dangerous"
-
-    def __init__(self, parent=None, client=None, config=None, gui_id=None):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QPushButton.__init__(self, parent=parent)
-
-        self.get_bec_shortcuts()
-        self.setText("Stop")
-        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()