bec-widgets 0.92.0__py3-none-any.whl → 0.92.1__py3-none-any.whl

.gitlab-ci.yml

@@ -43,13 +43,20 @@ stages:
   - export QTWEBENGINE_DISABLE_SANDBOX=1
 
 .clone-repos: &clone-repos
+  - echo -e "\033[35;1m Using branch $BEC_CORE_BRANCH of BEC CORE \033[0;m";
   - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+  - echo -e "\033[35;1m Using branch $OPHYD_DEVICES_BRANCH of OPHYD_DEVICES \033[0;m";
   - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
   - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
 
+.install-repos: &install-repos
+  - pip install -e ./ophyd_devices
+  - pip install -e ./bec/bec_lib[dev]
+  - pip install -e ./bec/bec_ipython_client
+
 .install-os-packages: &install-os-packages
   - apt-get update
-  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
   - *install-qt-webengine-deps
 
 before_script:
@@ -131,8 +138,7 @@ tests:
   script:
     - *clone-repos
     - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *install-repos
     - pip install -e .[dev,pyqt6]
     - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
     - coverage report
@@ -169,8 +175,7 @@ test-matrix:
   script:
     - *clone-repos
     - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *install-repos
     - pip install -e .[dev,$QT_PCKG]
     - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
   allow_failure: true
@@ -195,10 +200,9 @@ end-2-end-conda:
 
     - cd ./bec
     - source ./bin/install_bec_dev.sh -t
-
-    - pip install -e ./bec_lib[dev]
-    - pip install -e ./bec_ipython_client[dev]
     - cd ../
+    - pip install -e ./ophyd_devices
+
     - pip install -e .[dev,pyqt6]
     - cd ./tests/end-2-end
     - pytest -v --start-servers --flush-redis --random-order

CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## v0.92.1 (2024-07-28)
+
+### Build
+
+* build(ci): install ophyd_devices in editable mode for pipelines ([`06205e0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06205e07903d93accf40abab153f440059f236ed))
+
+### Fix
+
+* fix: use SafeSlot instead of Slot ([`bc1e239`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc1e23944cc0e5a861e3d0b4dc5b4ac6292d5269))
+
+* fix: linting ([`a3fe205`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3fe20500ae2ac03dcde07432f7e21ce5262ce46))
+
+* fix: always add a QApplication for tests ([`61a4e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61a4e32deb337ed27f2f43358b88b7266413b58e))
+
+* fix: add xvfb to draw offscreen ([`3d681f7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d681f77e144e74138fc5fa65630004d7c166878))
+
+* fix: reset ErrorPopup singleton between tests ([`5a9ccfd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5a9ccfd1f6d2aacd5d86c1a34f74163b272d1ae4))
+
+* fix: metaclass + QObject segfaults PyQt(cpp bindings) ([`fc57b7a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc57b7a1262031a2df9e6a99493db87e766b779a))
+
+### Refactor
+
+* refactor: renamed DeviceMonitor2DMessage ([`4be6fd6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be6fd6b83ea1048f16310f7d2bbe777b13b245e))
+
+* refactor: rename device_monitor to device_monitor_2d ([`714e1e1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/714e1e139e0033d2725fefb636c419ca137a68c6))
+
 ## v0.92.0 (2024-07-24)
 
 ### Feature
@@ -102,18 +128,6 @@ This reverts commit 3798714369adf4023f833b7749d2f46a0ec74eee ([`fd6ae91`](https:
 
 * feat(waveform_widget): dap parameter window ([`1e551d6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1e551d6e9696f79ea2e0a179d13a4fc6c2a128b2))
 
-* feat(waveform): export to matplotlib window of current scene ([`8d93405`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d9340539967b06b1e15f21a2106a39d5c740f31))
-
-* feat(figure): export dialog can be launched from CLI and from toolbar ([`6ff6111`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ff611109153b9412dce37c527b19e839d99bba7))
-
-* feat(waveform_widget): added error handle utility ([`a8ff1d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8ff1d4cd09cae5eaeb4bd0ea90fdd102e32f3a3))
-
-* feat(curve_dialog): add DAP functionality ([`e830565`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e8305652fde384da037242cf8f7e3606f22bcfb6))
-
-* feat(curve_dialog): curves can be added ([`c926a75`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c926a75a7927d672c044ea8f68771209ae5accc6))
-
-* feat(waveform_widget): BECWaveformWidget toolbar added import/export config ([`fa9b171`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fa9b17191ddbb4043a658dae9aa0801e1dc22b84))
-
 ### Fix
 
 * fix(waveform_widget): plot API unified with BECFigure ([`2c8764a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2c8764a27de89b39b717032b58465e120ec57fbc))
