0
0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 03:31:50 +02:00

refactor: extreme.py changed initialisation of config

This commit is contained in:
wyzula-jan
2023-09-19 11:57:43 +02:00
parent 4287ac8885
commit a6940235be
2 changed files with 41 additions and 17 deletions

View File

@ -77,3 +77,15 @@ plot_data:
- name: "gauss_bpm"
entry: "gauss_bpm"
- plot_name: "Grid plot 4"
x:
label: 'Motor Y'
signals:
- name: "samy"
entry: "samy"
y:
label: 'BPM'
signals:
- name: "gauss_adc3"
entry: "gauss_adc3"

View File

@ -54,15 +54,15 @@ class PlotApp(QWidget):
super(PlotApp, self).__init__(parent)
# YAML config
self.plot_settings = config.get("plot_settings", {})
self.plot_data_config = config.get("plot_data", {})
self.scan_types = self.plot_settings.get("scan_types", False)
if self.scan_types is False:
self.plot_data = self.plot_data_config # TODO logic has to be improved
else:
self.plot_data = {}
self.init_config(config)
# self.plot_settings = config.get("plot_settings", {})
# self.plot_data_config = config.get("plot_data", {})
# self.scan_types = self.plot_settings.get("scan_types", False)
#
# if self.scan_types is False:
# self.plot_data = self.plot_data_config # TODO logic has to be improved
# else:
# self.plot_data = {}
# Setting global plot settings
self.init_plot_background(self.plot_settings["background_color"])
@ -103,6 +103,17 @@ class PlotApp(QWidget):
# Change layout of plots when the number of columns is changed in GUI
self.spinBox_N_columns.valueChanged.connect(lambda x: self.init_ui(x))
def init_config(self, config):
# YAML config
self.plot_settings = config.get("plot_settings", {})
self.plot_data_config = config.get("plot_data", {})
self.scan_types = self.plot_settings.get("scan_types", False)
if self.scan_types is False:
self.plot_data = self.plot_data_config # TODO logic has to be improved
else:
self.plot_data = {}
def init_plot_background(self, background_color: str) -> None:
"""
Initialize plot settings based on the background color.
@ -476,14 +487,15 @@ class PlotApp(QWidget):
config = yaml.safe_load(file)
# YAML config
self.plot_settings = config.get("plot_settings", {})
self.plot_data_config = config.get("plot_data", {})
self.scan_types = self.plot_settings.get("scan_types", False)
if self.scan_types is False:
self.plot_data = self.plot_data_config # TODO logic has to be improved
else:
self.plot_data = {}
self.init_config(config)
# self.plot_settings = config.get("plot_settings", {})
# self.plot_data_config = config.get("plot_data", {})
# self.scan_types = self.plot_settings.get("scan_types", False)
#
# if self.scan_types is False:
# self.plot_data = self.plot_data_config # TODO logic has to be improved
# else:
# self.plot_data = {}
# Reinitialize the UI and plots
# TODO implement, change background works only before loading .ui file