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

fix(waveform): timestamp are not converted to human readable format

Browse Source
This commit is contained in:
wyzula_j
2024-07-15 16:51:16 +02:00
parent 8516a1d639
commit e495fd30c4
1 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,17 +1082,15 @@ class BECWaveform(BECPlotBase):
new_data = data_plot new_data = data_plot
if x_name == "timestamp": if x_name == "timestamp":
if x_data is not None: if x_data is not None:
x_data = np.hstack( x_data = np.hstack((x_data, async_data["timestamp"]))
(x_data, self.convert_timestamps(async_data["timestamp"]))
)
else: else:
x_data = self.convert_timestamps(async_data["timestamp"]) x_data = async_data["timestamp"]
curve.setData(x_data, new_data) curve.setData(x_data, new_data)
else: else:
curve.setData(new_data) curve.setData(new_data)
elif instruction == "replace": elif instruction == "replace":
if x_name == "timestamp": if x_name == "timestamp":
x_data = self.convert_timestamps(async_data["timestamp"]) x_data = async_data["timestamp"]
curve.setData(x_data, data_plot) curve.setData(x_data, data_plot)
else: else:
curve.setData(data_plot) curve.setData(data_plot)
@ -1112,7 +1110,7 @@ class BECWaveform(BECPlotBase):
x_name = curve.config.signals.x.name x_name = curve.config.signals.x.name
if x_name == "timestamp": if x_name == "timestamp":
data_x = self.convert_timestamps(data[y_name][y_entry]["timestamp"]) data_x = data[y_name][y_entry]["timestamp"]
else: else:
data_x = None data_x = None
data_y = data[y_name][y_entry]["value"] data_y = data[y_name][y_entry]["value"]
@ -1183,7 +1181,9 @@ class BECWaveform(BECPlotBase):
x_data = None x_data = None
if self._x_axis_mode["name"] == "timestamp": if self._x_axis_mode["name"] == "timestamp":
timestamps = self.scan_item.data[y_name][y_entry].timestamps timestamps = self.scan_item.data[y_name][y_entry].timestamps
x_data = self.convert_timestamps(timestamps)
x_data = timestamps
print(x_data)
return x_data return x_data
if self._x_axis_mode["name"] == "index": if self._x_axis_mode["name"] == "index":
x_data = None x_data = None
@ -1352,27 +1352,6 @@ class BECWaveform(BECPlotBase):
return combined_data return combined_data
return data return data
@staticmethod
def convert_timestamps(timestamps: list) -> list:
"""
Convert timestamps to human-readable dates.
Args:
timestamps(list): List of timestamps.
Returns:
list: List of human-readable dates.
"""
human_readable_dates = [
datetime.datetime.fromtimestamp(ts).strftime("%Y-%m-%d %H:%M:%S.%f")
for ts in timestamps
]
data2float = [
time.mktime(datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S.%f").timetuple())
for date in human_readable_dates
]
return data2float
def clear_all(self): def clear_all(self):
curves_data = self._curves_data curves_data = self._curves_data
sources = list(curves_data.keys()) sources = list(curves_data.keys())