@@ -126,22 +140,6 @@ This reverts commit 3798714369adf4023f833b7749d2f46a0ec74eee ([`fd6ae91`](https:
 
 * fix(waveform_widget): use @SafeSlot decorator for automatic error message ([`8e588d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8e588d79c86e950f6915e89c08fa9415c4bd8033))
 
-* fix(waveform): colormaps of curves can be changed and normalised
-
-feat(waveform): colormap can be changed from curve dialog
-
-fix(curve_dialog): default dialog parameters fixed
-
-curve Dialog colormap WIP ([`33495cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/33495cfe03b363f18db61d8af2983f49027b7a43))
-
-* fix(waveform_widget): adapted for changes from improved scan logic from waveform widget ([`8ac35d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ac35d7280b1ff007c10612228d163cc0c5d1a99))
-
-### Refactor
-
-* refactor(icons): icons moved to the assets directory ([`a8b6ef2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8b6ef20cccae87515b10f054d0ed5b10e152769))
-
-* refactor(waveform_widget): removed PYSIDE6 check ([`47fcb9e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/47fcb9ebfe35ae600cced95a1edc68f6f6e37a04))
-
 ### Test
 
 * test(waveform_widget): test added ([`8d764e2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d764e2d46a1e017dadc3c4630648c1ca708afc2))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.92.0
+Version: 0.92.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/examples/plugin_example_pyside/tictactoetaskmenu.py

@@ -1,12 +1,13 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtCore import Slot
 from qtpy.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
 from qtpy.QtGui import QAction
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 from tictactoe import TicTacToe
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 
 class TicTacToeDialog(QDialog):  # pragma: no cover
     def __init__(self, parent):

bec_widgets/qt_utils/error_popups.py

@@ -6,7 +6,7 @@ from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget
 
 
-def SafeSlot(*slot_args, **slot_kwargs):
+def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
     """Function with args, acting like a decorator, applying "error_managed" decorator + Qt Slot
     to the passed function, to display errors instead of potentially raising an exception
 
@@ -34,10 +34,7 @@ class WarningPopupUtility(QObject):
     Utility class to show warning popups in the application.
     """
 
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-    @Slot(str, str, str, QWidget)
+    @SafeSlot(str, str, str, QWidget)
     def show_warning_message(self, title, message, detailed_text, widget):
         msg = QMessageBox(widget)
         msg.setIcon(QMessageBox.Warning)
@@ -60,7 +57,10 @@ class WarningPopupUtility(QObject):
         self.show_warning_message(title, message, detailed_text, widget)
 
 
-class ErrorPopupUtility(QObject):
+_popup_utility_instance = None
+
+
+class _ErrorPopupUtility(QObject):
     """
     Utility class to manage error popups in the application to show error messages to the users.
     This class is singleton and the error popup can be enabled or disabled globally or attach to widget methods with decorator @error_managed.
@@ -68,24 +68,14 @@ class ErrorPopupUtility(QObject):
 
     error_occurred = Signal(str, str, QWidget)
 
-    _instance = None
-    _initialized = False
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(ErrorPopupUtility, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
     def __init__(self, parent=None):
-        if not self._initialized:
-            super().__init__(parent=parent)
-            self.error_occurred.connect(self.show_error_message)
-            self.enable_error_popup = False
-            self._initialized = True
-            sys.excepthook = self.custom_exception_hook
-
-    @Slot(str, str, QWidget)
+        super().__init__(parent=parent)
+        self.error_occurred.connect(self.show_error_message)
+        self.enable_error_popup = False
+        self._initialized = True
+        sys.excepthook = self.custom_exception_hook
+
+    @SafeSlot(str, str, QWidget)
     def show_error_message(self, title, message, widget):
         detailed_text = self.format_traceback(message)
         error_message = self.parse_error_message(detailed_text)
@@ -157,13 +147,12 @@ class ErrorPopupUtility(QObject):
         """
         self.enable_error_popup = bool(state)
 
-    @classmethod
-    def reset_singleton(cls):
-        """
-        Reset the singleton instance.
-        """
-        cls._instance = None
-        cls._initialized = False
+
+def ErrorPopupUtility():
+    global _popup_utility_instance
+    if not _popup_utility_instance:
+        _popup_utility_instance = _ErrorPopupUtility()
+    return _popup_utility_instance
 
 
 class ExampleWidget(QWidget):  # pragma: no cover

bec_widgets/qt_utils/settings_dialog.py

@@ -1,6 +1,7 @@
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 
 class SettingWidget(QWidget):
     """

bec_widgets/utils/bec_connector.py

@@ -10,11 +10,11 @@ import yaml
 from bec_lib.utils.import_utils import lazy_import_from
 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication
 
 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
+from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))

bec_widgets/widgets/console/console.py

@@ -18,10 +18,11 @@ import pyte
 from qtpy import QtCore, QtGui, QtWidgets
 from qtpy.QtCore import QSize, QSocketNotifier, Qt
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QClipboard, QTextCursor
 from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 ansi_colors = {
     "black": "#000000",
     "red": "#CD0000",
@@ -289,7 +290,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
         old["value"] = value
         self.dataReady(self.backend.screen, reset_scroll=False)
 
-    @pyqtSlot(object)
+    @Slot(object)
     def keyPressEvent(self, event):
         """
         Redirect all keystrokes to the terminal process.

bec_widgets/widgets/figure/figure.py

@@ -164,7 +164,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
     def __getitem__(self, key: tuple | str):
         if isinstance(key, tuple) and len(key) == 2:
             return self.axes(*key)
-        elif isinstance(key, str):
+        if isinstance(key, str):
             widget = self._widgets.get(key)
             if widget is None:
                 raise KeyError(f"No widget with ID {key}")
@@ -185,7 +185,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         self.change_theme(self.config.theme)
 
         # widget_config has to be reset for not have each widget config twice when added to the figure
-        widget_configs = [config for config in self.config.widgets.values()]
+        widget_configs = list(self.config.widgets.values())
         self.config.widgets = {}
         for widget_config in widget_configs:
             getattr(self, self.widget_method_map[widget_config.widget_class])(
@@ -233,8 +233,8 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         """Export the plot widget."""
         try:
             plot_item = self.widget_list[0]
-        except:
-            raise ValueError("No plot widget available to export.")
+        except Exception as exc:
+            raise ValueError("No plot widget available to export.") from exc
 
         scene = plot_item.scene()
         scene.contextMenuItem = plot_item
@@ -529,12 +529,12 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         if row is not None and col is not None:
             if self.getItem(row, col):
                 raise ValueError(f"Position at row {row} and column {col} is already occupied.")
-            else:
-                widget.config.row = row
-                widget.config.col = col
 
-                # Add widget to the figure
-                self.addItem(widget, row=row, col=col)
+            widget.config.row = row
+            widget.config.col = col
+
+            # Add widget to the figure
+            self.addItem(widget, row=row, col=col)
         else:
             row, col = self._find_next_empty_position()
             widget.config.row = row
@@ -721,7 +721,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
 
         # Populate the new grid with widgets' IDs
         current_idx = 0
-        for widget_id, widget in self._widgets.items():
+        for widget_id in self._widgets:
             row = current_idx // len(new_grid[0])
             col = current_idx % len(new_grid[0])
             new_grid[row][col] = widget_id

bec_widgets/widgets/figure/plots/axis_settings.py

@@ -1,8 +1,8 @@
 import os
 
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO

bec_widgets/widgets/figure/plots/image/image.py

@@ -7,9 +7,9 @@ import numpy as np
 from bec_lib.endpoints import MessageEndpoints
 from pydantic import BaseModel, Field, ValidationError
 from qtpy.QtCore import QThread
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
 from bec_widgets.widgets.figure.plots.image.image_processor import (
@@ -247,7 +247,7 @@ class BECImageShow(BECPlotBase):
         Returns:
             BECImageItem: The image item.
         """
-        image_source = "device_monitor"
+        image_source = "device_monitor_2d"
 
         image_exits = self._check_image_id(monitor, self._images)
         if image_exits:
@@ -287,7 +287,7 @@ class BECImageShow(BECPlotBase):
         **kwargs,
     ):
         image_source = "custom"
-        # image_source = "device_monitor"
+        # image_source = "device_monitor_2d"
 
         image_exits = self._check_image_id(name, self._images)
         if image_exits:
@@ -500,7 +500,7 @@ class BECImageShow(BECPlotBase):
             self.update_image(device, data)
             self.update_vrange(device, self.processor.config.stats)
 
-    @pyqtSlot(dict)
+    @Slot(dict)
     def on_image_update(self, msg: dict):
         """
         Update the image of the device monitor from bec.
@@ -510,11 +510,11 @@ class BECImageShow(BECPlotBase):
         """
         data = msg["data"]
         device = msg["device"]
-        image = self._images["device_monitor"][device]
+        image = self._images["device_monitor_2d"][device]
         image.raw_data = data
         self.process_image(device, image, data)
 
-    @pyqtSlot(str, np.ndarray)
+    @Slot(str, np.ndarray)
     def update_image(self, device: str, data: np.ndarray):
         """
         Update the image of the device monitor.
@@ -523,10 +523,10 @@ class BECImageShow(BECPlotBase):
             device(str): The name of the device.
             data(np.ndarray): The data to be updated.
         """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
         image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)
 
-    @pyqtSlot(str, ImageStats)
+    @Slot(str, ImageStats)
     def update_vrange(self, device: str, stats: ImageStats):
         """
         Update the scaling of the image.
@@ -534,7 +534,7 @@ class BECImageShow(BECPlotBase):
         Args:
             stats(ImageStats): The statistics of the image.
         """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
         if image_to_update.config.autorange:
             image_to_update.auto_update_vrange(stats)
 
@@ -547,7 +547,7 @@ class BECImageShow(BECPlotBase):
                 data = image.raw_data
                 self.process_image(image_id, image, data)
 
-    def _connect_device_monitor(self, monitor: str):
+    def _connect_device_monitor_2d(self, monitor: str):
         """
         Connect to the device monitor.
 
@@ -561,13 +561,13 @@ class BECImageShow(BECPlotBase):
             previous_monitor = None
         if previous_monitor and image_item.connected is True:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(previous_monitor)
             )
             image_item.connected = False
         if monitor and image_item.connected is False:
             self.entry_validator.validate_monitor(monitor)
             self.bec_dispatcher.connect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
             )
             image_item.set_monitor(monitor)
             image_item.connected = True
@@ -581,8 +581,8 @@ class BECImageShow(BECPlotBase):
         if self.single_image is True and len(self.images) > 0:
             self.remove_image(0)
         self._images[source][name] = image
-        if source == "device_monitor":
-            self._connect_device_monitor(config.monitor)
+        if source == "device_monitor_2d":
+            self._connect_device_monitor_2d(config.monitor)
         self.config.images[name] = config
         if data is not None:
             image.setImage(data)
@@ -668,15 +668,15 @@ class BECImageShow(BECPlotBase):
         image = self.find_image_by_monitor(image_id)
         if image:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(image.config.monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(image.config.monitor)
             )
 
     def cleanup(self):
         """
         Clean up the widget.
         """
-        for monitor in self._images["device_monitor"]:
+        for monitor in self._images["device_monitor_2d"]:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
             )
         self.images.clear()

bec_widgets/widgets/figure/plots/motor_map/motor_map.py

@@ -10,9 +10,9 @@ from pydantic import Field, ValidationError, field_validator
 from pydantic_core import PydanticCustomError
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform import Signal, SignalData
@@ -444,7 +444,7 @@ class BECMotorMap(BECPlotBase):
             return None
 
     @Slot()
-    def _update_plot(self):
+    def _update_plot(self, _=None):
         """Update the motor map plot."""
         # If the number of points exceeds max_points, delete the oldest points
         if len(self.database_buffer["x"]) > self.config.max_points:

bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -11,9 +11,9 @@ from bec_lib.endpoints import MessageEndpoints
 from pydantic import Field, ValidationError, field_validator
 from pyqtgraph.exporters import MatplotlibExporter
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
@@ -391,7 +391,7 @@ class BECWaveform(BECPlotBase):
             self.async_signal_update.emit()
             self.scan_signal_update.emit()
 
-    @pyqtSlot()
+    @Slot()
     def auto_range(self):
         self.plot_item.autoRange()
 
@@ -408,7 +408,7 @@ class BECWaveform(BECPlotBase):
         """
         self.plot_item.enableAutoRange(axis, enabled)
 
-    @pyqtSlot()
+    @Slot()
     def auto_range(self):
         self.plot_item.autoRange()
 
@@ -642,7 +642,7 @@ class BECWaveform(BECPlotBase):
         self.refresh_dap()
         return curve
 
-    @pyqtSlot()
+    @Slot()
     def get_dap_params(self) -> dict:
         """
         Get the DAP parameters of all DAP curves.
@@ -655,7 +655,7 @@ class BECWaveform(BECPlotBase):
             params[curve_id] = curve.dap_params
         return params
 
-    @pyqtSlot()
+    @Slot()
     def get_dap_summary(self) -> dict:
         """
         Get the DAP summary of all DAP curves.
@@ -921,7 +921,7 @@ class BECWaveform(BECPlotBase):
         else:
             raise IndexError(f"Curve order {N} out of range.")
 
-    @pyqtSlot(dict)
+    @Slot(dict)
     def on_scan_status(self, msg):
         """
         Handle the scan status message.
@@ -945,7 +945,7 @@ class BECWaveform(BECPlotBase):
                 for curve_id, curve in self._curves_data["async"].items():
                     self.setup_async(curve.config.signals.y.name)
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def on_scan_segment(self, msg: dict, metadata: dict):
         """
         Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
@@ -1004,7 +1004,7 @@ class BECWaveform(BECPlotBase):
                 self.update_dap, MessageEndpoints.dap_response(f"{new_scan_id}-{self.gui_id}")
             )
 
-    @pyqtSlot(str)
+    @Slot(str)
     def setup_async(self, device: str):
         self.bec_dispatcher.disconnect_slot(
             self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, device)
@@ -1020,8 +1020,8 @@ class BECWaveform(BECPlotBase):
                 from_start=True,
             )
 
-    @pyqtSlot()
-    def refresh_dap(self):
+    @Slot()
+    def refresh_dap(self, _=None):
         """
         Refresh the DAP curves with the latest data from the DAP model MessageEndpoints.dap_response().
         """
@@ -1069,7 +1069,7 @@ class BECWaveform(BECPlotBase):
             )
             self.client.connector.set_and_publish(MessageEndpoints.dap_request(), msg)
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def update_dap(self, msg, metadata):
         self.msg = msg
         scan_id, x_name, x_entry, y_name, y_entry = msg["dap_request"].content["config"]["args"]
@@ -1089,7 +1089,7 @@ class BECWaveform(BECPlotBase):
                     self.dap_summary_update.emit(curve.dap_summary)
                 break
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def on_async_readback(self, msg, metadata):
         """
         Get async data readback.
@@ -1127,7 +1127,7 @@ class BECWaveform(BECPlotBase):
                         else:
                             curve.setData(data_plot)
 
-    @pyqtSlot()
+    @Slot()
     def replot_async_curve(self):
         try:
             data = self.scan_item.async_data
@@ -1152,8 +1152,8 @@ class BECWaveform(BECPlotBase):
             else:
                 curve.setData(data_x, data_y)
 
-    @pyqtSlot()
-    def _update_scan_curves(self):
+    @Slot()
+    def _update_scan_curves(self, _=None):
         """
         Update the scan curves with the data from the scan segment.
         """

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -1,8 +1,8 @@
 import os
 
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO

bec_widgets/widgets/stop_button/stop_button.py

@@ -1,6 +1,6 @@
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QPushButton
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils.bec_widget import BECWidget
 
 

bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py

@@ -1,8 +1,8 @@
 import os
 
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QDialog, QTreeWidgetItem, QVBoxLayout
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import UILoader
 
 

{bec_widgets-0.92.0.dist-info → bec_widgets-0.92.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.92.0
+Version: 0.92.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.92.0.dist-info → bec_widgets-0.92.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 .gitignore,sha256=cMQ1MLmnoR88aMCCJwUyfoTnufzl4-ckmHtlFUqHcT4,3253
-.gitlab-ci.yml,sha256=zvb4A6QI5lQTsdfI5nPPL-tUNfcrz__SQjxW03QZ5Ek,8204
+.gitlab-ci.yml,sha256=BtKhZI3dhK09En1BfpglYi-ZJwG6ZdC-iJr7kXFVfCg,8346
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=pacucbtN9ZWGj-nEtdxOQUgTWECb9jgd67zZTrIHj2M,7709
+CHANGELOG.md,sha256=-vNTquNVId-xmL688niPOZe0ChDNb_XkdXxmdcagWQY,7294
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=VnZc1usRRpdjc7CFNYGi63h-mkTI7pG7k1qirWunV4k,1308
+PKG-INFO,sha256=KBSOFzJA5iV_W_53ntYovfFeG4uPOv1SDfF-qCArFkY,1308
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=xcRdrwd813IfFf3F3mtUNLqlDSDwulmLOwRvUcVI2c0,2357
+pyproject.toml,sha256=qkEuEnhJGRrMzSer_iXKyN8Minb6n-OQp67Do3M2bGE,2357
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -100,13 +100,13 @@ bec_widgets/examples/plugin_example_pyside/registertictactoe.py,sha256=VNFkHc5Sc
 bec_widgets/examples/plugin_example_pyside/taskmenuextension.pyproject,sha256=O_PSMFJlXxQuf55gIOfkpfZIZGpX8W1SfUVZ-mvtI_E,119
 bec_widgets/examples/plugin_example_pyside/tictactoe.py,sha256=byR7mTiIXFaA9igPTH04pzm0yfikNB5KgISwvNiRPd8,4940
 bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py,sha256=tTCUKQX5BM4MTC2NSbbit3kf5CRBtJxTx7SqjA564rY,1918
-bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py,sha256=LNwplI6deUdKY6FOhUuWBanotxk9asF2G-6k7lFfA8Y,2301
+bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py,sha256=iU0L6HE3S19XQo-2rASyrJy5SyIJnTAnW_yHP6w4Jz4,2336
 bec_widgets/qt_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/qt_utils/error_popups.py,sha256=WAN3Qtccy9Yww29kZ3HbLt9VyipgrIamJ6y4PhGTe3I,7983
-bec_widgets/qt_utils/settings_dialog.py,sha256=rR_Zk4RGTnI4dz5OEzCc13lVpxlOKuwOf4_7wqXSbRw,3373
+bec_widgets/qt_utils/error_popups.py,sha256=y9gKKWaafp468ioHr96nBhf02ZpEgjDc-BAVOTWh-e8,7680
+bec_widgets/qt_utils/settings_dialog.py,sha256=8eGDV3XCYCUXLougnRM_k1JnYQVG23HfmjrbhRzlsRc,3408
 bec_widgets/qt_utils/toolbar.py,sha256=89WddOXPePby2CICUumdN_K_3DBgZPCR8HWUJAwrhDU,6503
 bec_widgets/utils/__init__.py,sha256=1930ji1Jj6dVuY81Wd2kYBhHYNV-2R0bN_L4o9zBj1U,533
-bec_widgets/utils/bec_connector.py,sha256=UK0GIWgcC_JTwgKCOmmuXnQvSwD3wiPsJQw6NBW3p74,9961
+bec_widgets/utils/bec_connector.py,sha256=SivHKXVyNVqeu3kCXYEPpbleTVw8g1cW0FKq1QrQgco,9987
 bec_widgets/utils/bec_designer.py,sha256=ak3G8FdojUPjVBBwdPXw7tN5P2Uxr-SSoQt394jXeAA,4308
 bec_widgets/utils/bec_dispatcher.py,sha256=fhI7_X0kSZCtXyR55Qn-w7BfNdk2Roc1Tyx0bx3bjoE,6195
 bec_widgets/utils/bec_table.py,sha256=nA2b8ukSeUfquFMAxGrUVOqdrzMoDYD6O_4EYbOG2zk,717
@@ -151,7 +151,7 @@ bec_widgets/widgets/colormap_selector/colormap_selector.py,sha256=4BqV11XMZVmcwz
 bec_widgets/widgets/colormap_selector/colormap_selector.pyproject,sha256=lHl9qmlMCB6BKB2orqctKwLcKK3Swc0THsyr-5O_vXM,35
 bec_widgets/widgets/colormap_selector/colormap_selector_plugin.py,sha256=NWTldO9XMyyOVL0No-Bmr-tvWrinmU7LkDxB5LkIQtA,1416
 bec_widgets/widgets/colormap_selector/register_colormap_selector.py,sha256=bfw7RWmTmMLTLxGT-izSwcGtxGLKvL3jdivJw2z8oN4,512
-bec_widgets/widgets/console/console.py,sha256=IW1OerycmS-cm8CKGFig44Qye8mxsmVcKvLHAc3lXco,17845
+bec_widgets/widgets/console/console.py,sha256=NG0cBuqqPX4hC-sHhk_UEkT-nHhhN9Y7karJITPLzyo,17864
 bec_widgets/widgets/device_box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/device_box/device_box.py,sha256=2hWCbDaBvYnWK4-HDqeYetzb5KR4DBk7UPQJMLhT4w0,6929
 bec_widgets/widgets/device_box/device_box.pyproject,sha256=jtwvhaySJRdnuV99mEZT3htmWKVLphFeetEW4al7s-o,28
@@ -175,19 +175,19 @@ bec_widgets/widgets/dock/dock_area.pyproject,sha256=URW0UrDXCnkzk80rbQmUMgF6Uqay
 bec_widgets/widgets/dock/dock_area_plugin.py,sha256=oG2zDxUA1YLvSBoFVeFVkz4HIWLruAwOsCZ00H2Z70A,1345
 bec_widgets/widgets/dock/register_dock_area.py,sha256=Yqd1mq6CcHwlxHZxX5EHKONy4P44nMm8pso-4X0tvJI,464
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
-bec_widgets/widgets/figure/figure.py,sha256=ei--FpbgRgqlx_G6wrWitr1DAnSzu8dcxUi-xyn7YFk,28726
+bec_widgets/widgets/figure/figure.py,sha256=6bYpsYQ2udJy_51mmpM6zKlOIsf_lxlKF31coXGUA0I,28684
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/axis_settings.py,sha256=_z20SrMu5iRM0eqhQjsCV1MDOY80hN2dqtvkeofXs0w,3510
+bec_widgets/widgets/figure/plots/axis_settings.py,sha256=QxRpQwgfBr1H0HTjfOpiXi_-n8I0BaZhS8LRXNeVfFg,3544
 bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=a2qIuK9lyi9HCyrSvPr6wxzmm1FymaWcpmyOhMIiFt8,11013
 bec_widgets/widgets/figure/plots/plot_base.py,sha256=AxzH2J-bLngxlWcgWWgNpLhIQxQzFz-H6yLf5Dou93Y,10921
 bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/image/image.py,sha256=xxowHo9LctrX3BQoVo9hWvj9FjALa0FIicFF39zZ3B8,24334
+bec_widgets/widgets/figure/plots/image/image.py,sha256=PCuZyTpPvIgfbAzOydV0op_GM3a8hXZoAw2Ux5z4ymA,24383
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=RljjbkqJEr2cKDlqj1j5GQ1h89jpqOV-OpFz1TbED8I,10937
 bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejMwPGQgM-o3d6bmLglCjdoktu19xfA,5262
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=IjCwVNb9DlujIDF9rlI7fOAM7udKpt0wL5hAGo2-MUw,18202
+bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=uZKWtXcK9MU-_PleN1xKIyTCUuCHrkbqtbY9sVMgDlw,18244
 bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=HRU3d6nhr6DnfDc2N4VTTSABk9veTnnsBOnfc1UbamQ,51720
+bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=EjKwD_pOhZYmXU2M_LdIv9A9cbVYxR1Y9lH0tbMNuJE,51710
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=ZwRxSfPHbMWEvgUC-mL2orpZvtxR-DcrYAFikkdWEzk,8654
 bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
@@ -202,7 +202,7 @@ bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=V6iN82E8Za8B
 bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=URcysThbJKGsCZUqQm2lCtVn5FG8t4kT7DaN5EJUexg,7555
 bec_widgets/widgets/motor_map/register_bec_motor_map_widget.py,sha256=qRG8PtWGjso0pWbvj_DXKnbUfmQzfGqPSrnAozXfM7o,492
 bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=terJ5NHRzAsiUwdqg-hTbkQ5gadnRT0Ol0_Fm66kPF4,2011
+bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=6mqprDyIwd09swpEpDRg9jwCJtR9MNCXW_Mx2nunCN8,2045
 bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.ui,sha256=nv5vPftt6vcIl60OOZLRvwD29rdHVWOoGmz168BnwKw,2685
 bec_widgets/widgets/position_indicator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/position_indicator/position_indicator.py,sha256=QVlWvs_RvEJe5IMxGYCpi-CXYF7vFeMqEMFCs6u5NGc,2020
@@ -228,7 +228,7 @@ bec_widgets/widgets/spinner/spinner_widget.pyproject,sha256=zzLajGB3DTgVnrSqMey2
 bec_widgets/widgets/spinner/spinner_widget_plugin.py,sha256=22b3n0ZGBDI44_cd72Q8ts_iKA3X1i1GhAQ80N2SGtU,1376
 bec_widgets/widgets/stop_button/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/stop_button/register_stop_button.py,sha256=U7r3fEOH-uPhAQI-nTituHXDDXDWR4JQZ7_vD6b_dfM,471
-bec_widgets/widgets/stop_button/stop_button.py,sha256=_2vNytWjf-pKqyv5wT8j5NSA_4z9Zyk4aBnkEvU8_dA,798
+bec_widgets/widgets/stop_button/stop_button.py,sha256=XLrRFvVrAhD16_-SPgzvsUhy0ROunsrWlI5BPRyqZOI,832
 bec_widgets/widgets/stop_button/stop_button.pyproject,sha256=Cc_xbv-zfzNVpsdg_1QyzuTlrJaM9_BkIjes70umrx0,29
 bec_widgets/widgets/stop_button/stop_button_plugin.py,sha256=PgMuMDuw5Fhfg89akNrIBTKl9ibVcgxg5wuI9cvQ9cc,1384
 bec_widgets/widgets/text_box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -257,7 +257,7 @@ bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.ui,sha256=OaQE5HlyBQ3RQoHqxOFHiUoNcx8SDZP5sHJ9NNGhsPI,10404
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary.ui,sha256=PFEKro61UXd-jmx65U4pqJ5D29DXtVnhQRnsnDvN-wM,6138
-bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=a5n_gBebETdj80TU7Dgy1cnazPFyxLlWk_lRdvy3qA4,2403
+bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=UptWjHRVp7gTAMkWikfia3U6k8EV_pAvk-fI_vhWd2w,2437
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEAiDjaUS_l7JroYVdsotnLpD9H0,476
 bec_widgets/widgets/website/website.py,sha256=FmhVaasAU3ZSdKP-HHSnJHFbG8lIsNAPH9pZq55fhic,1731
@@ -314,8 +314,8 @@ docs/user/widgets/widgets.md,sha256=ZeRNmP7GUOu8kEoGu9XHsyF8Hb1foqZKEbwpgFP7ITk,
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/end-2-end/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/end-2-end/conftest.py,sha256=-BLnFE-NeCerf6xahGCkbZ4Ktactowi6RkBnboIzRvg,1767
-tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=uDhauuLEWg9Baf3N1KSeq6HPUWtuU6a90wnh1fNGVqM,9115
-tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=mjg29huqTivLnukG_XyoMtjOy2P_7JACIhMEzahLXb8,6601
+tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=hj06aUBGofq7yeFVoT3LB4NrCjc5FbOo5CGTvz7afpI,9118
+tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=73vuBbPJvkMR3w2jnQ7lk0z4-wN3HAmkLFDdv4BRPrM,6604
 tests/end-2-end/test_rpc_register_e2e.py,sha256=blhMiW7HVHX1kGm5dg8Sv0PeCuJ0gnBz3evznQFz_B8,1619
 tests/end-2-end/test_scan_control_e2e.py,sha256=u7oLgFyltkMW2apSZKDukMIXvYrbhHrU32p4mBdn8VE,2276
 tests/references/SpinnerWidget/SpinnerWidget_darwin.png,sha256=OyiGxyQx0XCKEa1OeAZFVfFXHAllBDOjsvyTA_dDmoc,8353
@@ -324,12 +324,12 @@ tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png,sha256=NA7dOdKY-
 tests/references/SpinnerWidget/SpinnerWidget_started_linux.png,sha256=NA7dOdKY-leFv8JI_5x3OIIY-XlSXSTIflVquz0UUZc,13784
 tests/unit_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/client_mocks.py,sha256=4pS4KvvFGY9hjphds9i-GoIjVWVkax4XpDnVp6Mctfw,5275
-tests/unit_tests/conftest.py,sha256=KrnktXPWmZhnKNue-xGWOLD1XGEvdz9Vf7V2eO3XQ3A,596
-tests/unit_tests/test_bec_connector.py,sha256=zGDfNHwLFZTbpyX6-yc7Pwzr2jWO_HGZ8T4NFCNo4IE,2444
+tests/unit_tests/conftest.py,sha256=WsmfK1vOpF4msRHU6s5H8G0k8nf7cPJtazKlDjm-WRw,881
+tests/unit_tests/test_bec_connector.py,sha256=5uqBfjgMeOlGvqJlFbytxEpZ1El7_Y2q8fZHh4GvtD8,2478
 tests/unit_tests/test_bec_dispatcher.py,sha256=rYPiRizHaswhGZw55IBMneDFxmPiCCLAZQBqjEkpdyY,3992
 tests/unit_tests/test_bec_dock.py,sha256=j52o5ZhGzcSJ2VTtRPjVf9ZpQTdMLO4w-eXc6GB2c90,5593
 tests/unit_tests/test_bec_figure.py,sha256=8AojxszCIzMi6EYB5mVFMQjk4pjgBCSp6PH2JZsuDkw,8724
-tests/unit_tests/test_bec_image.py,sha256=mjvcrHgOF_FCj6WbUyxvZH9HL63QGA5C0PNZ5dXYn50,2541
+tests/unit_tests/test_bec_image.py,sha256=JqRKT-fdugmST80P0xSgMp6x_ukK-aLpezahPCWb3fA,2547
 tests/unit_tests/test_bec_image_widget.py,sha256=4-fdbsJsPuzJs8EFw9C1llcF4Zmv3vzJcA9t34J0WD4,7478
 tests/unit_tests/test_bec_motor_map.py,sha256=dSYopbZS8lGD9cB26Kwmqw5zBoKCZs8t7DEEr50ug-g,8532
 tests/unit_tests/test_bec_queue.py,sha256=u-uc-iZeGAS8P90o6Cxy5oz_60zHpirGAu04OgQPDXw,4598
@@ -369,8 +369,8 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.92.0.dist-info/METADATA,sha256=VnZc1usRRpdjc7CFNYGi63h-mkTI7pG7k1qirWunV4k,1308
-bec_widgets-0.92.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.92.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.92.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.92.0.dist-info/RECORD,,
+bec_widgets-0.92.1.dist-info/METADATA,sha256=KBSOFzJA5iV_W_53ntYovfFeG4uPOv1SDfF-qCArFkY,1308
+bec_widgets-0.92.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.92.1.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.92.1.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.92.1.dist-info/RECORD,,

pyproject.toml

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

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -98,7 +98,7 @@ def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     assert plt_data["bpm4i-bpm4i"]["y"] == plt_last_scan_data["bpm4i"]["bpm4i"].val
 
     # image
-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
+    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor_2d("eiger"))[
         "data"
     ].data
     time.sleep(0.5)

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -120,7 +120,7 @@ def test_rpc_image(rpc_server_figure, bec_client_lib):
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
     status.wait()
 
-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
+    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor_2d("eiger"))[
         "data"
     ].data
     last_image_plot = im.images[0].get_data()

