bec-widgets 0.83.0__py3-none-any.whl → 0.84.0__py3-none-any.whl

tests/unit_tests/test_waveform1d.py

@@ -14,36 +14,36 @@ def test_adding_curve_to_waveform(bec_figure):
     w1 = bec_figure.plot()
 
     # adding curve which is in bec - only names
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
     assert c1.config.label == "bpm4i-bpm4i"
 
     # adding curve which is in bec - names and entry
-    c2 = w1.add_curve_scan(x_name="samx", x_entry="samx", y_name="bpm3a", y_entry="bpm3a")
+    c2 = w1.add_curve_bec(x_name="samx", x_entry="samx", y_name="bpm3a", y_entry="bpm3a")
     assert c2.config.label == "bpm3a-bpm3a"
 
     # adding curve which is not in bec
     with pytest.raises(ValueError) as excinfo:
-        w1.add_curve_scan(x_name="non_existent_device", y_name="non_existent_device")
+        w1.add_curve_bec(x_name="non_existent_device", y_name="non_existent_device")
     assert "Device 'non_existent_device' not found in current BEC session" in str(excinfo.value)
 
     # adding wrong entry for samx
     with pytest.raises(ValueError) as excinfo:
-        w1.add_curve_scan(
+        w1.add_curve_bec(
             x_name="samx", x_entry="non_existent_entry", y_name="bpm3a", y_entry="bpm3a"
         )
     assert "Entry 'non_existent_entry' not found in device 'samx' signals" in str(excinfo.value)
 
     # adding wrong device with validation switched off
-    c3 = w1.add_curve_scan(x_name="samx", y_name="non_existent_device", validate_bec=False)
+    c3 = w1.add_curve_bec(x_name="samx", y_name="non_existent_device", validate_bec=False)
     assert c3.config.label == "non_existent_device-non_existent_device"
 
 
 def test_adding_curve_with_same_id(bec_figure):
     w1 = bec_figure.plot()
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i", gui_id="test_curve")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")
 
     with pytest.raises(ValueError) as excinfo:
-        w1.add_curve_scan(x_name="samx", y_name="bpm4i", gui_id="test_curve")
+        w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")
         assert "Curve with ID 'test_curve' already exists." in str(excinfo.value)
 
 
@@ -134,7 +134,7 @@ def test_create_waveform1D_by_config(bec_figure):
 
 def test_change_gui_id(bec_figure):
     w1 = bec_figure.plot()
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
     w1.change_gui_id("new_id")
 
     assert w1.config.gui_id == "new_id"
@@ -143,7 +143,7 @@ def test_change_gui_id(bec_figure):
 
 def test_getting_curve(bec_figure):
     w1 = bec_figure.plot()
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i", gui_id="test_curve")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")
     c1_expected_config = CurveConfig(
         widget_class="BECCurve",
         gui_id="test_curve",
@@ -166,6 +166,8 @@ def test_getting_curve(bec_figure):
     assert w1.curves[0].config == c1_expected_config
     assert w1._curves_data["scan_segment"]["bpm4i-bpm4i"].config == c1_expected_config
     assert w1.get_curve(0).config == c1_expected_config
+    assert w1.get_curve_config("bpm4i-bpm4i", dict_output=True) == c1_expected_config.model_dump()
+    assert w1.get_curve_config("bpm4i-bpm4i", dict_output=False) == c1_expected_config
     assert w1.get_curve("bpm4i-bpm4i").config == c1_expected_config
     assert c1.get_config(False) == c1_expected_config
     assert c1.get_config() == c1_expected_config.model_dump()
@@ -173,7 +175,7 @@ def test_getting_curve(bec_figure):
 
 def test_getting_curve_errors(bec_figure):
     w1 = bec_figure.plot()
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i", gui_id="test_curve")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")
 
     with pytest.raises(ValueError) as excinfo:
         w1.get_curve("non_existent_curve")
@@ -191,7 +193,7 @@ def test_getting_curve_errors(bec_figure):
 def test_add_curve(bec_figure):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
 
     assert len(w1.curves) == 1
     assert w1._curves_data["scan_segment"] == {"bpm4i-bpm4i": c1}
@@ -202,7 +204,7 @@ def test_add_curve(bec_figure):
 def test_change_legend_font_size(bec_figure):
     plot = bec_figure.plot()
 
-    w1 = plot.add_curve_scan(x_name="samx", y_name="bpm4i")
+    w1 = plot.add_curve_bec(x_name="samx", y_name="bpm4i")
     my_func = plot.plot_item.legend
     with mock.patch.object(my_func, "setScale") as mock_set_scale:
         plot.set_legend_label_size(18)
@@ -214,8 +216,8 @@ def test_change_legend_font_size(bec_figure):
 def test_remove_curve(bec_figure):
     w1 = bec_figure.plot()
 
