diff --git a/bec_widgets/validation/monitor_config_validator.py b/bec_widgets/validation/monitor_config_validator.py index 5a92f7de..f2ea4941 100644 --- a/bec_widgets/validation/monitor_config_validator.py +++ b/bec_widgets/validation/monitor_config_validator.py @@ -236,7 +236,8 @@ class MonitorConfigValidator: Raises: ValidationError: If the configuration data does not conform to the schema. """ - if config_data["plot_settings"]["scan_types"]: + config_type = config_data.get("plot_settings", {}).get("scan_types", False) + if config_type: validated_config = ScanModeConfig(**config_data) else: validated_config = DeviceMonitorConfig(**config_data) diff --git a/bec_widgets/widgets/monitor/monitor.py b/bec_widgets/widgets/monitor/monitor.py index 8d89d9c6..2b0796b5 100644 --- a/bec_widgets/widgets/monitor/monitor.py +++ b/bec_widgets/widgets/monitor/monitor.py @@ -193,7 +193,7 @@ CONFIG_SIMPLE = { "plot_data": [ { "plot_name": "BPM4i plots vs samx", - "x_label": "Motor Y", + "x_label": "Motor X", "y_label": "bpm4i", "sources": [ { @@ -203,6 +203,21 @@ CONFIG_SIMPLE = { "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"}], + # }, + # }, ], }, { @@ -585,6 +600,11 @@ class BECMonitor(pg.GraphicsLayoutWidget): Args: config(dict): Configuration settings """ + # convert config from BEC CLI to correct formatting + config_tag = config.get("config", None) + if config_tag is not None: + config = config["config"] + if self.skip_validation is True: self.config = config self._init_config()