mirror of
https://github.com/bec-project/bec_widgets.git
synced 2025-07-14 03:31:50 +02:00
refactor: BECDeviceMonitor changed to BECMonitor
This commit is contained in:
@ -23,7 +23,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="BECDeviceMonitor" name="plot_1"/>
|
||||
<widget class="BECMonitor" name="plot_1"/>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QPushButton" name="pushButton_setting_2">
|
||||
@ -33,7 +33,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2" colspan="2">
|
||||
<widget class="BECDeviceMonitor" name="plot_2"/>
|
||||
<widget class="BECMonitor" name="plot_2"/>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<widget class="QLabel" name="label_2">
|
||||
@ -64,7 +64,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="4" colspan="2">
|
||||
<widget class="BECDeviceMonitor" name="plot_3"/>
|
||||
<widget class="BECMonitor" name="plot_3"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@ -82,7 +82,7 @@
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>BECDeviceMonitor</class>
|
||||
<class>BECMonitor</class>
|
||||
<extends>QGraphicsView</extends>
|
||||
<header location="global">bec_widgets.widgets.h</header>
|
||||
</customwidget>
|
||||
|
@ -3,7 +3,7 @@ import os
|
||||
from PyQt5 import uic
|
||||
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
|
||||
config_1 = {
|
||||
|
@ -1 +1 @@
|
||||
from .monitor import BECDeviceMonitor
|
||||
from .monitor import BECDeviceMonitor, ConfigDialog
|
||||
|
@ -1,2 +1,2 @@
|
||||
from .device_monitor import BECDeviceMonitor
|
||||
from .monitor import BECMonitor
|
||||
from .config_dialog import ConfigDialog
|
||||
|
@ -46,13 +46,13 @@ config_simple = {
|
||||
}
|
||||
|
||||
|
||||
class BECDeviceMonitor(pg.GraphicsLayoutWidget):
|
||||
class BECMonitor(pg.GraphicsLayoutWidget):
|
||||
update_signal = pyqtSignal()
|
||||
|
||||
def __init__(
|
||||
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
|
||||
self.client = bec_dispatcher.client if client is None else client
|
||||
@ -392,6 +392,6 @@ if __name__ == "__main__":
|
||||
client.start()
|
||||
|
||||
app = QApplication(sys.argv)
|
||||
monitor = BECDeviceMonitor()
|
||||
monitor = BECMonitor()
|
||||
monitor.show()
|
||||
sys.exit(app.exec_())
|
@ -3,7 +3,7 @@ from unittest.mock import MagicMock
|
||||
import pytest
|
||||
from PyQt5.QtWidgets import QApplication
|
||||
|
||||
from bec_widgets.widgets import BECDeviceMonitor
|
||||
from bec_widgets.widgets import BECMonitor
|
||||
|
||||
config_device = {
|
||||
"plot_settings": {
|
||||
@ -122,7 +122,7 @@ config_scan = {
|
||||
def setup_monitor(qtbot, config):
|
||||
"""Helper function to set up the BECDeviceMonitor widget."""
|
||||
client = MagicMock()
|
||||
widget = BECDeviceMonitor(config=config, client=client)
|
||||
widget = BECMonitor(config=config, client=client)
|
||||
qtbot.addWidget(widget)
|
||||
qtbot.waitExposed(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):
|
||||
widget = setup_monitor(qtbot, config)
|
||||
assert isinstance(widget, BECDeviceMonitor)
|
||||
assert isinstance(widget, BECMonitor)
|
||||
assert widget.config == config
|
||||
assert widget.client is not None
|
||||
assert len(widget.plot_data) == number_of_plots
|
Reference in New Issue
Block a user