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: modular_app.py configs changed to new format

Browse Source
This commit is contained in:
wyzula-jan
2024-01-08 15:48:05 +01:00
parent 6e4775a124
commit 404ca49821
2 changed files with 112 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1433</width> <width>1433</width>
<height>24</height> <height>37</height>
</rect> </rect>
</property> </property>
</widget> </widget>

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

@ -3,41 +3,10 @@ import os
from qtpy import uic from qtpy import uic
from qtpy.QtWidgets import QMainWindow, QApplication from qtpy.QtWidgets import QMainWindow, QApplication
# some default configs for demonstration purposes from bec_widgets.widgets import BECMonitor
config_1 = {
"plot_settings": {
"background_color": "black",
"num_columns": 1,
"colormap": "plasma",
"scan_types": False,
},
"plot_data": [
{
"plot_name": "BPM4i plots vs samx",
"x": {
"label": "Motor Y",
"signals": [{"name": "samx", "entry": "samx"}],
},
"y": {
"label": "bpm4i",
"signals": [{"name": "bpm4i", "entry": "bpm4i"}],
},
},
{
"plot_name": "Gauss plots vs samx",
"x": {
"label": "Motor X",
"signals": [{"name": "samx", "entry": "samx"}],
},
"y": {
"label": "Gauss",
"signals": [{"name": "gauss_bpm", "entry": "gauss_bpm"}],
},
},
],
}
config_2 = { # some default configs for demonstration purposes
CONFIG_SIMPLE = {
"plot_settings": { "plot_settings": {
"background_color": "black", "background_color": "black",
"num_columns": 2, "num_columns": 2,
@ -47,41 +16,52 @@ config_2 = {
"plot_data": [ "plot_data": [
{ {
"plot_name": "BPM4i plots vs samx", "plot_name": "BPM4i plots vs samx",
"x": { "x_label": "Motor X",
"label": "Motor Y", "y_label": "bpm4i",
"signals": [{"name": "samx", "entry": "samx"}], "sources": [
}, {
"y": { "type": "scan_segment",
"label": "bpm4i", "signals": {
"signals": [{"name": "samy", "entry": "samy"}], "x": [{"name": "samx"}],
}, "y": [{"name": "bpm4i", "entry": "bpm4i"}],
},
},
# {
# "type": "history",
# "signals": {
# "x": [{"name": "samx"}],
# "y": [{"name": "bpm4i", "entry": "bpm4i"}],
# },
# },
# {
# "type": "dap",
# 'worker':'some_worker',
# "signals": {
# "x": [{"name": "samx"}],
# "y": [{"name": "bpm4i", "entry": "bpm4i"}],
# },
# },
],
}, },
{ {
"plot_name": "Gauss plots vs samx", "plot_name": "Gauss plots vs samx",
"x": { "x_label": "Motor X",
"label": "Motor X", "y_label": "Gauss",
"signals": [{"name": "samx", "entry": "samx"}], "sources": [
}, {
"y": { "type": "scan_segment",
"label": "Gauss ADC", "signals": {
"signals": [{"name": "gauss_adc1", "entry": "gauss_adc1"}], "x": [{"name": "samx", "entry": "samx"}],
}, "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
}, },
{ }
"plot_name": "Plot 3", ],
"x": {
"label": "Motor X",
"signals": [{"name": "samx", "entry": "samx"}],
},
"y": {
"label": "Gauss ADC",
"signals": [{"name": "gauss_adc3", "entry": "gauss_adc3"}],
},
}, },
], ],
} }
config_scan_mode = {
CONFIG_SCAN_MODE = {
"plot_settings": { "plot_settings": {
"background_color": "white", "background_color": "white",
"num_columns": 3, "num_columns": 3,
@ -92,77 +72,89 @@ config_scan_mode = {
"grid_scan": [ "grid_scan": [
{ {
"plot_name": "Grid plot 1", "plot_name": "Grid plot 1",
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "BPM",
"label": "BPM", "sources": [
"signals": [ {
{"name": "gauss_bpm", "entry": "gauss_bpm"}, "type": "scan_segment",
{"name": "gauss_adc1", "entry": "gauss_adc1"}, "signals": {
], "x": [{"name": "samx", "entry": "samx"}],
}, "y": [{"name": "gauss_bpm"}],
},
}
],
}, },
{ {
"plot_name": "Grid plot 2", "plot_name": "Grid plot 2",
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "BPM",
"label": "BPM", "sources": [
"signals": [ {
{"name": "gauss_bpm", "entry": "gauss_bpm"}, "type": "scan_segment",
{"name": "gauss_adc1", "entry": "gauss_adc1"}, "signals": {
], "x": [{"name": "samx", "entry": "samx"}],
}, "y": [{"name": "gauss_adc1"}],
},
}
],
}, },
{ {
"plot_name": "Grid plot 3", "plot_name": "Grid plot 3",
"x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "BPM",
"label": "BPM", "sources": [
"signals": [{"name": "gauss_bpm", "entry": "gauss_bpm"}], {
}, "type": "scan_segment",
"signals": {
"x": [{"name": "samy"}],
"y": [{"name": "gauss_adc2"}],
},
}
],
}, },
{ {
"plot_name": "Grid plot 4", "plot_name": "Grid plot 4",
"x": {"label": "Motor Y", "signals": [{"name": "samx", "entry": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "BPM",
"label": "BPM", "sources": [
"signals": [{"name": "gauss_adc3", "entry": "gauss_adc3"}], {
}, "type": "scan_segment",
"signals": {
"x": [{"name": "samy", "entry": "samy"}],
"y": [{"name": "gauss_adc3"}],
},
}
],
}, },
], ],
"line_scan": [ "line_scan": [
{ {
"plot_name": "BPM plot", "plot_name": "BPM plots vs samx",
"x": {"label": "Motor X", "signals": [{"name": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "Gauss",
"label": "BPM", "sources": [
"signals": [ {
{"name": "gauss_bpm", "entry": "gauss_bpm"}, "type": "scan_segment",
{"name": "gauss_adc1", "entry": "gauss_adc1"}, "signals": {
{"name": "gauss_adc2", "entry": "gauss_adc2"}, "x": [{"name": "samx", "entry": "samx"}],
], "y": [{"name": "bpm4i"}],
}, },
}
],
}, },
{ {
"plot_name": "Multi", "plot_name": "Gauss plots vs samx",
"x": {"label": "Motor X", "signals": [{"name": "samx", "entry": "samx"}]}, "x_label": "Motor X",
"y": { "y_label": "Gauss",
"label": "Multi", "sources": [
"signals": [ {
{"name": "gauss_bpm", "entry": "gauss_bpm"}, "type": "scan_segment",
{"name": "samx", "entry": "samx"}, "signals": {
], "x": [{"name": "samx", "entry": "samx"}],
}, "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
}, },
{ }
"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"},
],
},
}, },
], ],
}, },
@ -185,7 +177,7 @@ class ModularApp(QMainWindow):
def _init_plots(self): def _init_plots(self):
"""Initialize plots and connect the buttons to the config dialogs""" """Initialize plots and connect the buttons to the config dialogs"""
plots = [self.plot_1, self.plot_2, self.plot_3] plots = [self.plot_1, self.plot_2, self.plot_3]
configs = [config_1, config_2, config_scan_mode] configs = [CONFIG_SIMPLE, CONFIG_SCAN_MODE, CONFIG_SCAN_MODE]
buttons = [self.pushButton_setting_1, self.pushButton_setting_2, self.pushButton_setting_3] buttons = [self.pushButton_setting_1, self.pushButton_setting_2, self.pushButton_setting_3]
# hook plots, configs and buttons together # hook plots, configs and buttons together