bec-widgets 0.93.4__tar.gz → 0.93.5__tar.gz

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v0.93.5 (2024-08-08)
+
+### Fix
+
+* fix(positioner_box): icons fixed ([`281633d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/281633deff15b6879dac3a4f0770fa6949aaecdc))
+
+### Refactor
+
+* refactor: add button for positioner selection ([`0d190c5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0d190c5c5996e59fec4bdd44d2003e10e200b009))
+
+### Test
+
+* test(dap): wait for fit ([`6269009`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6269009e5451f830cdee58a514c7858483488a8d))
+
+* test(auto-update): wait for rendering ([`6d2442d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6d2442d23c683fe92af13df982ce681c07e99cde))
+
 ## v0.93.4 (2024-08-07)
 
 ### Fix
@@ -129,19 +145,3 @@ This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https:
 * fix(dock): custom label can be created closable ([`4457ef2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4457ef2147e21b856c9dcaf63c81ba98002dcaf1))
 
 * fix(device_combobox): set minimum size to 125px ([`1206e15`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1206e153094cd8505badf69a1461572a76b4c5ad))
-
-## v0.91.0 (2024-07-23)
-
-### Feature
-
-* feat(dock_area): plugin added ([`a16b87a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a16b87ac28d164230dd2e8020f50ff3a63cd407e))
-
-### Fix
-
-* fix(status_item): icons changed to material design ([`1b9c55a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b9c55a46a0dfd8678c8e95ff64dd6e8cfb9233e))
-
-* fix(plugins): Qt Designer plugins icons adjusted ([`f4844d2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f4844d2e067ce75dc64b89b230d7932b308ddfc2))
-
-### Test
-
-* test(dock_area): tests extended ([`06fab0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06fab0eab926cef5677d4988fd1fce09da342dd8))

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.93.4
+Version: 0.93.5
 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.93.5/bec_widgets/assets/toolbar_icons/device_line_edit.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#FFFFFF">
+    <path d="M180-404.87v-50.26h289.75v50.26H180Zm0-162.57v-50.25h454.62v50.25H180Zm0-162.3V-780h454.62v50.26H180ZM524.62-180v-105.69l217.15-216.16q7.46-7.07 16.11-10.3 8.65-3.23 17.3-3.23 9.43 0 18.25 3.53 8.82 3.54 16.03 10.62l37 37.38q6.87 7.47 10.21 16.16Q860-439 860-430.31t-3.37 17.69q-3.37 9-10.52 16.46L630.31-180H524.62Zm250.69-211.69 37-38.62-37-37.38-38 38 38 38Z"/>
+</svg>

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/bec_widgets/widgets/positioner_box/positioner_box.py

@@ -7,16 +7,19 @@ from bec_lib.device import Positioner
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.messages import ScanQueueMessage
-from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtGui import QDoubleValidator
-from qtpy.QtWidgets import QDoubleSpinBox, QVBoxLayout, QWidget
+from qtpy.QtCore import Property, QSize, Signal, Slot
+from qtpy.QtGui import QDoubleValidator, QIcon
+from qtpy.QtWidgets import QDialog, QDoubleSpinBox, QPushButton, QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 logger = bec_logger.logger
 
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
 
 class PositionerBox(BECWidget, QWidget):
     """Simple Widget to control a positioner in box form"""
@@ -71,6 +74,36 @@ class PositionerBox(BECWidget, QWidget):
         self.setpoint_validator = QDoubleValidator()
         self.ui.setpoint.setValidator(self.setpoint_validator)
         self.ui.spinner_widget.start()
