bec-widgets 1.12.0__py3-none-any.whl → 1.14.0__py3-none-any.whl

PKG-INFO

@@ -1,9 +1,10 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: bec_widgets
-Version: 1.12.0
+Version: 1.14.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
+License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
@@ -21,7 +22,7 @@ Requires-Dist: qtpy~=2.4
 Provides-Extra: dev
 Requires-Dist: coverage~=7.0; extra == 'dev'
 Requires-Dist: fakeredis>=2.23.2,~=2.23; extra == 'dev'
-Requires-Dist: pytest-bec-e2e~=2.16; extra == 'dev'
+Requires-Dist: pytest-bec-e2e<=4.0,>=2.21.4; extra == 'dev'
 Requires-Dist: pytest-qt~=4.4; extra == 'dev'
 Requires-Dist: pytest-random-order~=1.1; extra == 'dev'
 Requires-Dist: pytest-timeout~=2.2; extra == 'dev'

bec_widgets/cli/auto_updates.py

@@ -27,25 +27,17 @@ class AutoUpdates:
 
     def __init__(self, gui: BECDockArea):
         self.gui = gui
-        self.msg_queue = Queue()
-        self.auto_update_thread = None
-        self._shutdown_sentinel = object()
-        self.start()
-
-    def start(self):
-        """
-        Start the auto update thread.
-        """
-        self.auto_update_thread = threading.Thread(target=self.process_queue)
-        self.auto_update_thread.start()
+        self._default_dock = None
+        self._default_fig = None
 
     def start_default_dock(self):
         """
         Create a default dock for the auto updates.
         """
-        dock = self.gui.add_dock("default_figure")
-        dock.add_widget("BECFigure")
         self.dock_name = "default_figure"
+        self._default_dock = self.gui.add_dock(self.dock_name)
+        self._default_dock.add_widget("BECFigure")
+        self._default_fig = self._default_dock.widget_list[0]
 
     @staticmethod
     def get_scan_info(msg) -> ScanInfo:
@@ -73,15 +65,9 @@ class AutoUpdates:
         """
         Get the default figure from the GUI.
         """
-        dock = self.gui.panels.get(self.dock_name, [])
-        if not dock:
-            return None
-        widgets = dock.widget_list
-        if not widgets:
-            return None
-        return widgets[0]
+        return self._default_fig
 
-    def run(self, msg):
+    def do_update(self, msg):
         """
         Run the update function if enabled.
         """
@@ -90,20 +76,9 @@ class AutoUpdates:
         if msg.status != "open":
             return
         info = self.get_scan_info(msg)
-        self.handler(info)
-
-    def process_queue(self):
-        """
-        Process the message queue.
-        """
-        while True:
-            msg = self.msg_queue.get()
-            if msg is self._shutdown_sentinel:
-                break
-            self.run(msg)
+        return self.handler(info)
 
-    @staticmethod
-    def get_selected_device(monitored_devices, selected_device):
+    def get_selected_device(self, monitored_devices, selected_device):
         """
         Get the selected device for the plot. If no device is selected, the first
         device in the monitored devices list is selected.
@@ -120,14 +95,11 @@ class AutoUpdates:
         Default update function.
         """
         if info.scan_name == "line_scan" and info.scan_report_devices:
-            self.simple_line_scan(info)
-            return
+            return self.simple_line_scan(info)
         if info.scan_name == "grid_scan" and info.scan_report_devices:
-            self.simple_grid_scan(info)
-            return
+            return self.simple_grid_scan(info)
         if info.scan_report_devices:
