bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-13 11:11:49 +02:00
Code Activity

fix(waveform): safeguard for history data access, closes #571; removed return values "none"

Browse Source
This commit is contained in:
wyzula_j
2025-05-27 16:26:37 +02:00
committed by Jan Wyzula
parent 224863569f
commit 85705383e4
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bec_widgets/widgets/plots/waveform/waveform.py
View File

@ -1,7 +1,7 @@
from __future__ import annotations from __future__ import annotations
import json import json
from typing import Literal from typing import Any, Literal
import lmfit import lmfit
import numpy as np import numpy as np
@ -163,7 +163,7 @@ class Waveform(PlotBase):
self._async_curves = [] self._async_curves = []
self._slice_index = None self._slice_index = None
self._dap_curves = [] self._dap_curves = []
self._mode: Literal["none", "sync", "async", "mixed"] = "none" self._mode = None
# Scan data # Scan data
self._scan_done = True # means scan is not running self._scan_done = True # means scan is not running
@ -1139,7 +1139,7 @@ class Waveform(PlotBase):
QTimer.singleShot(100, self.update_sync_curves) QTimer.singleShot(100, self.update_sync_curves)
QTimer.singleShot(300, self.update_sync_curves) QTimer.singleShot(300, self.update_sync_curves)
def _fetch_scan_data_and_access(self): def _fetch_scan_data_and_access(self) -> tuple[dict, str] | tuple[None, None]:
""" """
Decide whether the widget is in live or historical mode Decide whether the widget is in live or historical mode
and return the appropriate data dict and access key. and return the appropriate data dict and access key.
@ -1153,7 +1153,7 @@ class Waveform(PlotBase):
self.update_with_scan_history(-1) self.update_with_scan_history(-1)
if self.scan_item is None: if self.scan_item is None:
logger.info("No scan executed so far; skipping device curves categorisation.") logger.info("No scan executed so far; skipping device curves categorisation.")
return "none", "none" return None, None
if hasattr(self.scan_item, "live_data"): if hasattr(self.scan_item, "live_data"):
# Live scan # Live scan
@ -1169,7 +1169,7 @@ class Waveform(PlotBase):
""" """
if self.scan_item is None: if self.scan_item is None:
logger.info("No scan executed so far; skipping device curves categorisation.") logger.info("No scan executed so far; skipping device curves categorisation.")
return "none" return
data, access_key = self._fetch_scan_data_and_access() data, access_key = self._fetch_scan_data_and_access()
for curve in self._sync_curves: for curve in self._sync_curves:
device_name = curve.config.signal.name device_name = curve.config.signal.name
@ -1177,9 +1177,8 @@ class Waveform(PlotBase):
if access_key == "val": if access_key == "val":
device_data = data.get(device_name, {}).get(device_entry, {}).get(access_key, None) device_data = data.get(device_name, {}).get(device_entry, {}).get(access_key, None)
else: else:
device_data = ( entry_obj = data.get(device_name, {}).get(device_entry)
data.get(device_name, {}).get(device_entry, {}).read().get("value", None) device_data = entry_obj.read()["value"] if entry_obj else None
)
x_data = self._get_x_data(device_name, device_entry) x_data = self._get_x_data(device_name, device_entry)
if x_data is not None: if x_data is not None:
if len(x_data) == 1: if len(x_data) == 1:
@ -1217,7 +1216,8 @@ class Waveform(PlotBase):
if self._skip_large_dataset_check is False: if self._skip_large_dataset_check is False:
if not self._check_dataset_size_and_confirm(dataset_obj, device_entry): if not self._check_dataset_size_and_confirm(dataset_obj, device_entry):
continue # user declined to load; skip this curve continue # user declined to load; skip this curve
device_data = dataset_obj.get(device_entry, {}).read().get("value", None) entry_obj = dataset_obj.get(device_entry, None)
device_data = entry_obj.read()["value"] if entry_obj else None
# if shape is 2D cast it into 1D and take the last waveform # if shape is 2D cast it into 1D and take the last waveform
if len(np.shape(device_data)) > 1: if len(np.shape(device_data)) > 1:
@ -1549,15 +1549,21 @@ class Waveform(PlotBase):
if access_key == "val": # live data if access_key == "val": # live data
x_data = data.get(x_name, {}).get(x_entry, {}).get(access_key, [0]) x_data = data.get(x_name, {}).get(x_entry, {}).get(access_key, [0])
else: # history data else: # history data
x_data = data.get(x_name, {}).get(x_entry, {}).read().get("value", [0]) entry_obj = data.get(x_name, {}).get(x_entry)
x_data = entry_obj.read()["value"] if entry_obj else [0]
new_suffix = f" (custom: {x_name}-{x_entry})" new_suffix = f" (custom: {x_name}-{x_entry})"
# 2 User wants timestamp # 2 User wants timestamp
if self.x_axis_mode["name"] == "timestamp": if self.x_axis_mode["name"] == "timestamp":
if access_key == "val": # live if access_key == "val": # live
timestamps = data[device_name][device_entry].timestamps x_data = data.get(device_name, {}).get(device_entry, None)
if x_data is None:
return None
else:
timestamps = x_data.timestamps
else: # history data else: # history data
timestamps = data[device_name][device_entry].read().get("timestamp", [0]) entry_obj = data.get(device_name, {}).get(device_entry)
timestamps = entry_obj.read()["timestamp"] if entry_obj else [0]
x_data = timestamps x_data = timestamps
new_suffix = " (timestamp)" new_suffix = " (timestamp)"
@ -1584,7 +1590,8 @@ class Waveform(PlotBase):
if access_key == "val": if access_key == "val":
x_data = data.get(x_name, {}).get(x_entry, {}).get(access_key, None) x_data = data.get(x_name, {}).get(x_entry, {}).get(access_key, None)
else: else:
x_data = data.get(x_name, {}).get(x_entry, {}).read().get("value", None) entry_obj = data.get(x_name, {}).get(x_entry)
x_data = entry_obj.read()["value"] if entry_obj else None
new_suffix = f" (auto: {x_name}-{x_entry})" new_suffix = f" (auto: {x_name}-{x_entry})"
self._update_x_label_suffix(new_suffix) self._update_x_label_suffix(new_suffix)
return x_data return x_data
@ -1637,7 +1644,7 @@ class Waveform(PlotBase):
self.update_with_scan_history(-1) self.update_with_scan_history(-1)
if self.scan_item is None: if self.scan_item is None:
logger.info("No scan executed so far; skipping device curves categorisation.") logger.info("No scan executed so far; skipping device curves categorisation.")
return "none" return None
if hasattr(self.scan_item, "live_data"): if hasattr(self.scan_item, "live_data"):
readout_priority = self.scan_item.status_message.info["readout_priority"] # live data readout_priority = self.scan_item.status_message.info["readout_priority"] # live data