wip unifikace

Author: wyzula-jan

bec_widgets/widgets/progress/ring_progress_bar/ring.py

@@ -13,6 +13,11 @@
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+from bec_widgets.widgets.progress.progress_backend import (
+    BECProgressTracker,
+    ProgressSnapshot,
+    ProgressSource,
+)
 
 logger = bec_logger.logger
 if TYPE_CHECKING:
@@ -81,6 +86,8 @@ def __init__(self, parent: RingProgressContainerWidget | None = None, client=Non
         self._color: QColor = self.convert_color(self.config.color)
         self._background_color: QColor = self.convert_color(self.config.background_color)
         self.registered_slot: tuple[Callable, str | EndpointInfo] | None = None
+        self.progress_tracker = BECProgressTracker(self.bec_dispatcher, parent=self)
+        self.progress_tracker.progress_updated.connect(self._on_progress_snapshot)
         self.RID = None
         self._gap = 5
         self._hovered = False
@@ -219,26 +226,18 @@ def set_update(
             case "manual":
                 if self.config.mode == "manual":
                     return
-                if self.registered_slot is not None:
-                    self.bec_dispatcher.disconnect_slot(*self.registered_slot)
+                self._disconnect_registered_update()
                 self.config.mode = "manual"
-                self.registered_slot = None
             case "scan":
                 if self.config.mode == "scan":
                     return
-                if self.registered_slot is not None:
-                    self.bec_dispatcher.disconnect_slot(*self.registered_slot)
+                self._disconnect_registered_update()
                 self.config.mode = "scan"
-                self.bec_dispatcher.connect_slot(
-                    self.on_scan_progress, MessageEndpoints.scan_progress()
-                )
-                self.registered_slot = (self.on_scan_progress, MessageEndpoints.scan_progress())
+                self.progress_tracker.start(source=ProgressSource.SCAN_PROGRESS)
             case "device":
-                if self.registered_slot is not None:
-                    self.bec_dispatcher.disconnect_slot(*self.registered_slot)
+                self._disconnect_registered_update()
                 self.config.mode = "device"
                 if device == "":
-                    self.registered_slot = None
                     return
                 self.config.device = device
                 # self.config.signal = self._get_signal_from_device(device, signal)
@@ -248,6 +247,12 @@ def set_update(
             case _:
                 raise ValueError(f"Unsupported mode: {mode}")
 
+    def _disconnect_registered_update(self):
+        if self.registered_slot is not None:
+            self.bec_dispatcher.disconnect_slot(*self.registered_slot)
+            self.registered_slot = None
+        self.progress_tracker.cleanup()
+
     def set_precision(self, precision: int):
         """
         Set the precision for the ring widget.
@@ -362,15 +367,14 @@ def _update_device_connection(self, device: str, signal: str | None) -> str:
                 return ""
 
         if signal in progress_signals:
-            endpoint = MessageEndpoints.device_progress(device)
-            self.bec_dispatcher.connect_slot(self.on_device_progress, endpoint)
-            self.registered_slot = (self.on_device_progress, endpoint)
+            self.progress_tracker.start(source=ProgressSource.DEVICE_PROGRESS, device=device)
             return signal
         if signal in hinted_signals or signal in normal_signals:
             endpoint = MessageEndpoints.device_readback(device)
             self.bec_dispatcher.connect_slot(self.on_device_readback, endpoint)
             self.registered_slot = (self.on_device_readback, endpoint)
             return signal
+        return ""
 
     @SafeSlot(dict, dict)
     def on_scan_progress(self, msg, meta):
@@ -381,11 +385,10 @@ def on_scan_progress(self, msg, meta):
             msg(dict): Message with the scan progress
             meta(dict): Metadata for the message
         """
-        current_RID = meta.get("RID", None)
-        if current_RID != self.RID:
-            self.set_min_max_values(0, msg.get("max_value", 100))
-        self.set_value(msg.get("value", 0))
-        self.update()
+        if self.progress_tracker.active_rid is None and self.RID is not None:
+            self.progress_tracker._active_rid = self.RID
+            self.progress_tracker._active_scan_id = self.RID
+        self.progress_tracker.process_progress_message(ProgressSource.SCAN_PROGRESS, msg, meta)
 
     @SafeSlot(dict, dict)
     def on_device_readback(self, msg, meta):
@@ -418,12 +421,20 @@ def on_device_progress(self, msg, meta):
         device = self.config.device
         if device is None:
             return
-        max_val = msg.get("max_value", 100)
-        self.set_min_max_values(0, max_val)
-        value = msg.get("value", 0)
-        if msg.get("done"):
-            value = max_val
-        self.set_value(value)
+        self.progress_tracker.process_progress_message(
+            ProgressSource.DEVICE_PROGRESS, msg, meta, device=device
+        )
+
+    def _on_progress_snapshot(self, snapshot: ProgressSnapshot):
+        if snapshot.source == ProgressSource.SCAN_PROGRESS:
+            if snapshot.is_new_scan:
+                self.set_min_max_values(0, snapshot.max_value)
+            self.RID = snapshot.rid
+        else:
+            if self.config.device is None:
+                return
+            self.set_min_max_values(0, snapshot.max_value)
+        self.set_value(snapshot.value)
         self.update()
 
     def paintEvent(self, event):
@@ -517,6 +528,7 @@ def cleanup(self):
         if self.registered_slot is not None:
             self.bec_dispatcher.disconnect_slot(*self.registered_slot)
             self.registered_slot = None
+        self.progress_tracker.cleanup()
 
     ###############################################
     ####### QProperties ###########################