tests/unit_tests/conftest.py

@@ -1,9 +1,15 @@
 import pytest
 
 from bec_widgets.cli.rpc_register import RPCRegister
+from bec_widgets.qt_utils import error_popups
 from bec_widgets.utils import bec_dispatcher as bec_dispatcher_module
 
 
+@pytest.fixture(autouse=True)
+def qapplication(qapp):  # pylint: disable=unused-argument
+    yield
+
+
 @pytest.fixture(autouse=True)
 def rpc_register():
     yield RPCRegister()
@@ -11,7 +17,7 @@ def rpc_register():
 
 
 @pytest.fixture(autouse=True)
-def bec_dispatcher(threads_check):
+def bec_dispatcher(threads_check):  # pylint: disable=unused-argument
     bec_dispatcher = bec_dispatcher_module.BECDispatcher()
     yield bec_dispatcher
     bec_dispatcher.disconnect_all()
@@ -19,3 +25,8 @@ def bec_dispatcher(threads_check):
     bec_dispatcher.client.shutdown()
     # reinitialize singleton for next test
     bec_dispatcher_module.BECDispatcher.reset_singleton()
+
+
+@pytest.fixture(autouse=True)
+def clean_singleton():
+    error_popups._popup_utility_instance = None

tests/unit_tests/test_bec_connector.py

