wip fix scan colorcoding

Author: wyzula-jan

bec_widgets/widgets/progress/bec_progressbar/bec_progressbar.py

@@ -20,16 +20,18 @@ class ProgressState(Enum):
     @classmethod
     def from_bec_status(cls, status: str) -> "ProgressState":
         """
-        Map a BEC status string (open, paused, aborted, halted, closed)
+        Map a BEC status string (open, paused, aborted, halt/halted, closed, user_completed)
         to the corresponding ProgressState.
         Any unknown status falls back to NORMAL.
         """
         mapping = {
             "open": cls.NORMAL,
             "paused": cls.PAUSED,
             "aborted": cls.INTERRUPTED,
+            "halt": cls.PAUSED,
             "halted": cls.PAUSED,
             "closed": cls.COMPLETED,
+            "user_completed": cls.PAUSED,
         }
         return mapping.get(status.lower(), cls.NORMAL)
 
@@ -339,6 +341,7 @@ def _sync_progressbar(self) -> None:
 
     def _setup_style_sheet(self, *, chunk_radius: int) -> None:
         radius = int(round(self._corner_radius))
+        chunk_color = self._state_colors[self._current_visual_state()].name()
         self.progressbar.setStyleSheet(f"""
             QProgressBar {{
                 background-color: palette(mid);
@@ -348,7 +351,7 @@ def _setup_style_sheet(self, *, chunk_radius: int) -> None:
                 text-align: center;
             }}
             QProgressBar::chunk {{
-                background-color: palette(highlight);
+                background-color: {chunk_color};
                 border-radius: {chunk_radius}px;
             }}
             """)
@@ -385,6 +388,16 @@ def _calculate_chunk_radius(self, target_radius: int) -> int:
         return min(target_radius, max(1, int(fill_width / 2)))
 
     def _apply_state_style(self) -> None:
+        chunk_radius = self._chunk_radius
+        if chunk_radius is None:
+            target_radius = self._target_chunk_radius()
+            chunk_radius = (
+                self._calculate_chunk_radius(target_radius)
+                if self._enable_dynamic_stylesheet
+                else target_radius
+            )
+            self._chunk_radius = chunk_radius
+        self._setup_style_sheet(chunk_radius=chunk_radius)
         color = self._state_colors[self._current_visual_state()]
         palette = self.progressbar.palette()
         palette.setColor(QPalette.ColorRole.Highlight, color)

bec_widgets/widgets/progress/progress_backend.py

@@ -25,7 +25,7 @@ class ProgressSnapshot:
     value: float
     max_value: float
     done: bool
-    status: Literal["open", "paused", "aborted", "halted", "closed"]
+    status: Literal["open", "paused", "aborted", "halt", "halted", "closed", "user_completed"]
     device: str | None = None
     scan_id: str | None = None
     scan_number: int | None = None
@@ -200,7 +200,9 @@ def current_snapshot(
         value: float,
         max_value: float,
         done: bool,
-        status: Literal["open", "paused", "aborted", "halted", "closed"] = "open",
+        status: Literal[
+            "open", "paused", "aborted", "halt", "halted", "closed", "user_completed"
+        ] = "open",
         is_new_scan: bool = False,
     ) -> ProgressSnapshot:
         source = self._progress_source or ProgressSource.SCAN_PROGRESS
@@ -257,9 +259,9 @@ def process_progress_message(
         done = msg_content.get("done", False)
         value = msg_content.get("value", 0)
         max_value = msg_content.get("max_value", 100)
-        status: Literal["open", "paused", "aborted", "halted", "closed"] = metadata.get(
-            "status", "open"
-        )
+        status: Literal[
+            "open", "paused", "aborted", "halt", "halted", "closed", "user_completed"
+        ] = metadata.get("status", "open")
         if done and source == ProgressSource.DEVICE_PROGRESS:
             value = max_value
         scan_id = metadata.get("scan_id") or metadata.get("RID")

bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py

@@ -149,7 +149,8 @@ def _on_progress_snapshot(self, snapshot: ProgressSnapshot):
         self.update_labels()
         self.update_source_label(snapshot.source, device=snapshot.device)
         self.progressbar.set_maximum(snapshot.max_value)
-        self.progressbar.state = ProgressState.from_bec_status(snapshot.status)
+        state = ProgressState.from_bec_status(snapshot.status)
+        self.progressbar.state = state
         self.progressbar.set_value(snapshot.value)
 
     @SafeProperty(bool)

tests/unit_tests/test_bec_progressbar.py

@@ -63,7 +63,10 @@ def test_progressbar_uses_static_stylesheet_with_palette_state_color(progressbar
 
     style_sheet = progressbar.progressbar.styleSheet()
     assert "QProgressBar::chunk" in style_sheet
-    assert "background-color: palette(highlight);" in style_sheet
+    assert (
+        f"background-color: {progressbar._state_colors[ProgressState.PAUSED].name()};"
+        in style_sheet
+    )
     assert "background-color: palette(mid);" in style_sheet
     assert "border-radius: 7px;" in style_sheet
     assert (
@@ -171,8 +174,10 @@ def test_progress_state_from_bec_status():
         "open": ProgressState.NORMAL,
         "paused": ProgressState.PAUSED,
         "aborted": ProgressState.INTERRUPTED,
+        "halt": ProgressState.PAUSED,
         "halted": ProgressState.PAUSED,
         "closed": ProgressState.COMPLETED,
+        "user_completed": ProgressState.PAUSED,
         "UNKNOWN": ProgressState.NORMAL,  # fallback
     }
     for text, expected in mapping.items():

tests/unit_tests/test_scan_progress_bar.py

@@ -125,8 +125,10 @@ def test_on_progress_update(qtbot, scan_progressbar):
         ("open", 10, 100, ProgressState.NORMAL),
         ("paused", 25, 100, ProgressState.PAUSED),
         ("aborted", 30, 100, ProgressState.INTERRUPTED),
+        ("halt", 40, 100, ProgressState.PAUSED),
         ("halted", 40, 100, ProgressState.PAUSED),
         ("closed", 100, 100, ProgressState.COMPLETED),
+        ("user_completed", 40, 100, ProgressState.PAUSED),
     ],
 )
 def test_state_mapping_during_updates(