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

fix: tests references to add_widget_bec refactored

Browse Source
This commit is contained in:
wyzula_j
2024-06-06 00:13:05 +02:00
parent c3f4845b4f
commit f51b25f0af
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bec_widgets/examples/jupyter_console/jupyter_console_window.py
View File

@ -104,19 +104,19 @@ class JupyterConsoleWindow(QWidget): # pragma: no cover:
def _init_dock(self): def _init_dock(self):
self.d0 = self.dock.add_dock(name="dock_0") self.d0 = self.dock.add_dock(name="dock_0")
self.fig0 = self.d0.add_widget_bec("BECFigure") self.fig0 = self.d0.add_widget("BECFigure")
self.fig0.image("eiger", vrange=(0, 100)) self.fig0.image("eiger", vrange=(0, 100))
self.d1 = self.dock.add_dock(name="dock_1", position="right") self.d1 = self.dock.add_dock(name="dock_1", position="right")
self.fig1 = self.d1.add_widget_bec("BECFigure") self.fig1 = self.d1.add_widget("BECFigure")
self.fig1.plot(x_name="samx", y_name="bpm4i") self.fig1.plot(x_name="samx", y_name="bpm4i")
self.fig1.plot(x_name="samx", y_name="bpm3a") self.fig1.plot(x_name="samx", y_name="bpm3a")
self.d2 = self.dock.add_dock(name="dock_2", position="bottom") self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
self.fig2 = self.d2.add_widget_bec("BECFigure", row=0, col=0) self.fig2 = self.d2.add_widget("BECFigure", row=0, col=0)
self.fig2.motor_map(x_name="samx", y_name="samy") self.fig2.motor_map(x_name="samx", y_name="samy")
self.fig2.plot(x_name="samx", y_name="bpm4i") self.fig2.plot(x_name="samx", y_name="bpm4i")
self.bar = self.d2.add_widget_bec("SpiralProgressBar", row=0, col=1) self.bar = self.d2.add_widget("SpiralProgressBar", row=0, col=1)
self.bar.set_diameter(200) self.bar.set_diameter(200)
self.dock.save_state() self.dock.save_state()

4
bec_widgets/widgets/dock/dock_area.py
View File

@ -171,9 +171,7 @@ class BECDockArea(BECConnector, DockArea):
dock.show_title_bar() dock.show_title_bar()
if widget is not None and isinstance(widget, str): if widget is not None and isinstance(widget, str):
dock.add_widget_bec( dock.add_widget(widget=widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
widget_type=widget, row=row, col=col, rowspan=rowspan, colspan=colspan
)
elif widget is not None and isinstance(widget, QWidget): elif widget is not None and isinstance(widget, QWidget):
dock.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan) dock.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
if self._instructions_visible: if self._instructions_visible:

10
tests/end-2-end/test_bec_dock_rpc_e2e.py
View File

@ -38,9 +38,9 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
assert len(dock_server.docks) == 3 assert len(dock_server.docks) == 3
# Add 3 figures with some widgets # Add 3 figures with some widgets
fig0 = d0.add_widget_bec("BECFigure") fig0 = d0.add_widget("BECFigure")
fig1 = d1.add_widget_bec("BECFigure") fig1 = d1.add_widget("BECFigure")
fig2 = d2.add_widget_bec("BECFigure") fig2 = d2.add_widget("BECFigure")
assert len(dock_server.docks) == 3 assert len(dock_server.docks) == 3
assert len(dock_server.docks["dock_0"].widgets) == 1 assert len(dock_server.docks["dock_0"].widgets) == 1
@ -166,7 +166,7 @@ def test_spiral_bar(rpc_server_dock):
d0 = dock.add_dock(name="dock_0") d0 = dock.add_dock(name="dock_0")
bar = d0.add_widget_bec("SpiralProgressBar") bar = d0.add_widget("SpiralProgressBar")
assert bar.__class__.__name__ == "SpiralProgressBar" assert bar.__class__.__name__ == "SpiralProgressBar"
bar.set_number_of_bars(5) bar.set_number_of_bars(5)
@ -188,7 +188,7 @@ def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
d0 = dock.add_dock("dock_0") d0 = dock.add_dock("dock_0")
d0.add_widget_bec("SpiralProgressBar") d0.add_widget("SpiralProgressBar")
client = rpc_server_dock.client client = rpc_server_dock.client
dev = client.device_manager.devices dev = client.device_manager.devices

2
tests/unit_tests/test_bec_dock.py
View File

@ -58,7 +58,7 @@ def test_bec_dock_area_add_remove_dock(bec_dock_area, qtbot):
def test_add_remove_bec_figure_to_dock(bec_dock_area): def test_add_remove_bec_figure_to_dock(bec_dock_area):
d0 = bec_dock_area.add_dock() d0 = bec_dock_area.add_dock()
fig = d0.add_widget_bec("BECFigure") fig = d0.add_widget("BECFigure")
plt = fig.plot(x_name="samx", y_name="bpm4i") plt = fig.plot(x_name="samx", y_name="bpm4i")
im = fig.image("eiger") im = fig.image("eiger")
mm = fig.motor_map("samx", "samy") mm = fig.motor_map("samx", "samy")