+        self.ui.tool_button.clicked.connect(self._open_dialog_selection)
+        icon = QIcon()
+        icon.addFile(
+            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "device_line_edit.svg"),
+            size=QSize(16, 16),
+        )
+        self.ui.tool_button.setIcon(icon)
+
+    def _open_dialog_selection(self):
+        """Open dialog window for positioner selection"""
+        dialog = QDialog(self)
+        dialog.setWindowTitle("Positioner Selection")
+        layout = QVBoxLayout()
+        line_edit = DeviceLineEdit(self, client=self.client, device_filter="Positioner")
+        line_edit.textChanged.connect(self._positioner_changed)
+        layout.addWidget(line_edit)
+        close_button = QPushButton("Close")
+        close_button.clicked.connect(dialog.accept)
+        layout.addWidget(close_button)
+        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"""
@@ -267,7 +300,7 @@ if __name__ == "__main__":  # pragma: no cover
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    apply_theme("light")
+    apply_theme("dark")
     widget = PositionerBox(device="bpm4i")
 
     widget.show()

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/bec_widgets/widgets/positioner_box/positioner_box.ui

@@ -78,6 +78,9 @@
         <property name="enabled">
          <bool>false</bool>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
        </widget>
       </item>
       <item row="3" column="0">
@@ -125,6 +128,13 @@
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="tool_button">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/bec_widgets/widgets/positioner_box/positioner_box_plugin.py

@@ -1,6 +1,8 @@
 # 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
 
@@ -12,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -27,10 +30,11 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "Device Control"
 
     def icon(self):
-        return QIcon()
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "positioner_box.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "positioner_box"

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/pyproject.toml

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

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -9,6 +9,10 @@ from bec_widgets.cli.auto_updates import AutoUpdates
 from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
 from bec_widgets.utils import Colors
 
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-locals
+
 
 def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     # BEC client shortcuts
@@ -227,13 +231,20 @@ def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
     assert bar_config["rings"][1]["max_value"] == final_samy
 
 
-def test_auto_update(bec_client_lib, rpc_server_dock):
+def test_auto_update(bec_client_lib, rpc_server_dock, qtbot):
     dock = BECDockArea(rpc_server_dock)
 
     AutoUpdates.enabled = True
     AutoUpdates.create_default_dock = True
     dock.auto_updates = AutoUpdates(gui=dock)
     dock.auto_updates.start_default_dock()
+
+    def get_default_figure():
+        return dock.auto_updates.get_default_figure()
+
+    qtbot.waitUntil(lambda: get_default_figure() is not None, timeout=10000)
+    plt = get_default_figure()
+
     dock.selected_device = "bpm4i"
 
     # we need to start the update script manually; normally this is done when the GUI is started
@@ -250,7 +261,6 @@ def test_auto_update(bec_client_lib, rpc_server_dock):
     last_scan_data = queue.scan_storage.storage[-1].data
 
     # get data from curves
-    plt = dock.auto_updates.get_default_figure()
     widgets = plt.widget_list
     plt_data = widgets[0].get_all_data()
 
@@ -271,6 +281,7 @@ def test_auto_update(bec_client_lib, rpc_server_dock):
 
     plt = dock.auto_updates.get_default_figure()
     widgets = plt.widget_list
+    qtbot.waitUntil(lambda: len(plt.widget_list) > 0, timeout=5000)
     plt_data = widgets[0].get_all_data()
 
     last_scan_data = queue.scan_storage.storage[-1].data

{bec_widgets-0.93.4 → bec_widgets-0.93.5}/tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -158,7 +158,7 @@ def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
     )
 
 
-def test_dap_rpc(rpc_server_figure, bec_client_lib):
+def test_dap_rpc(rpc_server_figure, bec_client_lib, qtbot):
 
     fig = BECFigure(rpc_server_figure)
     plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
@@ -178,13 +178,15 @@ def test_dap_rpc(rpc_server_figure, bec_client_lib):
     res = scans.line_scan(dev.samx, 0, 8, steps=50, relative=False)
     res.wait()
 
-    time.sleep(2)
+    # especially on slow machines, the fit might not be done yet
+    # so we wait until the fit reaches the expected value
+    def wait_for_fit():
+        dap_curve = plt.get_curve("bpm4i-bpm4i-GaussianModel")
+        fit_params = dap_curve.dap_params
+        print(fit_params)
+        return np.isclose(fit_params["center"], 5, atol=0.5)
 
-    dap_curve = plt.get_curve("bpm4i-bpm4i-GaussianModel")
-    fit_params = dap_curve.dap_params
-    print(fit_params)
-
-    assert np.isclose(fit_params["center"], 5, atol=0.5)
+    qtbot.waitUntil(wait_for_fit, timeout=10000)
 
 
 def test_removing_subplots(rpc_server_figure, bec_client_lib):