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: start_device_consumer changed from EP device_status to scan_status

Browse Source
This commit is contained in:
wyzula-jan
2023-09-08 08:45:33 +02:00
parent 9e63f9228d
commit 46a3981e7d
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bec_widgets/examples/mca_readout/mca_plot.py
View File

@ -27,7 +27,9 @@ class StreamApp(QWidget):
self.device = device self.device = device
self.sub_device = sub_device self.sub_device = sub_device
self.device_consumer(self.device) self.start_device_consumer()
# self.start_device_consumer(self.device) # for simulation
self.new_scanID.connect(self.create_new_stream_consumer) self.new_scanID.connect(self.create_new_stream_consumer)
self.update_signal.connect(self.plot_new) self.update_signal.connect(self.plot_new)
@ -64,13 +66,20 @@ class StreamApp(QWidget):
self.stream_consumer.start() self.stream_consumer.start()
def device_consumer(self, device): def start_device_consumer(self):
self.device_consumer = connector.consumer( self.device_consumer = connector.consumer(
topics=MessageEndpoints.device_status(device), cb=self._device_cv, parent=self topics=MessageEndpoints.scan_status(), cb=self._device_cv, parent=self
) )
self.device_consumer.start() self.device_consumer.start()
# def start_device_consumer(self, device): #for simulation
# self.device_consumer = connector.consumer(
# topics=MessageEndpoints.device_status(device), cb=self._device_cv, parent=self
# )
#
# self.device_consumer.start()
def plot_new(self): def plot_new(self):
self.image_item.setImage(self.data.T) self.image_item.setImage(self.data.T)
@ -94,9 +103,11 @@ class StreamApp(QWidget):
@staticmethod @staticmethod
def _device_cv(msg, *, parent, **_kwargs) -> None: def _device_cv(msg, *, parent, **_kwargs) -> None:
msgDEV = BECMessage.DeviceMessage.loads(msg.value) print("Getting ScanID")
current_scanID = msgDEV.metadata["scanID"] msgDEV = BECMessage.ScanStatusMessage.loads(msg.value)
current_scanID = msgDEV.content["scanID"]
if parent.scanID is None: if parent.scanID is None:
parent.scanID = current_scanID parent.scanID = current_scanID

2
bec_widgets/examples/mca_readout/mca_sim.py
View File

@ -20,7 +20,7 @@ for ii in range(20):
metadata=metadata, metadata=metadata,
).dumps() ).dumps()
producer.send(topic=MessageEndpoints.device_status(device="mca"), msg=msg) # producer.send(topic=MessageEndpoints.device_status(device="mca"), msg=msg)
producer.xadd( producer.xadd(
topic=MessageEndpoints.device_async_readback( topic=MessageEndpoints.device_async_readback(