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

refactor: BECDeviceMonitor changed to BECMonitor

Browse Source
This commit is contained in:
wyzula-jan
2023-10-28 12:03:11 +02:00
committed by wyzula_j
parent e4336cca30
commit cb6fb9d78b
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bec_widgets/examples/modular_app/modular.ui
View File

@ -23,7 +23,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="BECDeviceMonitor" name="plot_1"/> <widget class="BECMonitor" name="plot_1"/>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QPushButton" name="pushButton_setting_2"> <widget class="QPushButton" name="pushButton_setting_2">
@ -33,7 +33,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="2"> <item row="3" column="2" colspan="2">
<widget class="BECDeviceMonitor" name="plot_2"/> <widget class="BECMonitor" name="plot_2"/>
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -64,7 +64,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="4" colspan="2"> <item row="3" column="4" colspan="2">
<widget class="BECDeviceMonitor" name="plot_3"/> <widget class="BECMonitor" name="plot_3"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -82,7 +82,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>BECDeviceMonitor</class> <class>BECMonitor</class>
<extends>QGraphicsView</extends> <extends>QGraphicsView</extends>
<header location="global">bec_widgets.widgets.h</header> <header location="global">bec_widgets.widgets.h</header>
</customwidget> </customwidget>

2
bec_widgets/examples/modular_app/modular_app.py
View File

@ -3,7 +3,7 @@ import os
from PyQt5 import uic from PyQt5 import uic
from PyQt5.QtWidgets import QMainWindow, QApplication, QVBoxLayout from PyQt5.QtWidgets import QMainWindow, QApplication, QVBoxLayout
from bec_widgets.widgets.monitor import BECDeviceMonitor from bec_widgets.widgets.monitor import BECMonitor
# some default configs for demonstration purposes # some default configs for demonstration purposes
config_1 = { config_1 = {

2
bec_widgets/widgets/__init__.py
View File

@ -1 +1 @@
from .monitor import BECDeviceMonitor from .monitor import BECDeviceMonitor, ConfigDialog

2
bec_widgets/widgets/monitor/__init__.py
View File

@ -1,2 +1,2 @@
from .device_monitor import BECDeviceMonitor from .monitor import BECMonitor
from .config_dialog import ConfigDialog from .config_dialog import ConfigDialog

6
bec_widgets/widgets/monitor/device_monitor.py → bec_widgets/widgets/monitor/monitor.py
View File

@ -46,13 +46,13 @@ config_simple = {
} }
class BECDeviceMonitor(pg.GraphicsLayoutWidget): class BECMonitor(pg.GraphicsLayoutWidget):
update_signal = pyqtSignal() update_signal = pyqtSignal()
def __init__( def __init__(
self, parent=None, client=None, config: dict = None, enable_crosshair: bool = False self, parent=None, client=None, config: dict = None, enable_crosshair: bool = False
): ):
super(BECDeviceMonitor, self).__init__(parent=parent) super(BECMonitor, self).__init__(parent=parent)
# Client and device manager from BEC # Client and device manager from BEC
self.client = bec_dispatcher.client if client is None else client self.client = bec_dispatcher.client if client is None else client
@ -392,6 +392,6 @@ if __name__ == "__main__":
client.start() client.start()
app = QApplication(sys.argv) app = QApplication(sys.argv)
monitor = BECDeviceMonitor() monitor = BECMonitor()
monitor.show() monitor.show()
sys.exit(app.exec_()) sys.exit(app.exec_())

6
tests/test_bec_device_monitor.py → tests/test_bec_monitor.py
View File

@ -3,7 +3,7 @@ from unittest.mock import MagicMock
import pytest import pytest
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from bec_widgets.widgets import BECDeviceMonitor from bec_widgets.widgets import BECMonitor
config_device = { config_device = {
"plot_settings": { "plot_settings": {
@ -122,7 +122,7 @@ config_scan = {
def setup_monitor(qtbot, config): def setup_monitor(qtbot, config):
"""Helper function to set up the BECDeviceMonitor widget.""" """Helper function to set up the BECDeviceMonitor widget."""
client = MagicMock() client = MagicMock()
widget = BECDeviceMonitor(config=config, client=client) widget = BECMonitor(config=config, client=client)
qtbot.addWidget(widget) qtbot.addWidget(widget)
qtbot.waitExposed(widget) qtbot.waitExposed(widget)
return widget return widget
@ -149,7 +149,7 @@ def qtbot(app, qtbot): # TODO is this needed?
) )
def test_initialization_with_device_config(qtbot, config, scan_type, number_of_plots): def test_initialization_with_device_config(qtbot, config, scan_type, number_of_plots):
widget = setup_monitor(qtbot, config) widget = setup_monitor(qtbot, config)
assert isinstance(widget, BECDeviceMonitor) assert isinstance(widget, BECMonitor)
assert widget.config == config assert widget.config == config
assert widget.client is not None assert widget.client is not None
assert len(widget.plot_data) == number_of_plots assert len(widget.plot_data) == number_of_plots