fix: logpanel error cycle

.github/workflows/end2end-conda.yml

@@ -47,12 +47,4 @@ jobs:
           source ./bin/install_bec_dev.sh -t
           cd ../
           pip install -e ./ophyd_devices -e .[dev,pyside6] -e ./bec_testing_plugin
-          pytest -v --files-path ./ --start-servers --random-order  ./tests/end-2-end
-
-      - name: Upload logs if job fails
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: pytest-logs
-          path: ./logs/*.log
-          retention-days: 7
+          pytest -v --files-path ./ --start-servers --random-order  ./tests/end-2-end

CHANGELOG.md

@@ -1,104 +1,6 @@
 # CHANGELOG
 
 
-## v2.10.0 (2025-06-02)
-
-### Bug Fixes
-
-- **waveform**: Waveform only update async data when scan is currently running
-  ([`f90150d`](https://github.com/bec-project/bec_widgets/commit/f90150d1c708331d4ee78f82ebf5ef23cd81fd17))
-
-### Continuous Integration
-
-- Add job logs to e2e test
-  ([`d12bd9f`](https://github.com/bec-project/bec_widgets/commit/d12bd9fe1a010babc94dc86405d1b75a2b07534c))
-
-- Fix artifact version
-  ([`2b4454a`](https://github.com/bec-project/bec_widgets/commit/2b4454a291bc69399ddd08780c44e1339825fb36))
-
-### Features
-
-- **waveform**: Large async dataset warning popup
-  ([`d0c1ac0`](https://github.com/bec-project/bec_widgets/commit/d0c1ac0cf5d421d14c9e050ccf5832cd30ca0764))
-
-
-## v2.9.2 (2025-05-30)
-
-### Bug Fixes
-
-- Logpanel error cycle
-  ([`d9dc60e`](https://github.com/bec-project/bec_widgets/commit/d9dc60ee9974e2e6e6005378cc17ef088a4ded2c))
-
-- Move log panel to bec connector and add rate limiter
-  ([`7322cd1`](https://github.com/bec-project/bec_widgets/commit/7322cd194fcf7f56d41c86ecbcd97a5d8bd60c3e))
-
-- **log_panel**: Removed lambda callback method
-  ([`9112616`](https://github.com/bec-project/bec_widgets/commit/91126168b62f3e1623521ceb205dd854287cfef7))
-
-
-## v2.9.1 (2025-05-30)
-
-### Bug Fixes
-
-- Make registry update log message debug level
-  ([`12f8c82`](https://github.com/bec-project/bec_widgets/commit/12f8c82eb59ed6a7273b57126efe340bf37b65cc))
-
-
-## v2.9.0 (2025-05-30)
-
-### Bug Fixes
-
-- **DeviceSignalInput**: Improve robustness
-  ([`91195ae`](https://github.com/bec-project/bec_widgets/commit/91195ae0fdf024daf2daaa4ea2963992b4e40e04))
-
-use set for storing filter properties to allow multiple set to true or false
-
-### Code Style
-
-- Typing in bec_dispatcher
-  ([`a6c5c21`](https://github.com/bec-project/bec_widgets/commit/a6c5c21afaa6dcf33ce71027e8730354ee34e3b4))
-
-### Documentation
-
-- Add usage docs for signal label widget
-  ([`2b9919b`](https://github.com/bec-project/bec_widgets/commit/2b9919bb34a66708f4b910ffc17dc253e9b7f70d))
-
-### Features
-
-- (#569) add signal label widget
-  ([`822e7d0`](https://github.com/bec-project/bec_widgets/commit/822e7d06ff7479d006ae99942fed5e2c836831ce))
-
-add a widget which shows the current value of a signal from BEC. configurable with many properties
-  in designer. intended for use mainly in static GUIs.
-
-
-## v2.8.4 (2025-05-30)
-
-### Bug Fixes
-
-- **crosshair**: Label decimal precision is dynamically scaled with the plot zoom; API of all
-  affected widgets adjusted; option added to PlotBase; closes #637
-  ([`c8128fa`](https://github.com/bec-project/bec_widgets/commit/c8128faf79c43487921aada9dbf1869ef5bda93c))
-
-
-## v2.8.3 (2025-05-30)
-
-### Bug Fixes
-
-- Guard plugin repo import in e2e test
-  ([`bf172b8`](https://github.com/bec-project/bec_widgets/commit/bf172b8431ec207f39206d2a0446908f7186858a))
-
-### Refactoring
-
-- Store modules with widget search
-  ([`b225a7c`](https://github.com/bec-project/bec_widgets/commit/b225a7cc90b55697211c28d9411b6f85c8077217))
-
-### Testing
-
-- **e2e**: Add tests involving plugin repo
-  ([`05329ab`](https://github.com/bec-project/bec_widgets/commit/05329ab50fe10ffc3c19ef3eb408912bb9068de3))
-
-
 ## v2.8.2 (2025-05-27)
 
 ### Bug Fixes

bec_widgets/cli/client.py

@@ -52,7 +52,6 @@ _Widgets = {
     "ScanControl": "ScanControl",
     "ScatterWaveform": "ScatterWaveform",
     "SignalComboBox": "SignalComboBox",
-    "SignalLabel": "SignalLabel",
     "SignalLineEdit": "SignalLineEdit",
     "StopButton": "StopButton",
     "TextBox": "TextBox",
@@ -1222,20 +1221,6 @@ class Image(RPCBase):
         Set auto range for the y-axis.
         """
 
-    @property
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
-    @minimal_crosshair_precision.setter
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
     @property
     @rpc_call
     def color_map(self) -> "str":
@@ -2365,20 +2350,6 @@ class MultiWaveform(RPCBase):
         The font size of the legend font.
         """
 
-    @property
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
-    @minimal_crosshair_precision.setter
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
     @property
     @rpc_call
     def highlighted_index(self):
@@ -3344,20 +3315,6 @@ class ScatterWaveform(RPCBase):
         The font size of the legend font.
         """
 
-    @property
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
-    @minimal_crosshair_precision.setter
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
     @property
     @rpc_call
     def main_curve(self) -> "ScatterCurve":
@@ -3460,78 +3417,6 @@ class SignalComboBox(RPCBase):
         """
 
 
-class SignalLabel(RPCBase):
-    @property
-    @rpc_call
-    def custom_label(self) -> "str":
-        """
-        Use a cusom label rather than the signal name
-        """
-
-    @property
-    @rpc_call
-    def custom_units(self) -> "str":
-        """
-        Use a custom unit string
-        """
-
-    @custom_label.setter
-    @rpc_call
-    def custom_label(self) -> "str":
-        """
-        Use a cusom label rather than the signal name
-        """
-
-    @custom_units.setter
-    @rpc_call
-    def custom_units(self) -> "str":
-        """
-        Use a custom unit string
-        """
-
-    @property
-    @rpc_call
-    def decimal_places(self) -> "int":
-        """
-        Format to a given number of decimal_places. Set to 0 to disable.
-        """
-
-    @decimal_places.setter
-    @rpc_call
-    def decimal_places(self) -> "int":
-        """
-        Format to a given number of decimal_places. Set to 0 to disable.
-        """
-
-    @property
-    @rpc_call
-    def show_default_units(self) -> "bool":
-        """
-        Show default units obtained from the signal alongside it
-        """
-
-    @show_default_units.setter
-    @rpc_call
-    def show_default_units(self) -> "bool":
-        """
-        Show default units obtained from the signal alongside it
-        """
-
-    @property
-    @rpc_call
-    def show_select_button(self) -> "bool":
-        """
-        Show the button to select the signal to display
-        """
-
-    @show_select_button.setter
-    @rpc_call
-    def show_select_button(self) -> "bool":
-        """
-        Show the button to select the signal to display
-        """
-
-
 class SignalLineEdit(RPCBase):
     """Line edit widget for device input with autocomplete for device names."""
 
@@ -3904,20 +3789,6 @@ class Waveform(RPCBase):
         The font size of the legend font.
         """
 
-    @property
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
-    @minimal_crosshair_precision.setter
-    @rpc_call
-    def minimal_crosshair_precision(self) -> "int":
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-
     @property
     @rpc_call
     def curves(self) -> "list[Curve]":
@@ -3970,48 +3841,6 @@ class Waveform(RPCBase):
         The color palette of the figure widget.
         """
 
-    @property
-    @rpc_call
-    def skip_large_dataset_warning(self) -> "bool":
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-
-    @skip_large_dataset_warning.setter
-    @rpc_call
-    def skip_large_dataset_warning(self) -> "bool":
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-
-    @property
-    @rpc_call
-    def skip_large_dataset_check(self) -> "bool":
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-
-    @skip_large_dataset_check.setter
-    @rpc_call
-    def skip_large_dataset_check(self) -> "bool":
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-
-    @property
-    @rpc_call
-    def max_dataset_size_mb(self) -> "float":
-        """
-        The maximum dataset size (in MB) permitted when fetching async data from history before prompting the user.
-        """
-
-    @max_dataset_size_mb.setter
-    @rpc_call
-    def max_dataset_size_mb(self) -> "float":
-        """
-        The maximum dataset size (in MB) permitted when fetching async data from history before prompting the user.
-        """
-
     @rpc_call
     def plot(
         self,

bec_widgets/utils/bec_dispatcher.py

@@ -163,7 +163,7 @@ class BECDispatcher:
     def connect_slot(
         self,
         slot: Callable,
-        topics: EndpointInfo | str | list[EndpointInfo] | list[str],
+        topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]],
         cb_info: dict | None = None,
         **kwargs,
     ) -> None:
@@ -172,7 +172,7 @@ class BECDispatcher:
         Args:
             slot (Callable): A slot method/function that accepts two inputs: content and metadata of
                 the corresponding pub/sub message
-            topics EndpointInfo | str | list[EndpointInfo] | list[str]: A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
+            topics (EndpointInfo | str | list): A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
             cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
         """
         qt_slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
@@ -183,15 +183,13 @@ class BECDispatcher:
         topics_str, _ = self.client.connector._convert_endpointinfo(topics)
         qt_slot.topics.update(set(topics_str))
 
-    def disconnect_slot(
-        self, slot: Callable, topics: EndpointInfo | str | list[EndpointInfo] | list[str]
-    ):
+    def disconnect_slot(self, slot: Callable, topics: Union[str, list]):
         """
         Disconnect a slot from a topic.
 
         Args:
             slot(Callable): The slot to disconnect
-            topics EndpointInfo | str | list[EndpointInfo] | list[str]: A topic or list of topics to unsub from.
+            topics(Union[str, list]): The topic(s) to disconnect from
         """
         # find the right slot to disconnect from ;
         # slot callbacks are wrapped in QtThreadSafeCallback objects,

bec_widgets/utils/crosshair.py

@@ -34,21 +34,13 @@ class Crosshair(QObject):
     coordinatesChanged2D = Signal(tuple)
     coordinatesClicked2D = Signal(tuple)
 
-    def __init__(
-        self,
-        plot_item: pg.PlotItem,
-        precision: int | None = None,
-        *,
-        min_precision: int = 2,
-        parent=None,
-    ):
+    def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None):
         """
         Crosshair for 1D and 2D plots.
 
         Args:
             plot_item (pyqtgraph.PlotItem): The plot item to which the crosshair will be attached.
-            precision (int | None, optional): Fixed number of decimal places to display. If *None*, precision is chosen dynamically from the current view range.
-            min_precision (int, optional): The lower bound (in decimal places) used when dynamic precision is enabled. Defaults to 2.
+            precision (int, optional): Number of decimal places to round the coordinates to. Defaults to None.
             parent (QObject, optional): Parent object for the QObject. Defaults to None.
         """
         super().__init__(parent)
@@ -56,9 +48,7 @@ class Crosshair(QObject):
         self.is_log_x = None
         self.is_derivative = None
         self.plot_item = plot_item
-        self._precision = precision
-        self._min_precision = max(0, int(min_precision))  # ensure non‑negative
-
+        self.precision = precision
         self.v_line = pg.InfiniteLine(angle=90, movable=False)
         self.v_line.skip_auto_range = True
         self.h_line = pg.InfiniteLine(angle=0, movable=False)
@@ -103,56 +93,6 @@ class Crosshair(QObject):
 
         self._connect_to_theme_change()
 
-    @property
-    def precision(self) -> int | None:
-        """Fixed number of decimals; ``None`` enables dynamic mode."""
-        return self._precision
-
-    @precision.setter
-    def precision(self, value: int | None):
-        """
-        Set the fixed number of decimals to display.
-
-        Args:
-            value(int | None): The number of decimals to display. If `None`, dynamic precision is used based on the view range.
-        """
-        self._precision = value
-
-    @property
-    def min_precision(self) -> int:
-        """Lower bound on decimals when dynamic precision is used."""
-        return self._min_precision
-
-    @min_precision.setter
-    def min_precision(self, value: int):
-        """
-        Set the lower bound on decimals when dynamic precision is used.
-
-        Args:
-            value(int): The minimum number of decimals to display. Must be non-negative.
-        """
-        self._min_precision = max(0, int(value))
-
-    def _current_precision(self) -> int:
-        """
-        Get the current precision based on the view range or fixed precision.
-        """
-        if self._precision is not None:
-            return self._precision
-
-        # Dynamically choose precision from the smaller visible span
-        view_range = self.plot_item.vb.viewRange()
-        x_span = abs(view_range[0][1] - view_range[0][0])
-        y_span = abs(view_range[1][1] - view_range[1][0])
-
-        # Ignore zero spans that can appear during initialisation
-        spans = [s for s in (x_span, y_span) if s > 0]
-        span = min(spans) if spans else 1.0
-
-        exponent = np.floor(np.log10(span))  # order of magnitude
-        decimals = max(0, int(-exponent) + 1)
-        return max(self._min_precision, decimals)
-
     def _connect_to_theme_change(self):
         """Connect to the theme change signal."""
         qapp = QApplication.instance()
@@ -384,7 +324,6 @@ class Crosshair(QObject):
                 # not sure how we got here, but just to be safe...
                 return
 
-            precision = self._current_precision()
             for item in self.items:
                 if isinstance(item, pg.PlotDataItem):
                     name = item.name() or str(id(item))
@@ -395,8 +334,8 @@ class Crosshair(QObject):
                     x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
                     coordinate_to_emit = (
                         name,
-                        round(x_snapped_scaled, precision),
-                        round(y_snapped_scaled, precision),
+                        round(x_snapped_scaled, self.precision),
+                        round(y_snapped_scaled, self.precision),
                     )
                     self.coordinatesChanged1D.emit(coordinate_to_emit)
                 elif isinstance(item, pg.ImageItem):
@@ -441,7 +380,6 @@ class Crosshair(QObject):
                 # not sure how we got here, but just to be safe...
                 return
 
-            precision = self._current_precision()
             for item in self.items:
                 if isinstance(item, pg.PlotDataItem):
                     name = item.name() or str(id(item))
@@ -453,8 +391,8 @@ class Crosshair(QObject):
                     x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
                     coordinate_to_emit = (
                         name,
-                        round(x_snapped_scaled, precision),
-                        round(y_snapped_scaled, precision),
+                        round(x_snapped_scaled, self.precision),
+                        round(y_snapped_scaled, self.precision),
                     )
                     self.coordinatesClicked1D.emit(coordinate_to_emit)
                 elif isinstance(item, pg.ImageItem):
@@ -505,8 +443,7 @@ class Crosshair(QObject):
         """
         x, y = pos
         x_scaled, y_scaled = self.scale_emitted_coordinates(x, y)
-        precision = self._current_precision()
-        text = f"({x_scaled:.{precision}f}, {y_scaled:.{precision}f})"
+        text = f"({x_scaled:.{self.precision}g}, {y_scaled:.{self.precision}g})"
         for item in self.items:
             if isinstance(item, pg.ImageItem):
                 image = item.image
@@ -515,7 +452,7 @@ class Crosshair(QObject):
                 ix = int(np.clip(x, 0, image.shape[0] - 1))
                 iy = int(np.clip(y, 0, image.shape[1] - 1))
                 intensity = image[ix, iy]
-                text += f"\nIntensity: {intensity:.{precision}f}"
+                text += f"\nIntensity: {intensity:.{self.precision}g}"
                 break
         # Update coordinate label
         self.coord_label.setText(text)

bec_widgets/utils/rpc_server.py

@@ -195,7 +195,7 @@ class RPCServer:
             return
         self._broadcasted_data = data
 
-        logger.debug(f"Broadcasting registry update: {data} for {self.gui_id}")
+        logger.info(f"Broadcasting registry update: {data} for {self.gui_id}")
         self.client.connector.xadd(
             MessageEndpoints.gui_registry_state(self.gui_id),
             msg_dict={"data": messages.GUIRegistryStateMessage(state=data)},

bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py

@@ -1,11 +1,10 @@
 from bec_lib.callback_handler import EventType
 from bec_lib.device import Signal
 from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property
+from qtpy.QtCore import Property, Slot
 
 from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.filter_io import FilterIO
 from bec_widgets.utils.ophyd_kind_util import Kind
 from bec_widgets.utils.widget_io import WidgetIO
@@ -50,7 +49,7 @@ class DeviceSignalInputBase(BECWidget):
 
         self._device = None
         self.get_bec_shortcuts()
-        self._signal_filter = set()
+        self._signal_filter = []
         self._signals = []
         self._hinted_signals = []
         self._normal_signals = []
@@ -61,7 +60,7 @@ class DeviceSignalInputBase(BECWidget):
 
     ### Qt Slots ###
 
-    @SafeSlot(str)
+    @Slot(str)
     def set_signal(self, signal: str):
         """
         Set the signal.
@@ -77,7 +76,7 @@ class DeviceSignalInputBase(BECWidget):
                 f"Signal {signal} not found for device {self.device} and filtered selection {self.signal_filter}."
             )
 
-    @SafeSlot(str)
+    @Slot(str)
     def set_device(self, device: str | None):
         """
         Set the device. If device is not valid, device will be set to None which happens
@@ -91,8 +90,8 @@ class DeviceSignalInputBase(BECWidget):
             self._device = device
         self.update_signals_from_filters()
 
-    @SafeSlot(dict, dict)
-    @SafeSlot()
+    @Slot(dict, dict)
+    @Slot()
     def update_signals_from_filters(
         self, content: dict | None = None, metadata: dict | None = None
     ):
@@ -159,9 +158,9 @@ class DeviceSignalInputBase(BECWidget):
     @include_hinted_signals.setter
     def include_hinted_signals(self, value: bool):
         if value:
-            self._signal_filter.add(Kind.hinted)
+            self._signal_filter.append(Kind.hinted)
         else:
-            self._signal_filter.discard(Kind.hinted)
+            self._signal_filter.remove(Kind.hinted)
         self.update_signals_from_filters()
 
     @Property(bool)
@@ -172,9 +171,9 @@ class DeviceSignalInputBase(BECWidget):
     @include_normal_signals.setter
     def include_normal_signals(self, value: bool):
         if value:
-            self._signal_filter.add(Kind.normal)
+            self._signal_filter.append(Kind.normal)
         else:
-            self._signal_filter.discard(Kind.normal)
+            self._signal_filter.remove(Kind.normal)
         self.update_signals_from_filters()
 
     @Property(bool)
@@ -185,9 +184,9 @@ class DeviceSignalInputBase(BECWidget):
     @include_config_signals.setter
     def include_config_signals(self, value: bool):
         if value:
-            self._signal_filter.add(Kind.config)
+            self._signal_filter.append(Kind.config)
         else:
-            self._signal_filter.discard(Kind.config)
+            self._signal_filter.remove(Kind.config)
         self.update_signals_from_filters()
 
     ### Properties and Methods ###

bec_widgets/widgets/control/device_input/signal_combobox/signal_combobox.py

@@ -1,13 +1,11 @@
 from bec_lib.device import Positioner
-from qtpy.QtCore import QSize, Signal
+from qtpy.QtCore import QSize, Signal, Slot
 from qtpy.QtWidgets import QComboBox, QSizePolicy
 
-from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.filter_io import ComboBoxFilterHandler, FilterIO
 from bec_widgets.utils.ophyd_kind_util import Kind
 from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
     DeviceSignalInputBase,
-    DeviceSignalInputBaseConfig,
 )
 
 
@@ -37,7 +35,7 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
         self,
         parent=None,
         client=None,
-        config: DeviceSignalInputBaseConfig | None = None,
+        config: DeviceSignalInputBase = None,
         gui_id: str | None = None,
         device: str | None = None,
         signal_filter: str | list[str] | None = None,
@@ -67,13 +65,9 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
         if default is not None:
             self.set_signal(default)
 
-    @SafeSlot()
-    @SafeSlot(dict, dict)
-    def update_signals_from_filters(
-        self, content: dict | None = None, metadata: dict | None = None
-    ):
+    def update_signals_from_filters(self):
         """Update the filters for the combobox"""
-        super().update_signals_from_filters(content, metadata)
+        super().update_signals_from_filters()
         # pylint: disable=protected-access
         if FilterIO._find_handler(self) is ComboBoxFilterHandler:
             if len(self._config_signals) > 0:
@@ -90,7 +84,7 @@ class SignalComboBox(DeviceSignalInputBase, QComboBox):
                 self.insertItem(0, "Hinted Signals")
                 self.model().item(0).setEnabled(False)
 
-    @SafeSlot(str)
+    @Slot(str)
     def on_text_changed(self, text: str):
         """Slot for text changed. If a device is selected and the signal is changed and valid it emits a signal.
         For a positioner, the readback value has to be renamed to the device name.

bec_widgets/widgets/plots/image/image.py

@@ -88,8 +88,6 @@ class Image(PlotBase):
         "auto_range_x.setter",
         "auto_range_y",
         "auto_range_y.setter",
-        "minimal_crosshair_precision",
-        "minimal_crosshair_precision.setter",
         # ImageView Specific Settings
         "color_map",
         "color_map.setter",

bec_widgets/widgets/plots/multi_waveform/multi_waveform.py

@@ -91,8 +91,6 @@ class MultiWaveform(PlotBase):
         "y_log.setter",
         "legend_label_size",
         "legend_label_size.setter",
-        "minimal_crosshair_precision",
-        "minimal_crosshair_precision.setter",
         # MultiWaveform Specific RPC Access
         "highlighted_index",
         "highlighted_index.setter",

bec_widgets/widgets/plots/plot_base.py

@@ -116,7 +116,6 @@ class PlotBase(BECWidget, QWidget):
         self._user_y_label = ""
         self._y_label_suffix = ""
         self._y_axis_units = ""
-        self._minimal_crosshair_precision = 3
 
         # Plot Indicator Items
         self.tick_item = BECTickItem(parent=self, plot_item=self.plot_item)
@@ -979,9 +978,7 @@ class PlotBase(BECWidget, QWidget):
     def hook_crosshair(self) -> None:
         """Hook the crosshair to all plots."""
         if self.crosshair is None:
-            self.crosshair = Crosshair(
-                self.plot_item, min_precision=self._minimal_crosshair_precision
-            )
+            self.crosshair = Crosshair(self.plot_item, precision=3)
             self.crosshair.crosshairChanged.connect(self.crosshair_position_changed)
             self.crosshair.crosshairClicked.connect(self.crosshair_position_clicked)
             self.crosshair.coordinatesChanged1D.connect(self.crosshair_coordinates_changed)
@@ -1009,29 +1006,6 @@ class PlotBase(BECWidget, QWidget):
 
         self.unhook_crosshair()
 
-    @SafeProperty(
-        int, doc="Minimum decimal places for crosshair when dynamic precision is enabled."
-    )
-    def minimal_crosshair_precision(self) -> int:
-        """
-        Minimum decimal places for crosshair when dynamic precision is enabled.
-        """
-        return self._minimal_crosshair_precision
-
-    @minimal_crosshair_precision.setter
-    def minimal_crosshair_precision(self, value: int):
-        """
-        Set the minimum decimal places for crosshair when dynamic precision is enabled.
-
-        Args:
-            value(int): The minimum decimal places to set.
-        """
-        value_int = max(0, int(value))
-        self._minimal_crosshair_precision = value_int
-        if self.crosshair is not None:
-            self.crosshair.min_precision = value_int
-        self.property_changed.emit("minimal_crosshair_precision", value_int)
-
     @SafeSlot()
     def reset(self) -> None:
         """Reset the plot widget."""

bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py

@@ -82,8 +82,6 @@ class ScatterWaveform(PlotBase):
         "y_log.setter",
         "legend_label_size",
         "legend_label_size.setter",
-        "minimal_crosshair_precision",
-        "minimal_crosshair_precision.setter",
         # Scatter Waveform Specific RPC Access
         "main_curve",
         "color_map",

bec_widgets/widgets/plots/setting_menus/axis_settings.py

@@ -60,7 +60,6 @@ class AxisSettings(SettingWidget):
             self.ui.y_grid,
             self.ui.inner_axes,
             self.ui.outer_axes,
-            self.ui.minimal_crosshair_precision,
         ]:
             WidgetIO.connect_widget_change_signal(widget, self.set_property)
 
@@ -122,7 +121,6 @@ class AxisSettings(SettingWidget):
             self.ui.y_max,
             self.ui.y_log,
             self.ui.y_grid,
-            self.ui.minimal_crosshair_precision,
         ]:
             property_name = widget.objectName()
             value = getattr(self.target_widget, property_name)
@@ -146,7 +144,6 @@ class AxisSettings(SettingWidget):
             self.ui.y_grid,
             self.ui.outer_axes,
             self.ui.inner_axes,
-            self.ui.minimal_crosshair_precision,
         ]:
             property_name = widget.objectName()
             value = WidgetIO.get_value(widget)

bec_widgets/widgets/plots/setting_menus/axis_settings_horizontal.ui

@@ -14,6 +14,97 @@
             <string>Form</string>
         </property>
         <layout class="QGridLayout" name="gridLayout">
+            <item row="1" column="0">
+                <widget class="QLabel" name="label">
+                    <property name="text">
+                        <string>Inner Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="1" column="1">
+                <widget class="ToggleSwitch" name="inner_axes"/>
+            </item>
+            <item row="1" column="2">
+                <widget class="QLabel" name="label_outer_axes">
+                    <property name="text">
+                        <string>Outer Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="1" column="3">
+                <widget class="ToggleSwitch" name="outer_axes">
+                    <property name="checked" stdset="0">
+                        <bool>false</bool>
+                    </property>
+                </widget>
+            </item>
+            <item row="2" column="0" colspan="2">
+                <widget class="QGroupBox" name="x_axis_box">
+                    <property name="title">
+                        <string>X Axis</string>
+                    </property>
+                    <layout class="QGridLayout" name="gridLayout_4">
+                        <item row="5" column="0">
+                            <widget class="QLabel" name="x_grid_label">
+                                <property name="text">
+                                    <string>Grid</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="3" column="2">
+                            <widget class="ToggleSwitch" name="x_log">
+                                <property name="checked" stdset="0">
+                                    <bool>false</bool>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="2" column="0">
+                            <widget class="QLabel" name="x_max_label">
+                                <property name="text">
+                                    <string>Max</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="5" column="2">
+                            <widget class="ToggleSwitch" name="x_grid">
+                                <property name="checked" stdset="0">
+                                    <bool>false</bool>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="3" column="0">
+                            <widget class="QLabel" name="x_scale_label">
+                                <property name="text">
+                                    <string>Log</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="1" column="0" colspan="2">
+                            <widget class="QLabel" name="x_min_label">
+                                <property name="text">
+                                    <string>Min</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="0" column="0">
+                            <widget class="QLabel" name="x_label_label">
+                                <property name="text">
+                                    <string>Label</string>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="0" column="2">
+                            <widget class="QLineEdit" name="x_label"/>
+                        </item>
+                        <item row="1" column="2">
+                            <widget class="BECSpinBox" name="x_min"/>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="BECSpinBox" name="x_max"/>
+                        </item>
+                    </layout>
+                </widget>
+            </item>
             <item row="2" column="2" colspan="2">
                 <widget class="QGroupBox" name="y_axis_box">
                     <property name="title">
@@ -88,87 +179,6 @@
                     </layout>
                 </widget>
             </item>
-            <item row="1" column="3">
-                <widget class="ToggleSwitch" name="outer_axes">
-                    <property name="checked" stdset="0">
-                        <bool>false</bool>
-                    </property>
-                </widget>
-            </item>
-            <item row="1" column="0">
-                <widget class="QLabel" name="label">
-                    <property name="text">
-                        <string>Inner Axes</string>
-                    </property>
-                </widget>
-            </item>
-            <item row="2" column="0" colspan="2">
-                <widget class="QGroupBox" name="x_axis_box">
-                    <property name="title">
-                        <string>X Axis</string>
-                    </property>
-                    <layout class="QGridLayout" name="gridLayout_4">
-                        <item row="5" column="0">
-                            <widget class="QLabel" name="x_grid_label">
-                                <property name="text">
-                                    <string>Grid</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="3" column="2">
-                            <widget class="ToggleSwitch" name="x_log">
-                                <property name="checked" stdset="0">
-                                    <bool>false</bool>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="2" column="0">
-                            <widget class="QLabel" name="x_max_label">
-                                <property name="text">
-                                    <string>Max</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="5" column="2">
-                            <widget class="ToggleSwitch" name="x_grid">
-                                <property name="checked" stdset="0">
-                                    <bool>false</bool>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="3" column="0">
-                            <widget class="QLabel" name="x_scale_label">
-                                <property name="text">
-                                    <string>Log</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="1" column="0" colspan="2">
-                            <widget class="QLabel" name="x_min_label">
-                                <property name="text">
-                                    <string>Min</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="0" column="0">
-                            <widget class="QLabel" name="x_label_label">
-                                <property name="text">
-                                    <string>Label</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="0" column="2">
-                            <widget class="QLineEdit" name="x_label"/>
-                        </item>
-                        <item row="1" column="2">
-                            <widget class="BECSpinBox" name="x_min"/>
-                        </item>
-                        <item row="2" column="2">
-                            <widget class="BECSpinBox" name="x_max"/>
-                        </item>
-                    </layout>
-                </widget>
-            </item>
             <item row="0" column="0" colspan="4">
                 <layout class="QHBoxLayout" name="horizontalLayout">
                     <item>
@@ -181,41 +191,8 @@
                     <item>
                         <widget class="QLineEdit" name="title"/>
                     </item>
-                    <item>
-                        <widget class="QLabel" name="label_2">
-                            <property name="text">
-                                <string>Precision</string>
-                            </property>
-                        </widget>
-                    </item>
-                    <item>
-                        <widget class="QSpinBox" name="minimal_crosshair_precision">
-                            <property name="toolTip">
-                                <string>Minimal Crosshair Precision</string>
-                            </property>
-                            <property name="alignment">
-                                <set>Qt::AlignmentFlag::AlignCenter</set>
-                            </property>
-                            <property name="maximum">
-                                <number>20</number>
-                            </property>
-                            <property name="value">
-                                <number>3</number>
-                            </property>
-                        </widget>
-                    </item>
                 </layout>
             </item>
-            <item row="1" column="2">
-                <widget class="QLabel" name="label_outer_axes">
-                    <property name="text">
-                        <string>Outer Axes</string>
-                    </property>
-                </widget>
-            </item>
-            <item row="1" column="1">
-                <widget class="ToggleSwitch" name="inner_axes"/>
-            </item>
         </layout>
     </widget>
     <customwidgets>

bec_widgets/widgets/plots/setting_menus/axis_settings_vertical.ui

@@ -6,84 +6,15 @@
             <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>250</width>
-                <height>612</height>
+                <width>241</width>
+                <height>526</height>
             </rect>
         </property>
         <property name="windowTitle">
             <string>Form</string>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-            <item>
-                <widget class="QGroupBox" name="general_box">
-                    <property name="title">
-                        <string>General</string>
-                    </property>
-                    <layout class="QGridLayout" name="gridLayout_2">
-                        <item row="4" column="0">
-                            <widget class="QLabel" name="label_outer_axes">
-                                <property name="text">
-                                    <string>Outer Axes</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="4" column="1">
-                            <widget class="ToggleSwitch" name="outer_axes">
-                                <property name="checked" stdset="0">
-                                    <bool>false</bool>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="1" column="1">
-                            <widget class="QLineEdit" name="title"/>
-                        </item>
-                        <item row="3" column="0">
-                            <widget class="QLabel" name="label">
-                                <property name="text">
-                                    <string>Inner Axes</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="1" column="0">
-                            <widget class="QLabel" name="plot_title_label">
-                                <property name="text">
-                                    <string>Plot Title</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="3" column="1">
-                            <widget class="ToggleSwitch" name="inner_axes"/>
-                        </item>
-                        <item row="2" column="0">
-                            <widget class="QLabel" name="label_2">
-                                <property name="toolTip">
-                                    <string>Minimal Crosshair Precision</string>
-                                </property>
-                                <property name="text">
-                                    <string>Precision</string>
-                                </property>
-                            </widget>
-                        </item>
-                        <item row="2" column="1">
-                            <widget class="QSpinBox" name="minimal_crosshair_precision">
-                                <property name="toolTip">
-                                    <string>Minimal Crosshair Precision</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="maximum">
-                                    <number>20</number>
-                                </property>
-                                <property name="value">
-                                    <number>3</number>
-                                </property>
-                            </widget>
-                        </item>
-                    </layout>
-                </widget>
-            </item>
-            <item>
+        <layout class="QGridLayout" name="gridLayout">
+            <item row="4" column="0" colspan="2">
                 <widget class="QGroupBox" name="x_axis_box">
                     <property name="title">
                         <string>X Axis</string>
@@ -150,7 +81,28 @@
                     </layout>
                 </widget>
             </item>
-            <item>
+            <item row="0" column="0" colspan="2">
+                <layout class="QHBoxLayout" name="horizontalLayout">
+                    <item>
+                        <widget class="QLabel" name="plot_title_label">
+                            <property name="text">
+                                <string>Plot Title</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item>
+                        <widget class="QLineEdit" name="title"/>
+                    </item>
+                </layout>
+            </item>
+            <item row="2" column="0">
+                <widget class="QLabel" name="label_outer_axes">
+                    <property name="text">
+                        <string>Outer Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="5" column="0" colspan="2">
                 <widget class="QGroupBox" name="y_axis_box">
                     <property name="title">
                         <string>Y Axis</string>
@@ -217,6 +169,23 @@
                     </layout>
                 </widget>
             </item>
+            <item row="2" column="1">
+                <widget class="ToggleSwitch" name="outer_axes">
+                    <property name="checked" stdset="0">
+                        <bool>false</bool>
+                    </property>
+                </widget>
+            </item>
+            <item row="1" column="0">
+                <widget class="QLabel" name="label">
+                    <property name="text">
+                        <string>Inner Axes</string>
+                    </property>
+                </widget>
+            </item>
+            <item row="1" column="1">
+                <widget class="ToggleSwitch" name="inner_axes"/>
+            </item>
         </layout>
     </widget>
     <customwidgets>

bec_widgets/widgets/plots/waveform/waveform.py

@@ -9,19 +9,8 @@ import pyqtgraph as pg
 from bec_lib import bec_logger, messages
 from bec_lib.endpoints import MessageEndpoints
 from pydantic import Field, ValidationError, field_validator
-from qtpy.QtCore import Qt, QTimer, Signal
-from qtpy.QtWidgets import (
-    QApplication,
-    QCheckBox,
-    QDialog,
-    QDialogButtonBox,
-    QDoubleSpinBox,
-    QHBoxLayout,
-    QLabel,
-    QMainWindow,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtCore import QTimer, Signal
+from qtpy.QtWidgets import QApplication, QDialog, QHBoxLayout, QMainWindow, QVBoxLayout, QWidget
 
 from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_signal_proxy import BECSignalProxy
@@ -44,11 +33,6 @@ class WaveformConfig(ConnectionConfig):
     color_palette: str | None = Field(
         "plasma", description="The color palette of the figure widget.", validate_default=True
     )
-    max_dataset_size_mb: float = Field(
-        10,
-        description="Maximum dataset size (in MB) permitted when fetching async data from history before prompting the user.",
-        validate_default=True,
-    )
 
     model_config: dict = {"validate_assignment": True}
     _validate_color_palette = field_validator("color_palette")(Colors.validate_color_map)
@@ -102,8 +86,6 @@ class Waveform(PlotBase):
         "y_log.setter",
         "legend_label_size",
         "legend_label_size.setter",
-        "minimal_crosshair_precision",
-        "minimal_crosshair_precision.setter",
         # Waveform Specific RPC Access
         "curves",
         "x_mode",
@@ -112,12 +94,6 @@ class Waveform(PlotBase):
         "x_entry.setter",
         "color_palette",
         "color_palette.setter",
-        "skip_large_dataset_warning",
-        "skip_large_dataset_warning.setter",
-        "skip_large_dataset_check",
-        "skip_large_dataset_check.setter",
-        "max_dataset_size_mb",
-        "max_dataset_size_mb.setter",
         "plot",
         "add_dap_curve",
         "remove_curve",
@@ -166,7 +142,6 @@ class Waveform(PlotBase):
         self._mode: Literal["none", "sync", "async", "mixed"] = "none"
 
         # Scan data
-        self._scan_done = True  # means scan is not running
         self.old_scan_id = None
         self.scan_id = None
         self.scan_item = None
@@ -186,10 +161,6 @@ class Waveform(PlotBase):
         self._init_curve_dialog()
         self.curve_settings_dialog = None
 
-        # Large‑dataset guard
-        self._skip_large_dataset_warning = False  # session flag
-        self._skip_large_dataset_check = False  # per-plot flag, to skip the warning for this plot
-
         # Scan status update loop
         self.bec_dispatcher.connect_slot(self.on_scan_status, MessageEndpoints.scan_status())
         self.bec_dispatcher.connect_slot(self.on_scan_progress, MessageEndpoints.scan_progress())
@@ -588,59 +559,6 @@ class Waveform(PlotBase):
         """
         return [item for item in self.plot_item.curves if isinstance(item, Curve)]
 
-    @SafeProperty(bool)
-    def skip_large_dataset_check(self) -> bool:
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-        return self._skip_large_dataset_check
-
-    @skip_large_dataset_check.setter
-    def skip_large_dataset_check(self, value: bool):
-        """
-        Set whether to skip the large dataset warning when fetching async data.
-
-        Args:
-            value(bool): Whether to skip the large dataset warning.
-        """
-        self._skip_large_dataset_check = value
-
-    @SafeProperty(bool)
-    def skip_large_dataset_warning(self) -> bool:
-        """
-        Whether to skip the large dataset warning when fetching async data.
-        """
-        return self._skip_large_dataset_warning
-
-    @skip_large_dataset_warning.setter
-    def skip_large_dataset_warning(self, value: bool):
-        """
-        Set whether to skip the large dataset warning when fetching async data.
-
-        Args:
-            value(bool): Whether to skip the large dataset warning.
-        """
-        self._skip_large_dataset_warning = value
-
-    @SafeProperty(float)
-    def max_dataset_size_mb(self) -> float:
-        """
-        The maximum dataset size (in MB) permitted when fetching async data from history before prompting the user.
-        """
-        return self.config.max_dataset_size_mb
-
-    @max_dataset_size_mb.setter
-    def max_dataset_size_mb(self, value: float):
-        """
-        Set the maximum dataset size (in MB) permitted when fetching async data from history before prompting the user.
-
-        Args:
-            value(float): The maximum dataset size in MB.
-        """
-        if value <= 0:
-            raise ValueError("Maximum dataset size must be greater than 0.")
-        self.config.max_dataset_size_mb = value
-
     ################################################################################
     # High Level methods for API
     ################################################################################
@@ -887,6 +805,8 @@ class Waveform(PlotBase):
         if config.source == "device":
             if self.scan_item is None:
                 self.update_with_scan_history(-1)
+            if curve in self._async_curves:
+                self._setup_async_curve(curve)
             self.async_signal_update.emit()
             self.sync_signal_update.emit()
         if config.source == "dap":
@@ -1134,8 +1054,8 @@ class Waveform(PlotBase):
             meta(dict): The message metadata.
         """
         self.sync_signal_update.emit()
-        self._scan_done = msg.get("done")
-        if self._scan_done:
+        status = msg.get("done")
+        if status:
             QTimer.singleShot(100, self.update_sync_curves)
             QTimer.singleShot(300, self.update_sync_curves)
 
@@ -1213,11 +1133,9 @@ class Waveform(PlotBase):
             if access_key == "val":  # live access
                 device_data = data.get(device_name, {}).get(device_entry, {}).get(access_key, None)
             else:  # history access
-                dataset_obj = data.get(device_name, {})
-                if self._skip_large_dataset_check is False:
-                    if not self._check_dataset_size_and_confirm(dataset_obj, device_entry):
-                        continue  # user declined to load; skip this curve
-                device_data = dataset_obj.get(device_entry, {}).read().get("value", None)
+                device_data = (
+                    data.get(device_name, {}).get(device_entry, {}).read().get("value", None)
+                )
 
             # if shape is 2D cast it into 1D and take the last waveform
             if len(np.shape(device_data)) > 1:
@@ -1661,8 +1579,6 @@ class Waveform(PlotBase):
             dev_name = curve.config.signal.name
             if dev_name in readout_priority_async:
                 self._async_curves.append(curve)
-                if hasattr(self.scan_item, "live_data"):
-                    self._setup_async_curve(curve)
                 found_async = True
             elif dev_name in readout_priority_sync:
                 self._sync_curves.append(curve)
@@ -1739,106 +1655,6 @@ class Waveform(PlotBase):
     ################################################################################
     # Utility Methods
     ################################################################################
-
-    # Large dataset handling helpers
-    def _check_dataset_size_and_confirm(self, dataset_obj, device_entry: str) -> bool:
-        """
-        Check the size of the dataset and confirm with the user if it exceeds the limit.
-
-        Args:
-            dataset_obj: The dataset object containing the information.
-            device_entry( str): The specific device entry to check.
-
-        Returns:
-            bool: True if the dataset is within the size limit or user confirmed to load it,
-                  False if the dataset exceeds the size limit and user declined to load it.
-        """
-        try:
-            info = dataset_obj._info
-            mem_bytes = info.get(device_entry, {}).get("value", {}).get("mem_size", 0)
-            # Fallback – grab first entry if lookup failed
-            if mem_bytes == 0 and info:
-                first_key = next(iter(info))
-                mem_bytes = info[first_key]["value"]["mem_size"]
-            size_mb = mem_bytes / (1024 * 1024)
-            print(f"Dataset size: {size_mb:.1f} MB")
-        except Exception as exc:  # noqa: BLE001
-            logger.error(f"Unable to evaluate dataset size: {exc}")
-            return True
-
-        if size_mb <= self.config.max_dataset_size_mb:
-            return True
-        logger.warning(
-            f"Attempt to load large dataset: {size_mb:.1f} MB "
-            f"(limit {self.config.max_dataset_size_mb} MB)"
-        )
-        if self._skip_large_dataset_warning:
-            logger.info("Skipping large dataset warning dialog.")
-            return False
-        return self._confirm_large_dataset(size_mb)
-
-    def _confirm_large_dataset(self, size_mb: float) -> bool:
-        """
-        Confirm with the user whether to load a large dataset with dialog popup.
-        Also allows the user to adjust the maximum dataset size limit and if user
-        wants to see this popup again during session.
-
-        Args:
-            size_mb(float): Size of the dataset in MB.
-
-        Returns:
-            bool: True if the user confirmed to load the dataset, False otherwise.
-        """
-        if self._skip_large_dataset_warning:
-            return True
-
-        dialog = QDialog(self)
-        dialog.setWindowTitle("Large dataset detected")
-        main_dialog_layout = QVBoxLayout(dialog)
-
-        # Limit adjustment widgets
-        limit_adjustment_layout = QHBoxLayout()
-        limit_adjustment_layout.addWidget(QLabel("New limit (MB):"))
-        spin = QDoubleSpinBox()
-        spin.setRange(0.001, 4096)
-        spin.setDecimals(3)
-        spin.setSingleStep(0.01)
-        spin.setValue(self.config.max_dataset_size_mb)
-        spin.valueChanged.connect(lambda value: setattr(self.config, "max_dataset_size_mb", value))
-        limit_adjustment_layout.addWidget(spin)
-
-        # Don't show again checkbox
-        checkbox = QCheckBox("Don't show this again for this session")
-
-        buttons = QDialogButtonBox(
-            QDialogButtonBox.Yes | QDialogButtonBox.No, Qt.Horizontal, dialog
-        )
-        buttons.accepted.connect(dialog.accept)  # Yes
-        buttons.rejected.connect(dialog.reject)  # No
-
-        # widget layout
-        main_dialog_layout.addWidget(
-            QLabel(
-                f"The selected dataset is {size_mb:.1f} MB which exceeds the "
-                f"current limit of {self.config.max_dataset_size_mb} MB.\n"
-            )
-        )
-        main_dialog_layout.addLayout(limit_adjustment_layout)
-        main_dialog_layout.addWidget(checkbox)
-        main_dialog_layout.addWidget(QLabel("Would you like to display dataset anyway?"))
-        main_dialog_layout.addWidget(buttons)
-
-        result = dialog.exec()  # modal; waits for user choice
-
-        # Respect the “don't show again” checkbox for *either* choice
-        if checkbox.isChecked():
-            self._skip_large_dataset_warning = True
-
-        if result == QDialog.Accepted:
-            self.config.max_dataset_size_mb = spin.value()
-            return True
-        return False
-
     def _ensure_str_list(self, entries: list | tuple | np.ndarray):
         """
         Convert a variety of possible inputs (string, bytes, list/tuple/ndarray of either)
@@ -1969,7 +1785,7 @@ class DemoApp(QMainWindow):  # pragma: no cover
         self.setCentralWidget(self.main_widget)
 
         self.waveform_popup = Waveform(popups=True)
-        self.waveform_popup.plot(y_name="waveform")
+        self.waveform_popup.plot(y_name="monitor_async")
 
         self.waveform_side = Waveform(popups=False)
         self.waveform_side.plot(y_name="bpm4i", y_entry="bpm4i", dap="GaussianModel")

bec_widgets/widgets/utility/logpanel/logpanel.py

@@ -11,11 +11,12 @@ from re import Pattern
 from typing import TYPE_CHECKING, Literal
 
 from bec_lib.client import BECClient
+from bec_lib.connector import ConnectorBase
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import LogLevel, bec_logger
 from bec_lib.messages import LogMessage, StatusMessage
-from pyqtgraph import SignalProxy
-from qtpy.QtCore import QDateTime, QObject, Qt, Signal
+from PySide6.QtCore import QObject
+from qtpy.QtCore import QDateTime, Qt, Signal
 from qtpy.QtGui import QFont
 from qtpy.QtWidgets import (
     QApplication,
@@ -80,11 +81,11 @@ class BecLogsQueue(BECConnector, QObject):
         parent: QObject | None,
         maxlen: int = 1000,
         line_formatter: LineFormatter = noop_format,
-        **kwargs,
     ) -> None:
-        super().__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent)
         self._timestamp_start: QDateTime | None = None
         self._timestamp_end: QDateTime | None = None
+        self._conn = self.client.connector
         self._max_length = maxlen
         self._data: deque[LogMessage] = deque([], self._max_length)
         self._display_queue: deque[str] = deque([], self._max_length)
@@ -93,24 +94,25 @@ class BecLogsQueue(BECConnector, QObject):
         self._selected_services: set[str] | None = None
         self._set_formatter_and_update_filter(line_formatter)
         # instance attribute still accessible after c++ object is deleted, so the callback can be unregistered
-        self.bec_dispatcher.connect_slot(self._process_incoming_log_msg, MessageEndpoints.log())
+        self._callback = lambda *args: self._process_incoming_log_msg(*args)
+        self._conn.register([MessageEndpoints.log()], None, self._callback)
 
-    def cleanup(self, *_):
+    def unsub_from_redis(self, *_):
         """Stop listening to the Redis log stream"""
-        self.bec_dispatcher.disconnect_slot(
-            self._process_incoming_log_msg, [MessageEndpoints.log()]
-        )
+        self._conn.unregister([MessageEndpoints.log()], None, self._callback)
 
-    @SafeSlot(verify_sender=True)
-    def _process_incoming_log_msg(self, msg: dict, _metadata: dict):
+    def _process_incoming_log_msg(self, msg: dict):
         try:
-            _msg = LogMessage(**msg)
+            _msg: LogMessage | None = msg.get("data", None)
+            if _msg is None or not isinstance(_msg, LogMessage):
+                return
             self._data.append(_msg)
             if self.filter is None or self.filter(_msg):
                 self._display_queue.append(self._line_formatter(_msg))
                 self.new_message.emit()
         except Exception as e:
             if "Internal C++ object (BecLogsQueue) already deleted." in e.args:
+                self._conn.unregister([MessageEndpoints.log()], None, self._callback)
                 return
             logger.warning(f"Error in LogPanel incoming message callback: {e}")
 
@@ -208,7 +210,7 @@ class BecLogsQueue(BECConnector, QObject):
         """Fetch all available messages from Redis"""
         self._data = deque(
             item["data"]
-            for item in self.bec_dispatcher.client.connector.xread(
+            for item in self._conn.xread(
                 MessageEndpoints.log().endpoint, from_start=True, count=self._max_length
             )
         )
@@ -402,6 +404,7 @@ class LogPanel(TextBox):
     """Displays a log panel"""
 
     ICON_NAME = "terminal"
+    _new_messages = Signal()
     service_list_update = Signal(dict, set)
 
     def __init__(
@@ -418,9 +421,7 @@ class LogPanel(TextBox):
         self._log_manager = BecLogsQueue(
             parent=self, line_formatter=partial(simple_color_format, colors=self._colors)
         )
-        self._proxy_update = SignalProxy(
-            self._log_manager.new_message, rateLimit=1, slot=self._on_append
-        )
+        self._log_manager.new_message.connect(self._new_messages)
 
         self.toolbar = LogPanelToolbar(parent=self)
         self.toolbar_area = QScrollArea()
@@ -436,6 +437,7 @@ class LogPanel(TextBox):
         self.toolbar.search_textbox.returnPressed.connect(self._on_re_update)
         self.toolbar.regex_enabled.checkStateChanged.connect(self._on_re_update)
         self.toolbar.filter_level_dropdown.currentTextChanged.connect(self._set_level_filter)
+        self._new_messages.connect(self._on_append)
 
         self.toolbar.timerange_button.clicked.connect(self._choose_datetime)
         self._service_status.services_update.connect(self._update_service_list)
@@ -487,10 +489,10 @@ class LogPanel(TextBox):
         self.set_html_text(self._log_manager.display_all())
         self._cursor_to_end()
 
-    @SafeSlot(verify_sender=True)
-    def _on_append(self, *_):
-        self.text_box_text_edit.insertHtml(self._log_manager.format_new())
+    @SafeSlot()
+    def _on_append(self):
         self._cursor_to_end()
+        self.text_box_text_edit.insertHtml(self._log_manager.format_new())
 
     @SafeSlot()
     def _on_clear(self):
@@ -533,8 +535,9 @@ class LogPanel(TextBox):
 
     def cleanup(self):
         self._service_status.cleanup()
-        self._log_manager.cleanup()
-        self._log_manager.deleteLater()
+        self._log_manager.new_message.disconnect()
+        self._new_messages.disconnect()
+        self._log_manager.unsub_from_redis()
         super().cleanup()
 
 

bec_widgets/widgets/utility/signal_label/register_signal_label.py

@@ -1,15 +0,0 @@
-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.utility.signal_label.signal_label_plugin import SignalLabelPlugin
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(SignalLabelPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/widgets/utility/signal_label/signal_label.py

@@ -1,456 +0,0 @@
-from __future__ import annotations
-
-import sys
-import traceback
-from typing import TYPE_CHECKING
-
-from bec_lib.device import Device, Signal
-from bec_lib.endpoints import MessageEndpoints
-from bec_qthemes import material_icon
-from qtpy.QtCore import Signal as QSignal
-from qtpy.QtWidgets import (
-    QApplication,
-    QComboBox,
-    QDialog,
-    QDialogButtonBox,
-    QGroupBox,
-    QHBoxLayout,
-    QLabel,
-    QLineEdit,
-    QToolButton,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ophyd_kind_util import Kind
-from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
-    DeviceInputConfig,
-)
-from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
-    DeviceSignalInputBaseConfig,
-)
-from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
-    DeviceLineEdit,
-)
-from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
-
-if TYPE_CHECKING:
-    from bec_lib.client import BECClient
-
-
-class ChoiceDialog(QDialog):
-    accepted_output = QSignal(str, str)
-
-    CONNECTION_ERROR_STR = "Error: client is not connected!"
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        config: ConnectionConfig | None = None,
-        client: BECClient | None = None,
-        show_hinted: bool = True,
-        show_normal: bool = False,
-        show_config: bool = False,
-    ):
-        if not client or not client.started:
-            self._display_error()
-            return
-        super().__init__(parent=parent)
-        self.setWindowTitle("Choose device and signal...")
-        self._accent_colors = get_accent_colors()
-
-        layout = QHBoxLayout()
-
-        config_dict = config.model_dump() if config is not None else {}
-        self._device_config = DeviceInputConfig.model_validate(config_dict)
-        self._signal_config = DeviceSignalInputBaseConfig.model_validate(config_dict)
-        self._device_field = DeviceLineEdit(
-            config=self._device_config, parent=parent, client=client
-        )
-        self._signal_field = SignalComboBox(
-            config=self._signal_config,
-            device=self._signal_config.device,
-            parent=parent,
-            client=client,
-        )
-        layout.addWidget(self._device_field)
-        layout.addWidget(self._signal_field)
-
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        self.button_box.accepted.connect(self.accept)
-        self.button_box.rejected.connect(self.reject)
-        layout.addWidget(self.button_box)
-
-        self._signal_field.include_hinted_signals = show_hinted
-        self._signal_field.include_normal_signals = show_normal
-        self._signal_field.include_config_signals = show_config
-
-        self.setLayout(layout)
-        self._device_field.textChanged.connect(self._update_device)
-        self._device_field.setText(config.device if config is not None else "")
-
-    def _display_error(self):
-        try:
-            super().__init__()
-        except Exception:
-            ...
-        layout = QHBoxLayout()
-        layout.addWidget(QLabel(self.CONNECTION_ERROR_STR))
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Cancel)
-        self.button_box.accepted.connect(self.reject)
-        layout.addWidget(self.button_box)
-        self.setLayout(layout)
-
-    @SafeSlot(str)
-    def _update_device(self, device: str):
-        if device in self._device_field.dev:
-            self._device_field.set_device(device)
-            self._signal_field.set_device(device)
-            self._device_field.setStyleSheet(
-                f"QLineEdit {{ border-style: solid; border-width: 2px; border-color: {self._accent_colors.success.name() if self._accent_colors else 'green'}}}"
-            )
-            self.button_box.button(QDialogButtonBox.Ok).setEnabled(True)
-        else:
-            self._device_field.setStyleSheet(
-                f"QLineEdit {{ border-style: solid; border-width: 2px; border-color: {self._accent_colors.emergency.name() if self._accent_colors else 'red'}}}"
-            )
-            self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
-            self._signal_field.clear()
-
-    def accept(self):
-        self.accepted_output.emit(self._device_field.text(), self._signal_field.currentText())
-        return super().accept()
-
-
-class SignalLabel(BECWidget, QWidget):
-
-    ICON_NAME = "scoreboard"
-    RPC = True
-    PLUGIN = True
-
-    USER_ACCESS = [
-        "custom_label",
-        "custom_units",
-        "custom_label.setter",
-        "custom_units.setter",
-        "decimal_places",
-        "decimal_places.setter",
-        "show_default_units",
-        "show_default_units.setter",
-        "show_select_button",
-        "show_select_button.setter",
-    ]
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        client: BECClient | None = None,
-        device: str | None = None,
-        signal: str | None = None,
-        show_select_button: bool = True,
-        show_default_units: bool = False,
-        custom_label: str = "",
-        custom_units: str = "",
-        **kwargs,
-    ):
-        """Initialize the SignalLabel widget.
-
-        Args:
-            parent (QWidget, optional): The parent widget. Defaults to None.
-            client (BECClient, optional): The BEC client. Defaults to None.
-            device (str, optional): The device name. Defaults to None.
-            signal (str, optional): The signal name. Defaults to None.
-            selection_dialog_config (DeviceSignalInputBaseConfig | dict, optional): Configuration for the signal selection dialog.
-            show_select_button (bool, optional): Whether to show the select button. Defaults to True.
-            show_default_units (bool, optional): Whether to show default units. Defaults to False.
-            custom_label (str, optional): Custom label for the widget. Defaults to "".
-            custom_units (str, optional): Custom units for the widget. Defaults to "".
-        """
-        self._config = DeviceSignalInputBaseConfig(default=signal, device=device)
-        super().__init__(parent=parent, client=client, **kwargs)
-
-        self._device = device
-        self._signal = signal
-
-        self._custom_label: str = custom_label
-        self._custom_units: str = custom_units
-        self._show_default_units: bool = show_default_units
-        self._decimal_places = 3
-
-        self._show_hinted_signals: bool = True
-        self._show_normal_signals: bool = False
-        self._show_config_signals: bool = False
-
-        self._outer_layout = QHBoxLayout()
-        self._layout = QHBoxLayout()
-        self._outer_layout.setContentsMargins(0, 0, 0, 0)
-        self._layout.setContentsMargins(0, 0, 0, 0)
-        self.setLayout(self._outer_layout)
-
-        self._label = QGroupBox(custom_label)
-        self._outer_layout.addWidget(self._label)
-        self._update_label()
-        self._label.setLayout(self._layout)
-
-        self._value: str = ""
-        self._display = QLabel()
-        self._layout.addWidget(self._display)
-
-        self._select_button = QToolButton()
-        self._select_button.setIcon(material_icon(icon_name="settings", size=(20, 20)))
-        self._show_select_button: bool = show_select_button
-        self._layout.addWidget(self._select_button)
-        self._display.setMinimumHeight(self._select_button.sizeHint().height())
-        self.show_select_button = self._show_select_button
-
-        self._select_button.clicked.connect(self.show_choice_dialog)
-        self.get_bec_shortcuts()
-
-        self._connected: bool = False
-        self.connect_device()
-
-    def _create_dialog(self):
-        return ChoiceDialog(
-            config=self._config,
-            parent=self,
-            client=self.client,
-            show_config=self.show_config_signals,
-            show_normal=self.show_normal_signals,
-            show_hinted=self.show_hinted_signals,
-        )
-
-    @SafeSlot()
-    def _process_dialog(self, device: str, signal: str):
-        self.disconnect_device()
-        self.device = device
-        self.signal = signal
-        self._update_label()
-        self.connect_device()
-
-    def show_choice_dialog(self):
-        dialog = self._create_dialog()
-        dialog.accepted_output.connect(self._process_dialog)
-        dialog.open()
-        return dialog
-
-    def connect_device(self):
-        """Subscribe to the Redis topic for the device to display"""
-        if not self._connected and self._device and self._device in self.dev:
-            self._connected = True
-            self._readback_endpoint = MessageEndpoints.device_readback(self._device)
-            self.bec_dispatcher.connect_slot(self.on_device_readback, self._readback_endpoint)
-            self._manual_read()
-            self.set_display_value(self._value)
-
-    def disconnect_device(self):
-        """Unsubscribe from the Redis topic for the device to display"""
-        if self._connected:
-            self._connected = False
-            self.bec_dispatcher.disconnect_slot(self.on_device_readback, self._readback_endpoint)
-
-    def _manual_read(self):
-        if self._device is None or not isinstance(
-            (device := self.dev.get(self._device)), Device | Signal
-        ):
-            self._units = ""
-            self._value = "__"
-            return
-        signal: Signal = (
-            getattr(device, self.signal, None) if isinstance(device, Device) else device
-        )
-        if not isinstance(signal, Signal):  # Avoid getting other attributes of device, e.g. methods
-            signal = None
-        if signal is None:
-            self._units = ""
-            self._value = "__"
-            return
-        self._value = signal.get()
-        self._units = signal.get_device_config().get("egu", "")
-
-    @SafeSlot(dict, dict)
-    def on_device_readback(self, msg: dict, metadata: dict) -> None:
-        """
-        Update the display with the new value.
-        """
-        try:
-            signal_to_read = self._patch_hinted_signal()
-            self._value = msg["signals"][signal_to_read]["value"]
-            self.set_display_value(self._value)
-        except Exception as e:
-            self._display.setText("ERROR!")
-            self._display.setToolTip(
-                f"Error processing incoming reading: {msg}, handled with exception: {''.join(traceback.format_exception(e))}"
-            )
-
-    def _patch_hinted_signal(self):
-        if self.dev[self._device]._info["signals"] == {}:
-            return self._signal
-        signal_info = self.dev[self._device]._info["signals"][self._signal]
-        return (
-            signal_info["obj_name"] if signal_info["kind_str"] == Kind.hinted.name else self._signal
-        )
-
-    @SafeProperty(str)
-    def device(self) -> str:
-        """The device from which to select a signal"""
-        return self._device or "Not set!"
-
-    @device.setter
-    def device(self, value: str) -> None:
-        self.disconnect_device()
-        self._device = value
-        self._config.device = value
-        self.connect_device()
-        self._update_label()
-
-    @SafeProperty(str)
-    def signal(self) -> str:
-        """The signal to display"""
-        return self._signal or "Not set!"
-
-    @signal.setter
-    def signal(self, value: str) -> None:
-        self.disconnect_device()
-        self._signal = value
-        self._config.default = value
-        self.connect_device()
-        self._update_label()
-
-    @SafeProperty(bool)
-    def show_select_button(self) -> bool:
-        """Show the button to select the signal to display"""
-        return self._show_select_button
-
-    @show_select_button.setter
-    def show_select_button(self, value: bool) -> None:
-        self._show_select_button = value
-        self._select_button.setVisible(value)
-
-    @SafeProperty(bool)
-    def show_default_units(self) -> bool:
-        """Show default units obtained from the signal alongside it"""
-        return self._show_default_units
-
-    @show_default_units.setter
-    def show_default_units(self, value: bool) -> None:
-        self._show_default_units = value
-        self.set_display_value(self._value)
-
-    @SafeProperty(str)
-    def custom_label(self) -> str:
-        """Use a cusom label rather than the signal name"""
-        return self._custom_label
-
-    @custom_label.setter
-    def custom_label(self, value: str) -> None:
-        self._custom_label = value
-        self._update_label()
-
-    @SafeProperty(str)
-    def custom_units(self) -> str:
-        """Use a custom unit string"""
-        return self._custom_units
-
-    @custom_units.setter
-    def custom_units(self, value: str) -> None:
-        self._custom_units = value
-        self.set_display_value(self._value)
-
-    @SafeProperty(int)
-    def decimal_places(self) -> int:
-        """Format to a given number of decimal_places. Set to 0 to disable."""
-        return self._decimal_places
-
-    @decimal_places.setter
-    def decimal_places(self, value: int) -> None:
-        self._decimal_places = value
-        self._update_label()
-
-    @SafeProperty(bool)
-    def show_hinted_signals(self) -> bool:
-        """In the signal selection menu, show hinted signals"""
-        return self._show_hinted_signals
-
-    @show_hinted_signals.setter
-    def show_hinted_signals(self, value: bool) -> None:
-        self._show_hinted_signals = value
-
-    @SafeProperty(bool)
-    def show_config_signals(self) -> bool:
-        """In the signal selection menu, show config signals"""
-        return self._show_config_signals
-
-    @show_config_signals.setter
-    def show_config_signals(self, value: bool) -> None:
-        self._show_config_signals = value
-
-    @SafeProperty(bool)
-    def show_normal_signals(self) -> bool:
-        """In the signal selection menu, show normal signals"""
-        return self._show_normal_signals
-
-    @show_normal_signals.setter
-    def show_normal_signals(self, value: bool) -> None:
-        self._show_normal_signals = value
-
-    def _format_value(self, value: str):
-        if self._decimal_places == 0:
-            return value
-        try:
-            return f"{float(value):0.{self._decimal_places}f}"
-        except ValueError:
-            return value
-
-    @SafeSlot(str)
-    def set_display_value(self, value: str):
-        """Set the display to a given value, appending the units if specified"""
-        self._display.setText(f"{self._format_value(value)}{self._units_string}")
-        self._display.setToolTip("")
-
-    @property
-    def _units_string(self):
-        if self.custom_units or self._show_default_units:
-            return f" {self.custom_units or self._default_units or ''}"
-        return ""
-
-    @property
-    def _default_units(self) -> str:
-        return self._units
-
-    @property
-    def _default_label(self) -> str:
-        return (
-            str(self._signal) if self._device == self._signal else f"{self._device} {self._signal}"
-        )
-
-    def _update_label(self):
-        self._label.setTitle(
-            self._custom_label if self._custom_label else f"{self._default_label}:"
-        )
-
-
-if __name__ == "__main__":
-
-    app = QApplication(sys.argv)
-    w = QWidget()
-    w.setLayout(QVBoxLayout())
-    w.layout().addWidget(
-        SignalLabel(
-            device="samx",
-            signal="readback",
-            custom_label="custom label:",
-            custom_units=" m/s/s",
-            show_select_button=False,
-        )
-    )
-    w.layout().addWidget(SignalLabel(device="samy", signal="readback", show_default_units=True))
-    l = SignalLabel()
-    l.device = "bpm4i"
-    l.signal = "bpm4i"
-    w.layout().addWidget(l)
-    w.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/utility/signal_label/signal_label.pyproject

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

bec_widgets/widgets/utility/signal_label/signal_label_plugin.py

@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-
-from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.signal_label.signal_label import SignalLabel
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='SignalLabel' name='signal_label'>
-    </widget>
-</ui>
-"""
-
-
-class SignalLabelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = SignalLabel(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return "BEC Utils"
-
-    def icon(self):
-        return designer_material_icon(SignalLabel.ICON_NAME)
-
-    def includeFile(self):
-        return "signal_label"
-
-    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 "SignalLabel"
-
-    def toolTip(self):
-        return "Display the live value of any signal"
-
-    def whatsThis(self):
-        return self.toolTip()

docs/user/widgets/signal_label/signal_label.md

@@ -1,102 +0,0 @@
-(user.widgets.signal_label)=
-
-# Signal Label widget
-
-````{tab} Overview
-
-The [`SignalLabel`](/api_reference/_autosummary/bec_widgets.cli.client.SignalLabel) displays the value of a signal from a device, with optional customization for labels, units, decimal formatting, and signal selection. It is designed for use in BEC (Beamline Experiment Control) GUIs to monitor values which beamline operators might want to keep an eye on, e.g. sample position, flux, hutch state...
-
-## Key Features:
-- Display: Shows the current value of a device signal.
-- Custom Label/Units: Optionally override the default label and units.
-- Decimal Formatting: Control the number of decimal places shown.
-- Signal Selection: (Optional) Button to open a dialog for selecting a device and signal.
-- Live Updates: Subscribes to device updates and refreshes the display automatically.
-
-
-````
-
-````{tab} Examples - python
-
-The `SignalLabel` widget can be used inside another widget to build an overall GUI display. For example, to create a display
-for the sample position like this:
-
-
-```{figure} ./test_screenshot.png
-```
-
-You can simply add three of these signal displays as done here:
-
-```python
-import sys
-
-from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.utility.signal_label.signal_label import SignalLabel
-
-
-class SamplePositionWidget(BECWidget, QWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-        self.setLayout(QVBoxLayout())
-        self.samx_readback = SignalLabel(
-            device="samx",
-            signal="readback",
-            custom_label="Sample X:",
-            custom_units="mm",
-            show_select_button=False,
-            show_default_units=False,
-        )
-        self.samy_readback = SignalLabel(
-            device="samy",
-            signal="readback",
-            custom_label="Sample Y:",
-            custom_units="mm",
-            show_select_button=False,
-            show_default_units=False,
-        )
-        self.samz_readback = SignalLabel(
-            device="samz",
-            signal="readback",
-            custom_label="Sample Z:",
-            custom_units="mm",
-            show_select_button=False,
-            show_default_units=False,
-        )
-        self.layout().addWidget(self.samx_readback)
-        self.layout().addWidget(self.samy_readback)
-        self.layout().addWidget(self.samz_readback)
-
-
-if __name__ == "__main__":
-    app = QApplication()
-    w = SamplePositionWidget()
-    w.show()
-    sys.exit(app.exec_())
-
-```
-
-````
-
-````{tab} Examples - BEC desginer
-The various properties can also be set when the SignalLabel widget is added to a UI in BEC designer:
-
-```{figure} ./designer_screenshot.png
-```
-````
-
-````{tab} API
-```{eval-rst} 
-.. include:: /api_reference/_autosummary/bec_widgets.cli.client.TextBox.rst
-```
-````
-
-
-
-
-
-
-
-
-

docs/user/widgets/widgets.md

@@ -175,14 +175,6 @@ Various buttons which manage the control of the BEC Queue.
 Choose individual device from current session.
 ```
 
-```{grid-item-card} Signal Label
-:link: user.widgets.signal_label
-:link-type: ref
-:img-top: ./signal_label/test_screenshot.png
-
-Display the live value of a signal.
-```
-
 ```{grid-item-card} Signal Input Widgets
 :link: user.widgets.signal_input
 :link-type: ref
@@ -297,7 +289,5 @@ lmfit_dialog/lmfit_dialog.md
 dap_combo_box/dap_combo_box.md
 games/games.md
 log_panel/log_panel.md
-signal_label/signal_label.md
-
 
 ```

pyproject.toml

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

tests/end-2-end/test_with_plugins_e2e.py

@@ -1,12 +1,7 @@
 import time
 
 import pytest
-
-try:
-    from bec_testing_plugin.scans.metadata_schema.custom_test_scan_schema import CustomScanSchema
-except ImportError:
-    pytest.skip(reason="Requires plugin repo!", allow_module_level=True)
-
+from bec_testing_plugin.scans.metadata_schema.custom_test_scan_schema import CustomScanSchema
 from qtpy.QtWidgets import QGridLayout
 
 from bec_widgets.utils.widget_io import WidgetIO

tests/unit_tests/test_crosshair.py

@@ -236,7 +236,7 @@ def test_update_coord_label_1D(plot_widget_with_crosshair):
     # Provide a test position
     pos = (10, 20)
     crosshair.update_coord_label(pos)
-    expected_text = f"({10:.3f}, {20:.3f})"
+    expected_text = f"({10:.3g}, {20:.3g})"
     # Verify that the coordinate label shows only the 1D coordinates (no intensity line)
     assert crosshair.coord_label.toPlainText() == expected_text
     label_pos = crosshair.coord_label.pos()
@@ -260,54 +260,10 @@ def test_update_coord_label_2D(image_widget_with_crosshair):
     ix = int(np.clip(0.5, 0, known_image.shape[0] - 1))  # 0
     iy = int(np.clip(1.2, 0, known_image.shape[1] - 1))  # 1
     intensity = known_image[ix, iy]  # Expected: 20
-    expected_text = f"({0.5:.3f}, {1.2:.3f})\nIntensity: {intensity:.3f}"
+    expected_text = f"({0.5:.3g}, {1.2:.3g})\nIntensity: {intensity:.3g}"
 
     assert crosshair.coord_label.toPlainText() == expected_text
     label_pos = crosshair.coord_label.pos()
     assert np.isclose(label_pos.x(), 0.5)
     assert np.isclose(label_pos.y(), 1.2)
     assert crosshair.coord_label.isVisible()
-
-
-def test_crosshair_precision_properties(plot_widget_with_crosshair):
-    """
-    Ensure Crosshair.precision and Crosshair.min_precision behave correctly
-    and that _current_precision() reflects changes immediately.
-    """
-    crosshair, plot_item = plot_widget_with_crosshair
-
-    assert crosshair.precision == 3
-    assert crosshair._current_precision() == 3
-
-    crosshair.precision = None
-    plot_item.vb.setXRange(0, 1_000, padding=0)
-    plot_item.vb.setYRange(0, 1_000, padding=0)
-    assert crosshair._current_precision() == crosshair.min_precision == 2  # default floor
-
-    crosshair.min_precision = 5
-    assert crosshair._current_precision() == 5
-
-    crosshair.precision = 1
-    assert crosshair._current_precision() == 1
-
-
-def test_crosshair_precision_properties_image(image_widget_with_crosshair):
-    """
-    The same precision/min_precision behaviour must apply for crosshairs attached
-    to ImageItem-based plots.
-    """
-    crosshair, plot_item = image_widget_with_crosshair
-
-    assert crosshair.precision == 3
-    assert crosshair._current_precision() == 3
-
-    crosshair.precision = None
-    plot_item.vb.setXRange(0, 1_000, padding=0)
-    plot_item.vb.setYRange(0, 1_000, padding=0)
-    assert crosshair._current_precision() == crosshair.min_precision == 2
-
-    crosshair.min_precision = 6
-    assert crosshair._current_precision() == 6
-
-    crosshair.precision = 2
-    assert crosshair._current_precision() == 2

tests/unit_tests/test_device_signal_input.py

@@ -67,7 +67,7 @@ def test_device_signal_combo(qtbot, mocked_client):
 def test_device_signal_base_init(device_signal_base):
     """Test if the DeviceSignalInputBase is initialized correctly"""
     assert device_signal_base._device is None
-    assert device_signal_base._signal_filter == set()
+    assert device_signal_base._signal_filter == []
     assert device_signal_base._signals == []
     assert device_signal_base._hinted_signals == []
     assert device_signal_base._normal_signals == []
@@ -76,22 +76,12 @@ def test_device_signal_base_init(device_signal_base):
 
 def test_device_signal_qproperties(device_signal_base):
     """Test if the DeviceSignalInputBase has the correct QProperties"""
-    assert device_signal_base._signal_filter == set()
-    device_signal_base.include_config_signals = False
-    device_signal_base.include_normal_signals = False
-    assert device_signal_base._signal_filter == set()
     device_signal_base.include_config_signals = True
-    assert device_signal_base._signal_filter == {Kind.config}
+    assert device_signal_base._signal_filter == [Kind.config]
     device_signal_base.include_normal_signals = True
-    assert device_signal_base._signal_filter == {Kind.config, Kind.normal}
+    assert device_signal_base._signal_filter == [Kind.config, Kind.normal]
     device_signal_base.include_hinted_signals = True
-    assert device_signal_base._signal_filter == {Kind.config, Kind.normal, Kind.hinted}
-    device_signal_base.include_hinted_signals = True
-    assert device_signal_base._signal_filter == {Kind.config, Kind.normal, Kind.hinted}
-    device_signal_base.include_hinted_signals = True
-    assert device_signal_base._signal_filter == {Kind.config, Kind.normal, Kind.hinted}
-    device_signal_base.include_hinted_signals = False
-    assert device_signal_base._signal_filter == {Kind.config, Kind.normal}
+    assert device_signal_base._signal_filter == [Kind.config, Kind.normal, Kind.hinted]
 
 
 def test_device_signal_set_device(device_signal_base):
@@ -133,7 +123,7 @@ def test_signal_combobox(qtbot, device_signal_combobox):
     assert device_signal_combobox._hinted_signals == ["fake_signal"]
 
 
-def test_signal_lineedit(device_signal_line_edit):
+def test_signal_lineeidt(device_signal_line_edit):
     """Test the signal_combobox"""
 
     assert device_signal_line_edit._signals == []

tests/unit_tests/test_logpanel.py

@@ -66,6 +66,7 @@ def log_panel(qtbot, mocked_client: MagicMock):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
+    widget.cleanup()
 
 
 def test_log_panel_init(log_panel: LogPanel):
@@ -97,13 +98,14 @@ def test_logpanel_output(qtbot, log_panel: LogPanel):
         return len(log_panel._log_manager._display_queue) == 0
 
     next_text = "datetime | error | test log message"
-    msg = LogMessage(
-        metadata={},
-        log_type="error",
-        log_msg={"text": next_text, "record": {}, "service_name": "ScanServer"},
-    )
     log_panel._log_manager._process_incoming_log_msg(
-        msg.content, msg.metadata, _override_slot_params={"verify_sender": False}
+        {
+            "data": LogMessage(
+                metadata={},
+                log_type="error",
+                log_msg={"text": next_text, "record": {}, "service_name": "ScanServer"},
+            )
+        }
     )
 
     qtbot.waitUntil(display_queue_empty, timeout=5000)
@@ -140,22 +142,16 @@ def test_timestamp_filter(log_panel: LogPanel):
 def test_error_handling_in_callback(log_panel: LogPanel):
     log_panel._log_manager.new_message = MagicMock()
 
+    cbs = (lambda: log_panel._log_manager._process_incoming_log_msg, {})
     with patch("bec_widgets.widgets.utility.logpanel.logpanel.logger") as logger:
         # generally errors should be logged
         log_panel._log_manager.new_message.emit = MagicMock(
             side_effect=ValueError("Something went wrong")
         )
-        msg = LogMessage(
-            metadata={},
-            log_type="debug",
-            log_msg={
-                "text": "datetime | debug | test log message",
-                "record": {"time": {"timestamp": 123456789.000}},
-                "service_name": "ScanServer",
-            },
-        )
-        log_panel._log_manager._process_incoming_log_msg(
-            msg.content, msg.metadata, _override_slot_params={"verify_sender": False}
+        log_panel.client.connector._handle_message(
+            msg=StreamMessage(
+                msg={"data": LogMessage(log_type="debug", log_msg="message")}, callbacks=[cbs]
+            )
         )
         logger.warning.assert_called_once()
 
@@ -163,7 +159,9 @@ def test_error_handling_in_callback(log_panel: LogPanel):
         log_panel._log_manager.new_message.emit = MagicMock(
             side_effect=RuntimeError("Internal C++ object (BecLogsQueue) already deleted.")
         )
-        log_panel._log_manager._process_incoming_log_msg(
-            msg.content, msg.metadata, _override_slot_params={"verify_sender": False}
+        log_panel.client.connector._handle_message(
+            msg=StreamMessage(
+                msg={"data": LogMessage(log_type="debug", log_msg="message")}, callbacks=[cbs]
+            )
         )
         logger.warning.assert_called_once()

tests/unit_tests/test_plot_base_next_gen.py

@@ -349,39 +349,3 @@ def test_enable_fps_monitor_property(qtbot, mocked_client):
 
     pb.enable_fps_monitor = False
     assert pb.fps_monitor is None
-
-
-def test_minimal_crosshair_precision_default(qtbot, mocked_client):
-    """
-    By default PlotBase should expose a floor of 3 decimals, with no crosshair yet.
-    """
-    pb = create_widget(qtbot, PlotBase, client=mocked_client)
-    assert pb.minimal_crosshair_precision == 3
-    assert pb.crosshair is None
-
-
-def test_minimal_crosshair_precision_before_hook(qtbot, mocked_client):
-    """
-    If the floor is changed before hook_crosshair(), the new crosshair must pick it up.
-    """
-    pb = create_widget(qtbot, PlotBase, client=mocked_client)
-    pb.minimal_crosshair_precision = 5
-    pb.hook_crosshair()
-    assert pb.crosshair is not None
-    assert pb.crosshair.min_precision == 5
-
-
-def test_minimal_crosshair_precision_after_hook(qtbot, mocked_client):
-    """
-    Changing the floor after the crosshair exists should update it immediately
-    and emit the property_changed signal.
-    """
-    pb = create_widget(qtbot, PlotBase, client=mocked_client)
-    pb.hook_crosshair()
-    assert pb.crosshair is not None
-
-    with qtbot.waitSignal(pb.property_changed, timeout=500) as sig:
-        pb.minimal_crosshair_precision = 1
-
-    assert sig.args == ["minimal_crosshair_precision", 1]
-    assert pb.crosshair.min_precision == 1

tests/unit_tests/test_signal_label.py

@@ -1,243 +0,0 @@
-from __future__ import annotations
-
-from unittest.mock import MagicMock, patch
-
-import pytest
-from qtpy import QtCore
-from qtpy.QtWidgets import QDialogButtonBox, QLabel
-
-from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
-    DeviceSignalInputBaseConfig,
-)
-from bec_widgets.widgets.utility.signal_label.signal_label import ChoiceDialog, SignalLabel
-
-from .client_mocks import mocked_client
-
-SAMX_INFO_DICT = {
-    "signals": {
-        "readback": {
-            "component_name": "readback",
-            "obj_name": "samx",
-            "kind_int": 5,
-            "kind_str": "hinted",
-            "doc": "",
-            "describe": {"source": "SIM:samx", "dtype": "integer", "shape": [], "precision": 3},
-            "metadata": {
-                "connected": True,
-                "read_access": True,
-                "write_access": False,
-                "timestamp": 123456.789,
-                "status": None,
-                "severity": None,
-                "precision": None,
-            },
-        }
-    },
-    "setpoint": {
-        "component_name": "setpoint",
-        "obj_name": "samx_setpoint",
-        "kind_int": 1,
-        "kind_str": "normal",
-        "doc": "",
-        "describe": {
-            "source": "SIM:samx_setpoint",
-            "dtype": "integer",
-            "shape": [],
-            "precision": 3,
-        },
-        "metadata": {
-            "connected": True,
-            "read_access": True,
-            "write_access": True,
-            "timestamp": 1747657955.012516,
-            "status": None,
-            "severity": None,
-            "precision": None,
-        },
-    },
-}
-
-
-@pytest.fixture
-def signal_label(qtbot, mocked_client: MagicMock):
-    with patch.object(mocked_client.device_manager.devices.samx, "_info", SAMX_INFO_DICT):
-        config = DeviceSignalInputBaseConfig(device="samx", default="samx")
-        widget = SignalLabel(
-            config=config, custom_label="Test Label", custom_units="m/s", client=mocked_client
-        )
-        qtbot.addWidget(widget)
-        qtbot.waitExposed(widget)
-        widget.show()
-        yield widget
-
-
-def test_initialization(signal_label: SignalLabel):
-    """Test the initialization of the SignalLabel widget."""
-    assert signal_label.device == "Not set!"
-    assert signal_label.custom_label == "Test Label"
-    assert signal_label.custom_units == "m/s"
-    assert signal_label.show_select_button is True
-    assert signal_label.show_default_units is False
-    assert signal_label.decimal_places == 3
-    signal_label.set_display_value()
-    assert signal_label._display.text() == ""
-
-
-def test_initialization_with_device(qtbot, mocked_client: MagicMock):
-    with patch.object(mocked_client.device_manager.devices.samx, "_info", SAMX_INFO_DICT):
-        widget = SignalLabel(device="samx", signal="readback", client=mocked_client)
-        qtbot.addWidget(widget)
-        qtbot.waitExposed(widget)
-        widget.show()
-        assert widget._label.title() == "samx readback:"
-
-
-def test_set_display_value(signal_label: SignalLabel, qtbot):
-    qtbot.addWidget(signal_label)
-    signal_label.set_display_value("123.456")
-    assert signal_label._display.text() == "123.456 m/s"
-
-
-def test_show_select_button(signal_label: SignalLabel, qtbot):
-    assert signal_label.show_select_button == True
-    qtbot.waitUntil(lambda: signal_label._select_button.isVisible(), timeout=1000)
-    signal_label.show_select_button = False
-    qtbot.waitUntil(lambda: not signal_label._select_button.isVisible(), timeout=1000)
-    signal_label.show_select_button = True
-    qtbot.waitUntil(lambda: signal_label._select_button.isVisible(), timeout=1000)
-
-
-def test_show_default_units(signal_label: SignalLabel, qtbot):
-    signal_label.show_default_units = True
-    assert signal_label.show_default_units is True
-    signal_label.show_default_units = False
-    assert signal_label.show_default_units is False
-
-
-def test_custom_label(signal_label: SignalLabel, qtbot):
-    signal_label.custom_label = "New Label"
-    assert signal_label._label.title() == "New Label"
-
-
-def test_units_in_display(signal_label: SignalLabel, qtbot):
-    signal_label._value = "1.8"
-    signal_label.custom_units = "Mfurlong μfortnight⁻¹"
-    assert signal_label._display.text() == "1.800 Mfurlong μfortnight⁻¹"
-
-
-def test_decimal_places(signal_label: SignalLabel, qtbot):
-    signal_label.decimal_places = 2
-    signal_label.set_display_value("123.456")
-    assert signal_label._display.text() == "123.46 m/s"
-    signal_label.decimal_places = 0
-    signal_label.set_display_value("123.456")
-    assert signal_label._display.text() == "123.456 m/s"
-
-
-def test_choose_signal_dialog_sends_choices(signal_label: SignalLabel, qtbot):
-    signal_label._process_dialog = MagicMock()
-    dialog = signal_label.show_choice_dialog()
-    qtbot.waitUntil(dialog.button_box.button(QDialogButtonBox.Ok).isVisible, timeout=500)
-    dialog._device_field.dev["test device"] = MagicMock()
-    dialog._device_field.setText("test device")
-    dialog._signal_field.addItem("test signal")
-    dialog._signal_field.setCurrentIndex(0)
-    qtbot.mouseClick(dialog.button_box.button(QDialogButtonBox.Ok), QtCore.Qt.LeftButton)
-    qtbot.waitUntil(lambda: not dialog.isVisible(), timeout=1000)
-    signal_label._process_dialog.assert_called_once_with("test device", "test signal")
-
-
-def test_dialog_handler_updates_devices(signal_label: SignalLabel, qtbot):
-    dialog = signal_label.show_choice_dialog()
-    qtbot.waitUntil(dialog.button_box.button(QDialogButtonBox.Ok).isVisible, timeout=500)
-    dialog._device_field.dev["flux_capacitor"] = MagicMock()
-    dialog._device_field.setText("flux_capacitor")
-    dialog._signal_field.addItem("spin_speed")
-    dialog._signal_field.setCurrentIndex(0)
-    qtbot.mouseClick(dialog.button_box.button(QDialogButtonBox.Ok), QtCore.Qt.LeftButton)
-    qtbot.waitUntil(lambda: not dialog.isVisible(), timeout=1000)
-    assert signal_label._device == "flux_capacitor"
-    assert signal_label._signal == "spin_speed"
-
-
-def test_choose_signal_dialog_invalid_device(signal_label: SignalLabel, qtbot):
-    signal_label._process_dialog = MagicMock()
-    dialog = signal_label.show_choice_dialog()
-    qtbot.waitUntil(dialog.button_box.button(QDialogButtonBox.Ok).isVisible, timeout=500)
-    dialog._device_field.setText("invalid device")
-    dialog._signal_field.addItem("test signal")
-    dialog._signal_field.setCurrentIndex(0)
-    qtbot.mouseClick(dialog.button_box.button(QDialogButtonBox.Ok), QtCore.Qt.LeftButton)
-    qtbot.wait(100)
-    qtbot.mouseClick(dialog.button_box.button(QDialogButtonBox.Cancel), QtCore.Qt.LeftButton)
-    qtbot.waitUntil(lambda: not dialog.isVisible(), timeout=1000)
-    signal_label._process_dialog.assert_not_called()
-
-
-def test_choice_dialog_with_no_client(qtbot):
-    dialog = ChoiceDialog()
-    qtbot.addWidget(dialog)
-
-    assert dialog.button_box.button(QDialogButtonBox.Ok) is None
-    assert dialog.button_box.button(QDialogButtonBox.Cancel) is not None
-    assert dialog.layout().itemAt(0).widget().text() == ChoiceDialog.CONNECTION_ERROR_STR
-
-
-def test_dialog_has_signals(signal_label: SignalLabel, qtbot):
-    signal_label._process_dialog = MagicMock()
-    dialog = signal_label.show_choice_dialog()
-    qtbot.waitUntil(dialog.button_box.button(QDialogButtonBox.Ok).isVisible, timeout=500)
-    dialog._device_field.dev["test device"] = MagicMock()
-    dialog._device_field.dev["test device"]._info = {
-        "signals": {"signal 1": {"kind_str": "hinted"}, "signal 2": {"kind_str": "normal"}}
-    }
-
-    dialog._device_field.setText("test device")
-    assert dialog._signal_field.count() == 2  # the actual signal and the category label
-    assert dialog._signal_field.currentText() == "signal 1"
-
-
-def test_set_existing_device_and_signal(signal_label: SignalLabel, qtbot):
-    signal_label.device = "samx"
-    signal_label.signal = "readback"
-    assert signal_label._device == "samx"
-    assert signal_label._config.device == "samx"
-    assert signal_label._signal == "readback"
-    assert signal_label._config.default == "readback"
-
-
-def test_set_nonexisting_device_and_signal(signal_label: SignalLabel, qtbot):
-    signal_label.custom_units = ""
-    signal_label.device = "samq"
-    signal_label.signal = "readfront"
-    assert signal_label._device == "samq"
-    assert signal_label._config.device == "samq"
-    signal_label._manual_read()
-    signal_label.set_display_value(signal_label._value)
-    assert signal_label._display.text() == "__"
-    assert signal_label._signal == "readfront"
-    assert signal_label._config.default == "readfront"
-    signal_label._manual_read()
-    signal_label.set_display_value(signal_label._value)
-    assert signal_label._display.text() == "__"
-
-
-def test_handle_readback(signal_label: SignalLabel, qtbot):
-    signal_label.device = "samx"
-    signal_label.signal = "readback"
-    signal_label.custom_units = "μm"
-    signal_label.on_device_readback({"random": {"stuff": "in", "corrupted": "reading"}}, {})
-    assert signal_label._display.text() == "ERROR!"
-    assert "Error processing incoming reading" in signal_label._display.toolTip()
-    signal_label.on_device_readback(
-        {
-            "signals": {
-                "samx": {"value": 0.9927490347496489, "timestamp": 1747662246.3741279},
-                "samx_setpoint": {"value": 1.0, "timestamp": 1747662246.368704},
-                "samx_motor_is_moving": {"value": 0, "timestamp": 1747662246.373092},
-            }
-        },
-        {},
-    )
-    assert signal_label._display.text() == "0.993 μm"
-    assert signal_label._display.toolTip() == ""

tests/unit_tests/test_waveform_next_gen.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 from types import SimpleNamespace
 from unittest import mock
@@ -9,15 +7,6 @@ import numpy as np
 import pyqtgraph as pg
 import pytest
 from pyqtgraph.graphicsItems.DateAxisItem import DateAxisItem
-from qtpy.QtCore import QTimer
-from qtpy.QtWidgets import (
-    QApplication,
-    QCheckBox,
-    QDialog,
-    QDialogButtonBox,
-    QDoubleSpinBox,
-    QSpinBox,
-)
 
 from bec_widgets.widgets.plots.plot_base import UIMode
 from bec_widgets.widgets.plots.waveform.curve import DeviceSignal
@@ -544,7 +533,6 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
     """
     wf = create_widget(qtbot, Waveform, client=mocked_client)
     wf.scan_item = create_dummy_scan_item()
-    wf._scan_done = False  # simulate a live scan
     c = wf.plot(arg1="async_device", label="async_device-async_device")
     wf._async_curves = [c]
     # Suppose existing data
@@ -831,227 +819,3 @@ def test_show_dap_summary_popup(qtbot, mocked_client):
     wf.dap_summary_dialog.close()
     assert wf.dap_summary_dialog is None
     assert fit_action.isChecked() is False
-
-
-#####################################################
-# The following tests are for the async dataset guard
-#####################################################
-
-
-def test_skip_large_dataset_warning_property(qtbot, mocked_client):
-    """
-    Verify the getter and setter of skip_large_dataset_warning work correctly.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-
-    # Default should be False
-    assert wf.skip_large_dataset_warning is False
-
-    # Set to True
-    wf.skip_large_dataset_warning = True
-    assert wf.skip_large_dataset_warning is True
-
-    # Toggle back to False
-    wf.skip_large_dataset_warning = False
-    assert wf.skip_large_dataset_warning is False
-
-
-def test_max_dataset_size_mb_property(qtbot, mocked_client):
-    """
-    Verify getter, setter, and validation of max_dataset_size_mb.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-
-    # Default from WaveformConfig is 1 MB
-    assert wf.max_dataset_size_mb == 10
-
-    # Set to a valid new value
-    wf.max_dataset_size_mb = 5.5
-    assert wf.max_dataset_size_mb == 5.5
-    # Ensure the config is updated too
-    assert wf.config.max_dataset_size_mb == 5.5
-
-
-def _dummy_dataset(mem_bytes: int, entry: str = "waveform_waveform"):
-    """
-    Return an object that mimics the BEC dataset structure:
-    it has exactly one attribute `_info` with the expected layout.
-    """
-    return SimpleNamespace(_info={entry: {"value": {"mem_size": mem_bytes}}})
-
-
-def test_dataset_guard_under_limit(qtbot, mocked_client, monkeypatch):
-    """
-    Dataset below the limit should load without triggering the dialog.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1  # 1 MiB
-
-    # If the dialog is called, we flip this flag – it must stay False.
-    called = {"dlg": False}
-    monkeypatch.setattr(
-        Waveform, "_confirm_large_dataset", lambda self, size_mb: called.__setitem__("dlg", True)
-    )
-
-    dataset = _dummy_dataset(mem_bytes=512_000)  # ≈0.49 MiB
-    assert wf._check_dataset_size_and_confirm(dataset, "waveform_waveform") is True
-    assert called["dlg"] is False
-
-
-def test_dataset_guard_over_limit_accept(qtbot, mocked_client, monkeypatch):
-    """
-    Dataset above the limit where user presses *Yes*.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1  # 1 MiB
-
-    # Pretend the user clicked “Yes”
-    monkeypatch.setattr(Waveform, "_confirm_large_dataset", lambda *_: True)
-
-    dataset = _dummy_dataset(mem_bytes=2_000_000)  # ≈1.9 MiB
-    assert wf._check_dataset_size_and_confirm(dataset, "waveform_waveform") is True
-
-
-def test_dataset_guard_over_limit_reject(qtbot, mocked_client, monkeypatch):
-    """
-    Dataset above the limit where user presses *No*.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1  # 1 MiB
-
-    # Pretend the user clicked “No”
-    monkeypatch.setattr(Waveform, "_confirm_large_dataset", lambda *_: False)
-
-    dataset = _dummy_dataset(mem_bytes=2_000_000)  # ≈1.9 MiB
-    assert wf._check_dataset_size_and_confirm(dataset, "waveform_waveform") is False
-
-
-##################################################
-# Dialog propagation behaviour
-##################################################
-
-
-def test_dialog_accept_updates_limit(monkeypatch, qtbot, mocked_client):
-    """
-    Simulate clicking 'Yes' in the dialog *after* changing the spinner value.
-    Verify max_dataset_size_mb is updated and dataset loads.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1  # start small
-
-    def fake_confirm(self, size_mb):
-        # Simulate user typing '5' in the spinbox then pressing Yes
-        self.config.max_dataset_size_mb = 5
-        return True  # Yes pressed
-
-    monkeypatch.setattr(Waveform, "_confirm_large_dataset", fake_confirm)
-
-    big_dataset = _dummy_dataset(mem_bytes=4_800_000)  # ≈4.6 MiB
-    accepted = wf._check_dataset_size_and_confirm(big_dataset, "waveform_waveform")
-
-    # The load should be accepted and the limit must reflect the new value
-    assert accepted is True
-    assert wf.max_dataset_size_mb == 5
-    assert wf.config.max_dataset_size_mb == 5
-
-
-def test_dialog_cancel_sets_skip(monkeypatch, qtbot, mocked_client):
-    """
-    Simulate clicking 'No' but ticking 'Don't show again'.
-    Verify skip_large_dataset_warning becomes True and dataset is skipped.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    assert wf.skip_large_dataset_warning is False
-
-    def fake_confirm(self, size_mb):
-        # Mimic ticking the checkbox then pressing No
-        self._skip_large_dataset_warning = True
-        return False  # No pressed
-
-    monkeypatch.setattr(Waveform, "_confirm_large_dataset", fake_confirm)
-
-    big_dataset = _dummy_dataset(mem_bytes=11_000_000)
-    accepted = wf._check_dataset_size_and_confirm(big_dataset, "waveform_waveform")
-
-    # Dataset must not load, but future warnings are suppressed
-    assert accepted is False
-    assert wf.skip_large_dataset_warning is True
-
-
-##################################################
-# Live dialog interaction (no monkey‑patching)
-##################################################
-
-
-def _open_dialog_and_click(handler):
-    """
-    Utility that schedules *handler* to run as soon as a modal
-    dialog is shown.  Returns a function suitable for QTimer.singleShot.
-    """
-
-    def _cb():
-        # Locate the active modal dialog
-        dlg = QApplication.activeModalWidget()
-        assert isinstance(dlg, QDialog), "No active modal dialog found"
-        handler(dlg)
-
-    return _cb
-
-
-def test_dialog_accept_real_interaction(qtbot, mocked_client):
-    """
-    End‑to‑end: user changes the limit spinner to 5 MiB, ticks
-    'don't show again', then presses YES.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1
-
-    # Prepare a large dataset (≈4.6 MiB)
-    big_dataset = _dummy_dataset(mem_bytes=4_800_000)
-
-    def handler(dlg):
-        spin: QDoubleSpinBox = dlg.findChild(QDoubleSpinBox)
-        chk: QCheckBox = dlg.findChild(QCheckBox)
-        btns: QDialogButtonBox = dlg.findChild(QDialogButtonBox)
-
-        # # Interact with widgets
-        spin.setValue(5)
-        chk.setChecked(True)
-
-        yes_btn = btns.button(QDialogButtonBox.Yes)
-        yes_btn.click()
-
-    # Schedule the handler right before invoking the check
-    QTimer.singleShot(0, _open_dialog_and_click(handler))
-
-    accepted = wf._check_dataset_size_and_confirm(big_dataset, "waveform_waveform")
-    assert accepted is True
-    assert wf.max_dataset_size_mb == 5
-    assert wf.skip_large_dataset_warning is True
-
-
-def test_dialog_reject_real_interaction(qtbot, mocked_client):
-    """
-    End‑to‑end: user leaves spinner unchanged, ticks 'don't show again',
-    and presses NO.
-    """
-    wf = create_widget(qtbot, Waveform, client=mocked_client)
-    wf.max_dataset_size_mb = 1
-
-    big_dataset = _dummy_dataset(mem_bytes=4_800_000)
-
-    def handler(dlg):
-        chk: QCheckBox = dlg.findChild(QCheckBox)
-        btns: QDialogButtonBox = dlg.findChild(QDialogButtonBox)
-
-        chk.setChecked(True)
-        no_btn = btns.button(QDialogButtonBox.No)
-        no_btn.click()
-
-    QTimer.singleShot(0, _open_dialog_and_click(handler))
-
-    accepted = wf._check_dataset_size_and_confirm(big_dataset, "waveform_waveform")
-    assert accepted is False
-    assert wf.skip_large_dataset_warning is True
-    # Limit remains unchanged
-    assert wf.max_dataset_size_mb == 1