bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 03:31:50 +02:00
Code Activity

feat(plot/waveform1d): BECWaveform1D can show z data of scatter coded to different detector like BECMonitor2DScatter; BECWaveform1D name changed to BECWaveform

Browse Source
This commit is contained in:
wyzula_j
2024-04-05 16:20:53 +02:00
parent 6dc1000de5
commit 3d399ba1f5
12 changed files with 238 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_bec_figure.py
View File

@ -5,7 +5,7 @@ from unittest.mock import MagicMock
import numpy as np
import pytest
from bec_widgets.widgets import BECFigure, BECMotorMap, BECWaveform1D
from bec_widgets.widgets import BECFigure, BECMotorMap, BECWaveform
from bec_widgets.widgets.plots import BECImageShow
from .client_mocks import mocked_client
@ -50,8 +50,8 @@ def test_bec_figure_add_remove_plot(bec_figure):
assert "widget_1" in bec_figure._widgets
assert "widget_2" in bec_figure._widgets
assert "widget_3" in bec_figure._widgets
assert bec_figure._widgets["widget_1"].config.widget_class == "BECWaveform1D"
assert bec_figure._widgets["widget_2"].config.widget_class == "BECWaveform1D"
assert bec_figure._widgets["widget_1"].config.widget_class == "BECWaveform"
assert bec_figure._widgets["widget_2"].config.widget_class == "BECWaveform"
assert bec_figure._widgets["widget_3"].config.widget_class == "BECPlotBase"
# Check accessing positions by the grid in figure
@ -64,7 +64,7 @@ def test_bec_figure_add_remove_plot(bec_figure):
assert len(bec_figure._widgets) == initial_count + 2
assert "widget_1" not in bec_figure._widgets
assert "widget_3" in bec_figure._widgets
assert bec_figure._widgets["widget_2"].config.widget_class == "BECWaveform1D"
assert bec_figure._widgets["widget_2"].config.widget_class == "BECWaveform"
def test_add_different_types_of_widgets(bec_figure):
@ -72,7 +72,7 @@ def test_add_different_types_of_widgets(bec_figure):
im = bec_figure.image("eiger")
motor_map = bec_figure.motor_map("samx", "samy")
assert plt.__class__ == BECWaveform1D
assert plt.__class__ == BECWaveform
assert im.__class__ == BECImageShow
assert motor_map.__class__ == BECMotorMap

2
tests/test_bec_motor_map.py
View File

@ -2,7 +2,7 @@ import pytest
from bec_widgets.widgets import BECMotorMap
from bec_widgets.widgets.plots.motor_map import MotorMapConfig
from bec_widgets.widgets.plots.waveform1d import Signal, SignalData
from bec_widgets.widgets.plots.waveform import Signal, SignalData
from .client_mocks import mocked_client

51
tests/test_waveform1d.py
View File

@ -4,7 +4,7 @@ from unittest.mock import MagicMock
import numpy as np
import pytest
from bec_widgets.widgets.plots.waveform1d import CurveConfig, Signal, SignalData
from bec_widgets.widgets.plots.waveform import CurveConfig, Signal, SignalData
from .client_mocks import mocked_client
from .test_bec_figure import bec_figure
@ -49,7 +49,7 @@ def test_adding_curve_with_same_id(bec_figure):
def test_create_waveform1D_by_config(bec_figure):
w1_config_input = {
"widget_class": "BECWaveform1D",
"widget_class": "BECWaveform",
"gui_id": "widget_1",
"parent_id": "BECFigure_1708689320.788527",
"row": 0,
@ -73,6 +73,7 @@ def test_create_waveform1D_by_config(bec_figure):
"parent_id": "widget_1",
"label": "bpm4i-bpm4i",
"color": "#cc4778",
"colormap": "plasma",
"symbol": "o",
"symbol_color": None,
"symbol_size": 5,
@ -95,6 +96,7 @@ def test_create_waveform1D_by_config(bec_figure):
"modifier": None,
"limits": None,
},
"z": None,
},
},
"curve-custom": {
@ -103,6 +105,7 @@ def test_create_waveform1D_by_config(bec_figure):
"parent_id": "widget_1",
"label": "curve-custom",
"color": "blue",
"colormap": "plasma",
"symbol": "o",
"symbol_color": None,
"symbol_size": 5,
@ -232,6 +235,7 @@ def test_change_curve_appearance_methods(bec_figure, qtbot):
"source": "scan_segment",
"x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
"y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
"z": None,
}
@ -260,6 +264,7 @@ def test_change_curve_appearance_args(bec_figure):
"source": "scan_segment",
"x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
"y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
"z": None,
}
@ -343,6 +348,7 @@ def test_curve_add_by_config(bec_figure):
"parent_id": "widget_1",
"label": "bpm4i-bpm4i",
"color": "#cc4778",
"colormap": "plasma",
"symbol": "o",
"symbol_color": None,
"symbol_size": 5,
@ -359,6 +365,7 @@ def test_curve_add_by_config(bec_figure):
"modifier": None,
"limits": None,
},
"z": None,
},
}
@ -428,3 +435,43 @@ def test_scan_history_with_val_access(bec_figure, qtbot):
assert np.array_equal(x_data, [1, 2, 3])
assert np.array_equal(y_data, [4, 5, 6])
def test_scatter_2d_update(bec_figure, qtbot):
w1 = bec_figure.add_plot()
c1 = w1.add_curve_scan(x_name="samx", y_name="samx", z_name="bpm4i")
msg = {
"data": {
"samx": {"samx": {"value": [1, 2, 3]}},
"samy": {"samy": {"value": [4, 5, 6]}},
"bpm4i": {"bpm4i": {"value": [1, 3, 2]}},
},
"scan_id": 1,
}
msg_metadata = {"scan_name": "line_scan"}
mock_scan_data = MagicMock()
mock_scan_data.data = {
device_name: {
entry: MagicMock(val=msg["data"][device_name][entry]["value"])
for entry in msg["data"][device_name]
}
for device_name in msg["data"]
}
w1.queue.scan_storage.find_scan_by_ID.return_value = mock_scan_data
w1.on_scan_segment(msg, msg_metadata)
qtbot.wait(500)
data = c1.get_data()
expected_x_y_data = ([1, 2, 3], [1, 2, 3])
expected_z_colors = w1._make_z_gradient([1, 3, 2], "plasma")
scatter_points = c1.scatter.points()
colors = [point.brush().color() for point in scatter_points]
assert np.array_equal(data, expected_x_y_data)
assert colors == expected_z_colors