bec-widgets 0.94.1__tar.gz → 0.94.3__tar.gz

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## v0.94.3 (2024-08-13)
+
+### Fix
+
+* fix(curve_dialog): async curves are shown in curve dialog after addition. ([`7aeb2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7aeb2b5c26c7c2851e8d663d32521da8daec95ef))
+
+* fix(waveform): async device entry is correctly passed, updated and with new scan the previous data are cleared ([`d56ea95`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d56ea95ef97bfdd0bc3eeddc4505d20b38e28559))
+
+### Test
+
+* test(waveform_widget): added tests for axis setting and curve dialog ([`f285b35`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f285b35b491660549e74349318119f7c2c44f619))
+
+## v0.94.2 (2024-08-13)
+
+### Fix
+
+* fix(image): image is single image mode do not raise popup error when connected twice with the same monitor ([`98b79aa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/98b79aac7b47b73137f4d582f7f1d552b1d95366))
+
 ## v0.94.1 (2024-08-12)
 
 ### Fix
@@ -124,10 +142,6 @@ This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https:
 
 ## v0.92.1 (2024-07-28)
 
-### Build
-
-* build(ci): install ophyd_devices in editable mode for pipelines ([`06205e0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06205e07903d93accf40abab153f440059f236ed))
-
 ### Fix
 
 * fix: use SafeSlot instead of Slot ([`bc1e239`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc1e23944cc0e5a861e3d0b4dc5b4ac6292d5269))
@@ -135,15 +149,3 @@ This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https:
 * fix: linting ([`a3fe205`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3fe20500ae2ac03dcde07432f7e21ce5262ce46))
 
 * fix: always add a QApplication for tests ([`61a4e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61a4e32deb337ed27f2f43358b88b7266413b58e))
