mirror of
https://github.com/bec-project/bec_widgets.git
synced 2025-07-14 11:41:49 +02:00
fix: scan_mode for BECDeviceMonitor fixed init_ui
This commit is contained in:
@ -15,33 +15,33 @@
|
|||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralwidget">
|
<widget class="QWidget" name="centralwidget">
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QGraphicsView" name="glw_2"/>
|
||||||
|
</item>
|
||||||
<item row="1" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="label_3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Table </string>
|
<string>Plot Config 2</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="2">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Plot 2</string>
|
<string>Plot Config 1</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QGraphicsView" name="glw_1"/>
|
<widget class="QGraphicsView" name="glw_1"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QTableWidget" name="tableWidget"/>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="2">
|
<item row="2" column="2">
|
||||||
<widget class="QGraphicsView" name="glw_2"/>
|
<widget class="QGraphicsView" name="glw_3"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="2">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label_2">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Plot 1</string>
|
<string>Plot Scan Types = True</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -68,6 +68,92 @@ config_2 = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
config_scan_mode = config = {
|
||||||
|
"plot_settings": {
|
||||||
|
"background_color": "white",
|
||||||
|
"num_columns": 3,
|
||||||
|
"colormap": "plasma",
|
||||||
|
"scan_types": True,
|
||||||
|
},
|
||||||
|
"plot_data": {
|
||||||
|
"grid_scan": [
|
||||||
|
{
|
||||||
|
"plot_name": "Grid plot 1",
|
||||||
|
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "BPM",
|
||||||
|
"signals": [
|
||||||
|
{"name": "gauss_bpm", "entry": "gauss_bpm"},
|
||||||
|
{"name": "gauss_adc1", "entry": "gauss_adc1"},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"plot_name": "Grid plot 2",
|
||||||
|
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "BPM",
|
||||||
|
"signals": [
|
||||||
|
{"name": "gauss_bpm", "entry": "gauss_bpm"},
|
||||||
|
{"name": "gauss_adc1", "entry": "gauss_adc1"},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"plot_name": "Grid plot 3",
|
||||||
|
"x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "BPM",
|
||||||
|
"signals": [{"name": "gauss_bpm", "entry": "gauss_bpm"}],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"plot_name": "Grid plot 4",
|
||||||
|
"x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "BPM",
|
||||||
|
"signals": [{"name": "gauss_adc3", "entry": "gauss_adc3"}],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"line_scan": [
|
||||||
|
{
|
||||||
|
"plot_name": "BPM plot",
|
||||||
|
"x": {"label": "Motor X", "signals": [{"name": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "BPM",
|
||||||
|
"signals": [
|
||||||
|
{"name": "gauss_bpm", "entry": "gauss_bpm"},
|
||||||
|
{"name": "gauss_adc1", "entry": "gauss_adc1"},
|
||||||
|
{"name": "gauss_adc2", "entry": "gauss_adc2"},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"plot_name": "Multi",
|
||||||
|
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "Multi",
|
||||||
|
"signals": [
|
||||||
|
{"name": "gauss_bpm", "entry": "gauss_bpm"},
|
||||||
|
{"name": "samx", "entry": ["samx", "samx_setpoint"]},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"plot_name": "Multi",
|
||||||
|
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]},
|
||||||
|
"y": {
|
||||||
|
"label": "Multi",
|
||||||
|
"signals": [
|
||||||
|
{"name": "gauss_bpm", "entry": "gauss_bpm"},
|
||||||
|
{"name": "samx", "entry": ["samx", "samx_setpoint"]},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class ModularApp(QMainWindow):
|
class ModularApp(QMainWindow):
|
||||||
@ -92,6 +178,10 @@ class ModularApp(QMainWindow):
|
|||||||
self.bec_device_monitor_2 = BECDeviceMonitor(parent=self, config=config_2)
|
self.bec_device_monitor_2 = BECDeviceMonitor(parent=self, config=config_2)
|
||||||
self.glw_2_layout.addWidget(self.bec_device_monitor_2) # Add BECDeviceMonitor to the layout
|
self.glw_2_layout.addWidget(self.bec_device_monitor_2) # Add BECDeviceMonitor to the layout
|
||||||
|
|
||||||
|
self.glw_3_layout = QVBoxLayout(self.glw_3) # Create a new QVBoxLayout
|
||||||
|
self.bec_device_monitor_3 = BECDeviceMonitor(parent=self, config=config_scan_mode)
|
||||||
|
self.glw_3_layout.addWidget(self.bec_device_monitor_3) # Add BECDeviceMonitor to the layout
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
from bec_widgets.bec_dispatcher import bec_dispatcher
|
from bec_widgets.bec_dispatcher import bec_dispatcher
|
||||||
|
@ -259,7 +259,7 @@ class BECDeviceMonitor(pg.GraphicsLayoutWidget):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Init UI
|
# Init UI
|
||||||
self.init_ui(self.plot_settings["num_columns"])
|
self._init_ui(self.plot_settings["num_columns"])
|
||||||
|
|
||||||
self.scanID = current_scanID
|
self.scanID = current_scanID
|
||||||
self.data = {}
|
self.data = {}
|
||||||
|
Reference in New Issue
Block a user