-            self.best_effort(info)
-            return
+            return self.best_effort(info)
 
     def simple_line_scan(self, info: ScanInfo) -> None:
         """
@@ -137,12 +109,19 @@ class AutoUpdates:
         if not fig:
             return
         dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        selected_device = yield self.gui.selected_device
+        dev_y = self.get_selected_device(info.monitored_devices, selected_device)
         if not dev_y:
             return
-        fig.clear_all()
-        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+        yield fig.clear_all()
+        yield fig.plot(
+            x_name=dev_x,
+            y_name=dev_y,
+            label=f"Scan {info.scan_number} - {dev_y}",
+            title=f"Scan {info.scan_number}",
+            x_label=dev_x,
+            y_label=dev_y,
+        )
 
     def simple_grid_scan(self, info: ScanInfo) -> None:
         """
@@ -153,12 +132,18 @@ class AutoUpdates:
             return
         dev_x = info.scan_report_devices[0]
         dev_y = info.scan_report_devices[1]
-        dev_z = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
-        fig.clear_all()
-        plt = fig.plot(
-            x_name=dev_x, y_name=dev_y, z_name=dev_z, label=f"Scan {info.scan_number} - {dev_z}"
+        selected_device = yield self.gui.selected_device
+        dev_z = self.get_selected_device(info.monitored_devices, selected_device)
+        yield fig.clear_all()
+        yield fig.plot(
+            x_name=dev_x,
+            y_name=dev_y,
+            z_name=dev_z,
+            label=f"Scan {info.scan_number} - {dev_z}",
+            title=f"Scan {info.scan_number}",
+            x_label=dev_x,
+            y_label=dev_y,
         )
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
 
     def best_effort(self, info: ScanInfo) -> None:
         """
@@ -168,17 +153,16 @@ class AutoUpdates:
         if not fig:
             return
         dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        selected_device = yield self.gui.selected_device
+        dev_y = self.get_selected_device(info.monitored_devices, selected_device)
         if not dev_y:
             return
-        fig.clear_all()
-        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
-        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
-
-    def shutdown(self):
-        """
-        Shutdown the auto update thread.
-        """
-        self.msg_queue.put(self._shutdown_sentinel)
-        if self.auto_update_thread:
-            self.auto_update_thread.join()
+        yield fig.clear_all()
+        yield fig.plot(
+            x_name=dev_x,
+            y_name=dev_y,
+            label=f"Scan {info.scan_number} - {dev_y}",
+            title=f"Scan {info.scan_number}",
+            x_label=dev_x,
+            y_label=dev_y,
+        )

bec_widgets/cli/client.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import enum
 from typing import Literal, Optional, overload
 
-from bec_widgets.cli.client_utils import BECGuiClientMixin, RPCBase, rpc_call
+from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call
 
 # pylint: skip-file
 
@@ -31,6 +31,7 @@ class Widgets(str, enum.Enum):
     DeviceComboBox = "DeviceComboBox"
     DeviceLineEdit = "DeviceLineEdit"
     LMFitDialog = "LMFitDialog"
+    Minesweeper = "Minesweeper"
     PositionIndicator = "PositionIndicator"
     PositionerBox = "PositionerBox"
     PositionerControlLine = "PositionerControlLine"
@@ -342,7 +343,7 @@ class BECDock(RPCBase):
         """
 
 
-class BECDockArea(RPCBase, BECGuiClientMixin):
+class BECDockArea(RPCBase):
     @property
     @rpc_call
     def _config_dict(self) -> "dict":
@@ -353,6 +354,13 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
             dict: The configuration of the widget.
         """
 
+    @property
+    @rpc_call
+    def selected_device(self) -> "str":
+        """
+        None
+        """
+
     @property
     @rpc_call
     def panels(self) -> "dict[str, BECDock]":
@@ -480,6 +488,12 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
         Hide all windows including floating docks.
         """
 
+    @rpc_call
+    def delete(self):
+        """
+        None
+        """
+
 
 class BECFigure(RPCBase):
     @property
@@ -3168,6 +3182,9 @@ class LMFitDialog(RPCBase):
         """
 
 
+class Minesweeper(RPCBase): ...
+
+
 class PositionIndicator(RPCBase):
     @rpc_call
     def set_value(self, position: float):