-
-* fix: add xvfb to draw offscreen ([`3d681f7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d681f77e144e74138fc5fa65630004d7c166878))
-
-* fix: reset ErrorPopup singleton between tests ([`5a9ccfd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5a9ccfd1f6d2aacd5d86c1a34f74163b272d1ae4))
-
-* fix: metaclass + QObject segfaults PyQt(cpp bindings) ([`fc57b7a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc57b7a1262031a2df9e6a99493db87e766b779a))
-
-### Refactor
-
-* refactor: renamed DeviceMonitor2DMessage ([`4be6fd6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be6fd6b83ea1048f16310f7d2bbe777b13b245e))
-
-* refactor: rename device_monitor to device_monitor_2d ([`714e1e1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/714e1e139e0033d2725fefb636c419ca137a68c6))

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.94.1
+Version: 0.94.3
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -46,6 +46,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                     "w7": self.w7,
                     "w8": self.w8,
                     "w9": self.w9,
+                    "w10": self.w10,
                     "d0": self.d0,
                     "d1": self.d1,
                     "d2": self.d2,

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/bec_widgets/widgets/figure/plots/image/image.py

@@ -251,9 +251,10 @@ class BECImageShow(BECPlotBase):
 
         image_exits = self._check_image_id(monitor, self._images)
         if image_exits:
-            raise ValueError(
-                f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
-            )
+            # raise ValueError(
+            #     f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
+            # )
+            return
 
         # monitor = self.entry_validator.validate_monitor(monitor)
 
@@ -577,10 +578,10 @@ class BECImageShow(BECPlotBase):
         self, source: str, name: str, config: ImageItemConfig, data=None
     ) -> BECImageItem:  # TODO fix types
         config.parent_id = self.gui_id
-        image = BECImageItem(config=config, parent_image=self)
-        self.plot_item.addItem(image)
         if self.single_image is True and len(self.images) > 0:
             self.remove_image(0)
+        image = BECImageItem(config=config, parent_image=self)
+        self.plot_item.addItem(image)
         self._images[source][name] = image
         if source == "device_monitor_2d":
             self._connect_device_monitor_2d(config.monitor)

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -943,7 +943,9 @@ class BECWaveform(BECPlotBase):
                 self.setup_dap(self.old_scan_id, self.scan_id)
             if self._curves_data["async"]:
                 for curve_id, curve in self._curves_data["async"].items():
-                    self.setup_async(curve.config.signals.y.name)
+                    self.setup_async(
+                        name=curve.config.signals.y.name, entry=curve.config.signals.y.entry
+                    )
 
     @Slot(dict, dict)
     def on_scan_segment(self, msg: dict, metadata: dict):
@@ -1005,18 +1007,18 @@ class BECWaveform(BECPlotBase):
             )
 
     @Slot(str)
-    def setup_async(self, device: str):
+    def setup_async(self, name: str, entry: str):
         self.bec_dispatcher.disconnect_slot(
-            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, device)
+            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, name)
         )
         try:
-            self._curves_data["async"][f"{device}-{device}"].clear_data()
+            self._curves_data["async"][f"{name}-{entry}"].clear_data()
         except KeyError:
             pass
         if len(self._curves_data["async"]) > 0:
             self.bec_dispatcher.connect_slot(
                 self.on_async_readback,
-                MessageEndpoints.device_async_readback(self.scan_id, device),
+                MessageEndpoints.device_async_readback(self.scan_id, name),
                 from_start=True,
             )
 

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -58,16 +58,17 @@ class CurveSettings(SettingWidget):
         self.ui.color_map_selector_scan.combo.setCurrentText(cm)
 
         # Scan Curve Table
-        for label, curve in config["scan_segment"].items():
-            row_count = self.ui.scan_table.rowCount()
-            self.ui.scan_table.insertRow(row_count)
-            DialogRow(
-                parent=self,
-                table_widget=self.ui.scan_table,
-                client=self.target_widget.client,
-                row=row_count,
-                config=curve.config,
-            ).add_scan_row()
+        for source in ["scan_segment", "async"]:
+            for label, curve in config[source].items():
+                row_count = self.ui.scan_table.rowCount()
+                self.ui.scan_table.insertRow(row_count)
+                DialogRow(
+                    parent=self,
+                    table_widget=self.ui.scan_table,
+                    client=self.target_widget.client,
+                    row=row_count,
+                    config=curve.config,
+                ).add_scan_row()
 
         # Add DAP Curves
         for label, curve in config["DAP"].items():
@@ -132,11 +133,12 @@ class CurveSettings(SettingWidget):
         self.accept_curve_changes()
 
     def accept_curve_changes(self):
-        old_curves_scans = list(self.target_widget.waveform._curves_data["scan_segment"].values())
-        old_curves_dap = list(self.target_widget.waveform._curves_data["DAP"].values())
-        for curve in old_curves_scans:
-            curve.remove()
-        for curve in old_curves_dap:
+        sources = ["scan_segment", "async", "DAP"]
+        old_curves = []
+
+        for source in sources:
+            old_curves += list(self.target_widget.waveform._curves_data[source].values())
+        for curve in old_curves:
             curve.remove()
         self.get_curve_params()
 

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/pyproject.toml

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

{bec_widgets-0.94.1 → bec_widgets-0.94.3}/tests/unit_tests/test_waveform_widget.py

@@ -3,6 +3,9 @@ from unittest.mock import MagicMock, patch
 import pyqtgraph as pg
 import pytest
 
+from bec_widgets.qt_utils.settings_dialog import SettingsDialog
+from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
+from bec_widgets.widgets.waveform.waveform_popups.curve_dialog.curve_dialog import CurveSettings
 from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 from .client_mocks import mocked_client
@@ -261,3 +264,199 @@ def test_enable_mouse_pan_mode(qtbot, waveform_widget):
     assert action_drag.isChecked() == True
     assert action_rectangle.isChecked() == False
     mock_view_box.setMouseMode.assert_called_once_with(pg.ViewBox.PanMode)
+
+
+###################################
+# Curve Dialog Tests
+###################################
+def show_curve_dialog(qtbot, waveform_widget):
+    curve_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=CurveSettings(),
+        window_title="Curve Settings",
+        config=waveform_widget.waveform._curves_data,
+    )
+    qtbot.addWidget(curve_dialog)
+    qtbot.waitExposed(curve_dialog)
+    return curve_dialog
+
+
+def test_curve_dialog_scan_curves_interactions(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="bpm3a")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    # Check default display of config from waveform widget
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "best_effort"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == False
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == False
+
+    # Add a new curve
+    curve_dialog.widget.ui.add_curve.click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 3
+
+    # Set device to new curve
+    curve_dialog.widget.ui.scan_table.cellWidget(2, 0).setText("bpm3i")
+
+    # Change the x mode to device
+    curve_dialog.widget.ui.x_mode.setCurrentText("device")
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+
+    # Set the x device
+    curve_dialog.widget.ui.x_name.setText("samx")
+
+    # Delete first curve ('bpm4i')
+    curve_dialog.widget.ui.scan_table.cellWidget(0, 6).click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3i"
+
+    # Close the dialog
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    # Check the curve data in the target widget
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == [
+        "bpm3a-bpm3a",
+        "bpm3i-bpm3i",
+    ]
+    assert len(waveform_widget.curves) == 2
+
+
+def test_curve_dialog_async(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="async_device")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "async_device"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "async_device"
+
+
+def test_curve_dialog_dap(qtbot, waveform_widget):
+    waveform_widget.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 1
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.isEnabled() == True
+    assert curve_dialog.widget.ui.dap_table.rowCount() == 1
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "device"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+    assert curve_dialog.widget.ui.x_name.text() == "samx"
+    assert curve_dialog.widget.ui.x_entry.text() == "samx"
+
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == ["bpm4i-bpm4i"]
+    assert len(waveform_widget.curves) == 2
+
+
+###################################
+# Axis Dialog Tests
+###################################
+
+
+def show_axis_dialog(qtbot, waveform_widget):
+    axis_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=AxisSettings(),
+        window_title="Axis Settings",
+        config=waveform_widget._config_dict["axis"],
+    )
+    qtbot.addWidget(axis_dialog)
+    qtbot.waitExposed(axis_dialog)
+    return axis_dialog
+
+
+def test_axis_dialog_with_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title",
+        x_label="X Label",
+        y_label="Y Label",
+        x_scale="linear",
+        y_scale="log",
+        x_lim=(0, 10),
+        y_lim=(0, 10),
+    )
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == 0
+    assert axis_dialog.widget.ui.x_max.value() == 10
+    assert axis_dialog.widget.ui.y_min.value() == 0
+    assert axis_dialog.widget.ui.y_max.value() == 10
+
+
+def test_axis_dialog_without_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title", x_label="X Label", y_label="Y Label", x_scale="linear", y_scale="log"
+    )
+    x_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[0]
+    y_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[1]
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == x_range[0]
+    assert axis_dialog.widget.ui.x_max.value() == x_range[1]
+    assert axis_dialog.widget.ui.y_min.value() == y_range[0]
+    assert axis_dialog.widget.ui.y_max.value() == y_range[1]
+
+
+def test_axis_dialog_set_properties(qtbot, waveform_widget):
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    axis_dialog.widget.ui.plot_title.setText("New Title")
+    axis_dialog.widget.ui.x_label.setText("New X Label")
+    axis_dialog.widget.ui.y_label.setText("New Y Label")
+    axis_dialog.widget.ui.x_scale.setCurrentText("log")
+    axis_dialog.widget.ui.y_scale.setCurrentText("linear")
+    axis_dialog.widget.ui.x_min.setValue(5)
+    axis_dialog.widget.ui.x_max.setValue(15)
+    axis_dialog.widget.ui.y_min.setValue(5)
+    axis_dialog.widget.ui.y_max.setValue(15)
+
+    axis_dialog.accept()
+
+    assert waveform_widget._config_dict["axis"]["title"] == "New Title"
+    assert waveform_widget._config_dict["axis"]["x_label"] == "New X Label"
+    assert waveform_widget._config_dict["axis"]["y_label"] == "New Y Label"
+    assert waveform_widget._config_dict["axis"]["x_scale"] == "log"
+    assert waveform_widget._config_dict["axis"]["y_scale"] == "linear"
+    assert waveform_widget._config_dict["axis"]["x_lim"] == (5, 15)
+    assert waveform_widget._config_dict["axis"]["y_lim"] == (5, 15)