-    w1.add_curve_scan(x_name="samx", y_name="bpm4i")
-    w1.add_curve_scan(x_name="samx", y_name="bpm3a")
+    w1.add_curve_bec(x_name="samx", y_name="bpm4i")
+    w1.add_curve_bec(x_name="samx", y_name="bpm3a")
     w1.remove_curve(0)
     w1.remove_curve("bpm3a-bpm3a")
 
@@ -232,7 +234,7 @@ def test_remove_curve(bec_figure):
 def test_change_curve_appearance_methods(bec_figure, qtbot):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
 
     c1.set_color("#0000ff")
     c1.set_symbol("x")
@@ -261,7 +263,7 @@ def test_change_curve_appearance_methods(bec_figure, qtbot):
 def test_change_curve_appearance_args(bec_figure):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
 
     c1.set(
         color="#0000ff",
@@ -414,7 +416,7 @@ def test_curve_add_by_config(bec_figure):
 def test_scan_update(bec_figure, qtbot):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
 
     msg_waveform = {
         "data": {
@@ -448,7 +450,7 @@ def test_scan_update(bec_figure, qtbot):
 def test_scan_history_with_val_access(bec_figure, qtbot):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="bpm4i")
+    w1.plot(x_name="samx", y_name="bpm4i")
 
     mock_scan_data = {
         "samx": {"samx": mock.MagicMock(val=np.array([1, 2, 3]))},  # Use mock.MagicMock for .val
@@ -464,7 +466,7 @@ def test_scan_history_with_val_access(bec_figure, qtbot):
 
     qtbot.wait(500)
 
-    x_data, y_data = c1.get_data()
+    x_data, y_data = w1.curves[0].get_data()
 
     assert np.array_equal(x_data, [1, 2, 3])
     assert np.array_equal(y_data, [4, 5, 6])
@@ -473,7 +475,7 @@ def test_scan_history_with_val_access(bec_figure, qtbot):
 def test_scatter_2d_update(bec_figure, qtbot):
     w1 = bec_figure.plot()
 
-    c1 = w1.add_curve_scan(x_name="samx", y_name="samx", z_name="bpm4i")
+    c1 = w1.add_curve_bec(x_name="samx", y_name="samx", z_name="bpm4i")
 
     msg = {
         "data": {
@@ -485,8 +487,8 @@ def test_scatter_2d_update(bec_figure, qtbot):
     }
     msg_metadata = {"scan_name": "line_scan"}
 
-    mock_scan_data = mock.MagicMock()
-    mock_scan_data.data = {
+    mock_scan_item = mock.MagicMock()
+    mock_scan_item.data = {
         device_name: {
             entry: mock.MagicMock(val=msg["data"][device_name][entry]["value"])
             for entry in msg["data"][device_name]
@@ -494,7 +496,7 @@ def test_scatter_2d_update(bec_figure, qtbot):
         for device_name in msg["data"]
     }
 
-    w1.queue.scan_storage.find_scan_by_ID.return_value = mock_scan_data
+    w1.queue.scan_storage.find_scan_by_ID.return_value = mock_scan_item
 
     w1.on_scan_segment(msg, msg_metadata)
     qtbot.wait(500)
@@ -508,3 +510,180 @@ def test_scatter_2d_update(bec_figure, qtbot):
 
     assert np.array_equal(data, expected_x_y_data)
     assert colors == expected_z_colors
+
+
+def test_waveform_single_arg_inputs(bec_figure, qtbot):
+    w1 = bec_figure.plot()
+
+    w1.plot("bpm4i")
+    w1.plot([1, 2, 3], label="just_y")
+    w1.plot([3, 4, 5], [7, 8, 9], label="x_y")
+    w1.plot(x=[1, 2, 3], y=[4, 5, 6], label="x_y_kwargs")
+    data_array_1D = np.random.rand(10)
+    data_array_2D = np.random.rand(10, 2)
+    w1.plot(data_array_1D, label="np_ndarray 1D")
+    w1.plot(data_array_2D, label="np_ndarray 2D")
+
+    qtbot.wait(200)
+
+    assert w1._curves_data["scan_segment"]["bpm4i-bpm4i"].config.label == "bpm4i-bpm4i"
+    assert w1._curves_data["custom"]["just_y"].config.label == "just_y"
+    assert w1._curves_data["custom"]["x_y"].config.label == "x_y"
+    assert w1._curves_data["custom"]["x_y_kwargs"].config.label == "x_y_kwargs"
+
+    assert np.array_equal(w1._curves_data["custom"]["just_y"].get_data(), ([0, 1, 2], [1, 2, 3]))
+    assert np.array_equal(w1._curves_data["custom"]["just_y"].get_data(), ([0, 1, 2], [1, 2, 3]))
+    assert np.array_equal(w1._curves_data["custom"]["x_y"].get_data(), ([3, 4, 5], [7, 8, 9]))
+    assert np.array_equal(
+        w1._curves_data["custom"]["x_y_kwargs"].get_data(), ([1, 2, 3], [4, 5, 6])
+    )
+    assert np.array_equal(
+        w1._curves_data["custom"]["np_ndarray 1D"].get_data(),
+        (np.arange(data_array_1D.size), data_array_1D.T),
+    )
+    assert np.array_equal(w1._curves_data["custom"]["np_ndarray 2D"].get_data(), data_array_2D.T)
+
+
+def test_waveform_set_x_sync(bec_figure, qtbot):
+    w1 = bec_figure.plot()
+    custom_label = "custom_label"
+    w1.plot("bpm4i")
+    w1.set_x_label(custom_label)
+
+    scan_item_mock = mock.MagicMock()
+    mock_data = {
+        "samx": {"samx": mock.MagicMock(val=np.array([1, 2, 3]))},
+        "samy": {"samy": mock.MagicMock(val=np.array([4, 5, 6]))},
+        "bpm4i": {
+            "bpm4i": mock.MagicMock(
+                val=np.array([7, 8, 9]),
+                timestamps=np.array([1720520189.959115, 1720520189.986618, 1720520190.0157812]),
+            )
+        },
+    }
+
+    scan_item_mock.data = mock_data
+    scan_item_mock.status_message.info = {"scan_report_devices": ["samx"]}
+
+    w1.queue.scan_storage.find_scan_by_ID.return_value = scan_item_mock
+
+    w1.on_scan_segment({"scan_id": 1}, {})
+    qtbot.wait(200)
+
+    # Best effort - samx
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [1, 2, 3])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [auto: samx-samx]"
+
+    # Change to samy
+    w1.set_x("samy")
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [4, 5, 6])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [samy-samy]"
+
+    # change to index
+    w1.set_x("index")
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [index]"
+
+    # change to timestamp
+    w1.set_x("timestamp")
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.allclose(x_data, np.array([1.72052019e09, 1.72052019e09, 1.72052019e09]))
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [timestamp]"
+
+
+def test_waveform_async_data_update(bec_figure, qtbot):
+    w1 = bec_figure.plot("async_device")
+    custom_label = "custom_label"
+    w1.set_x_label(custom_label)
+
+    # scan_item_mock = mock.MagicMock()
+    # mock_data = {
+    #     "async_device": {
+    #         "async_device": mock.MagicMock(
+    #             val=np.array([7, 8, 9]),
+    #             timestamps=np.array([1720520189.959115, 1720520189.986618, 1720520190.0157812]),
+    #         )
+    #     }
+    # }
+    #
+    # scan_item_mock.async_data = mock_data
+    # w1.queue.scan_storage.find_scan_by_ID.return_value = scan_item_mock
+
+    msg_1 = {"signals": {"async_device": {"value": [7, 8, 9]}}}
+    w1.on_async_readback(msg_1, {"async_update": "extend"})
+
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [best_effort]"
+
+    msg_2 = {"signals": {"async_device": {"value": [10, 11, 12]}}}
+    w1.on_async_readback(msg_2, {"async_update": "extend"})
+
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2, 3, 4, 5])
+    assert np.array_equal(y_data, [7, 8, 9, 10, 11, 12])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [best_effort]"
+
+    msg_3 = {"signals": {"async_device": {"value": [20, 21, 22]}}}
+    w1.on_async_readback(msg_3, {"async_update": "replace"})
+
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2])
+    assert np.array_equal(y_data, [20, 21, 22])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [best_effort]"
+
+
+def test_waveform_set_x_async(bec_figure, qtbot):
+    w1 = bec_figure.plot("async_device")
+    custom_label = "custom_label"
+    w1.set_x_label(custom_label)
+
+    scan_item_mock = mock.MagicMock()
+    mock_data = {
+        "async_device": {
+            "async_device": {
+                "value": np.array([7, 8, 9]),
+                "timestamp": np.array([1720520189.959115, 1720520189.986618, 1720520190.0157812]),
+            }
+        }
+    }
+
+    scan_item_mock.async_data = mock_data
+    w1.queue.scan_storage.find_scan_by_ID.return_value = scan_item_mock
+
+    w1.on_scan_status({"scan_id": 1})
+    w1.replot_async_curve()
+
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [best_effort]"
+
+    w1.set_x("timestamp")
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.allclose(x_data, np.array([1.72052019e09, 1.72052019e09, 1.72052019e09]))
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [timestamp]"
+
+    w1.set_x("index")
+    qtbot.wait(200)
+    x_data, y_data = w1.curves[0].get_data()
+    assert np.array_equal(x_data, [0, 1, 2])
+    assert np.array_equal(y_data, [7, 8, 9])
+    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [index]"

bec_widgets/examples/jupyter_console/jupyter_console_window.ui

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>2104</width>
-    <height>966</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Plotting Console</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QTabWidget" name="tabWidget">
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="tab_1">
-       <attribute name="title">
-        <string>BECDock</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QWidget" name="dock_placeholder" native="true"/>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="tab_2">
-       <attribute name="title">
-        <string>BECFigure</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QWidget" name="glw" native="true"/>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="widget_console" native="true"/>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>