@@ -2,9 +2,9 @@
 import time
 
 import pytest
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QApplication
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import BECConnector, ConnectionConfig
 
 from .client_mocks import mocked_client

tests/unit_tests/test_bec_image.py

@@ -17,7 +17,7 @@ def bec_image_show(bec_figure):
 
 def test_on_image_update(bec_image_show):
     data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitorMessage(
+    msg = messages.DeviceMonitor2DMessage(
         device="eiger", data=data, metadata={"scan_id": "12345"}
     ).model_dump()
     bec_image_show.on_image_update(msg)
@@ -28,7 +28,7 @@ def test_on_image_update(bec_image_show):
 def test_autorange_on_image_update(bec_image_show):
     # Check if autorange mode "mean" works, should be default
     data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitorMessage(
+    msg = messages.DeviceMonitor2DMessage(
         device="eiger", data=data, metadata={"scan_id": "12345"}
     ).model_dump()
     bec_image_show.on_image_update(msg)
@@ -47,7 +47,7 @@ def test_autorange_on_image_update(bec_image_show):
     assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-5, 1e-5)).all()
     # Change the input data, and switch to autorange False, colormap levels should stay untouched
     data *= 100
-    msg = messages.DeviceMonitorMessage(
+    msg = messages.DeviceMonitor2DMessage(
         device="eiger", data=data, metadata={"scan_id": "12345"}
     ).model_dump()
     bec_image_show.set_autorange(False)