enh: fixed refractory errors

Author: Lucia-Poma

src/clinical_dbs_annotator/views/base_view.py

@@ -6,7 +6,7 @@
 """
 
 from PySide6.QtGui import QIcon, QPixmap
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
 
 
 class BaseStepView(QWidget):
@@ -82,5 +82,7 @@ def legend_item(color: str, text: str, border: str) -> QWidget:
 
     def refresh_theme_icons(self) -> None:
         """Refresh icons that depend on the current theme (call after theme toggle)."""
-        # Base implementation - subclasses can override to refresh specific buttons
-        pass
+        # Auto-discover all settings buttons by objectName pattern
+        for btn in self.findChildren(QPushButton):
+            if btn.objectName() and "settings" in btn.objectName().lower():
+                btn.setIcon(self._create_settings_icon())

src/clinical_dbs_annotator/views/step1_view.py

@@ -100,6 +100,10 @@ def __init__(self, parent_style=None):
 
         self._setup_ui()
 
+    def get_header_title(self) -> str:
+        """Return the wizard header title for Step 1."""
+        return "Clinical Programming Session Setup"
+
     def _is_single_grouped_directional(self, cathode_labels: list[str], canvas) -> bool:
         """Check if a single cathode label represents a grouped directional contact."""
         if len(cathode_labels) != 1 or not canvas or not canvas.model:
@@ -235,8 +239,6 @@ def _create_settings_group(self) -> QGroupBox:
         edit_programs_btn.clicked.connect(self._edit_program_names)
         group_row_layout.addWidget(edit_programs_btn)
 
-        group_row_layout.addStretch()
-
         group_row.setLayout(group_row_layout)
 
         freq_limits = STIMULATION_LIMITS["frequency"]
@@ -439,6 +441,7 @@ def _create_settings_group(self) -> QGroupBox:
         sidebar_scroll.setFrameShape(QFrame.NoFrame)
         sidebar_scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         sidebar_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+        sidebar_scroll.setMinimumWidth(380)
         sidebar_scroll.setWidget(sidebar_widget)
 
         electrodes_layout = QVBoxLayout()
@@ -933,25 +936,6 @@ def _toggle_electrode(self, side: str, checked: bool) -> None:
                 else:
                     widget.setGraphicsEffect(None)
 
-    def _apply_preset_scales(self, scales: list[str]) -> None:
-        """Apply a list of preset scales to the clinical scales container."""
-        # Remove any existing stretches from container
-        while self.clinical_scales_container.count():
-            item = self.clinical_scales_container.takeAt(0)
-            if item.spacerItem():
-                # Just remove the stretch, no widget to delete
-                continue
-            elif item.widget():
-                item.widget().deleteLater()
-
-        for scale_name in scales:
-            self._add_clinical_scale_row(
-                scale_name, with_minus=True, on_remove=self.on_remove_callback
-            )
-
-        self._add_clinical_scale_row("", with_plus=True, on_add=self.on_add_callback)
-        self.clinical_scales_container.addStretch()
-
     def _create_notes_group(self) -> QGroupBox:
         """Create the initial notes group box."""
         gb_notes = QGroupBox("Initial notes")
@@ -1216,12 +1200,19 @@ def _load_existing_file(self, file_path: str) -> None:
 
                 # Load clinical scales
                 block0_scales = []
-                # Re-read file to get all scales from the latest initial session
+                latest_block_id = initial_rows[max_session_id]["block_id"]
+                # Re-read file to get scales from the latest initial block only
                 with open(file_path, newline="", encoding="utf-8") as f:
                     reader = csv.DictReader(f, delimiter="\t")
                     for row in reader:
+                        try:
+                            bid = int(float(row.get("block_id", "")))
+                            sid = int(float(row.get("session_ID", "")))
+                        except ValueError, TypeError:
+                            continue
                         if (
-                            row.get("session_ID") == str(max_session_id)
+                            sid == max_session_id
+                            and bid == latest_block_id
                             and row.get("is_initial") == "1"
                         ):
                             sname = row.get("scale_name", None)
@@ -1231,6 +1222,15 @@ def _load_existing_file(self, file_path: str) -> None:
                                     (str(sname), "" if sval is None else str(sval))
                                 )
 
+                # Deduplicate scales by name (keep last occurrence)
+                seen_scales = set()
+                deduplicated_scales = []
+                for name, value in reversed(block0_scales):
+                    if name not in seen_scales:
+                        seen_scales.add(name)
+                        deduplicated_scales.append((name, value))
+                block0_scales = list(reversed(deduplicated_scales))
+
                 # Load notes
                 notes_val = latest_initial.get("notes", None)
                 if notes_val not in (None, "") and hasattr(self, "notes_edit"):

src/clinical_dbs_annotator/views/step2_view.py

@@ -61,12 +61,6 @@ def get_header_title(self) -> str:
         """Return the wizard header title for Step 2."""
         return "Session Scale Configuration"
 
-    def refresh_theme_icons(self) -> None:
-        """Refresh icons that depend on the current theme (call after theme toggle)."""
-        btn = self.findChild(QPushButton, "settings_session_scales")
-        if btn:
-            btn.setIcon(self._create_settings_icon())
-
     def _setup_ui(self) -> None:
         """Set up the UI layout."""
         # Session scales group

src/clinical_dbs_annotator/views/step3_view.py

@@ -91,7 +91,7 @@ def __init__(self, parent_style=None):
 
     def get_header_title(self) -> str:
         """Return the wizard header title for Step 3."""
-        return self._get_step_title()
+        return "Programming Session Ongoing"
 
     def _undo_last_entry(self) -> None:
         """Show confirmation dialog and delete the last block_ID entry from TSV."""
@@ -110,65 +110,15 @@ def _undo_last_entry(self) -> None:
     def _setup_ui(self) -> None:
         """Set up the UI layout."""
 
-        # Left macro-panel: Stimulation params + electrodes
-        left_container = QGroupBox("Session settings")
-        left_container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        left_container_layout = QHBoxLayout(left_container)
-        left_container_layout.setContentsMargins(0, 0, 0, 0)
+        # Left side: Session settings (params + electrodes)
+        left_widget = QWidget()
+        left_layout = QVBoxLayout(left_widget)
+        left_layout.setContentsMargins(0, 0, 0, 0)
+        settings_group = self._create_session_settings_group()
+        left_layout.addWidget(settings_group)
+        left_widget.setMinimumWidth(500)
 
-        params_group = self._create_stimulation_params_group()
-
-        # Wrap sidebar in a scroll area like step1_view
-        sidebar_widget = params_group
-        sidebar_scroll = QScrollArea()
-        sidebar_scroll.setStyleSheet("""
-            QScrollArea {
-                background: transparent;
-                border: none;
-            }
-            QScrollArea > QWidget > QWidget {
-                background: transparent;
-            }
-        """)
-        sidebar_scroll.setWidgetResizable(True)
-        sidebar_scroll.setFrameShape(QFrame.NoFrame)
-        sidebar_scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
-        sidebar_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        sidebar_scroll.setWidget(sidebar_widget)
-
-        left_container_layout.addWidget(sidebar_scroll, 1)
-
-        electrodes_layout = QVBoxLayout()
-        electrodes_row = QHBoxLayout()
-
-        self.left_canvas_group = QGroupBox("Left electrode")
-        self.left_canvas_group.setCheckable(True)
-        self.left_canvas_group.setChecked(True)
-        self.left_canvas_group.toggled.connect(
-            lambda checked: self._toggle_electrode("left", checked)
-        )
-        left_canvas_layout = QVBoxLayout()
-        left_canvas_layout.addWidget(self.left_canvas, 1)
-        self.left_canvas_group.setLayout(left_canvas_layout)
-
-        self.right_canvas_group = QGroupBox("Right electrode")
-        self.right_canvas_group.setCheckable(True)
-        self.right_canvas_group.setChecked(True)
-        self.right_canvas_group.toggled.connect(
-            lambda checked: self._toggle_electrode("right", checked)
-        )
-        right_canvas_layout = QVBoxLayout()
-        right_canvas_layout.addWidget(self.right_canvas, 1)
-        self.right_canvas_group.setLayout(right_canvas_layout)
-
-        electrodes_row.addWidget(self.left_canvas_group, 1)
-        electrodes_row.addWidget(self.right_canvas_group, 1)
-
-        electrodes_layout.addLayout(electrodes_row)
-        electrodes_layout.addLayout(self._create_electrode_legend_layout())
-        left_container_layout.addLayout(electrodes_layout, 2)
-
-        # Right macro-panel: Scales and notes
+        # Right side: Scales and notes
         right_widget = QWidget()
         right_layout = QVBoxLayout(right_widget)
         right_layout.setContentsMargins(0, 0, 0, 0)
@@ -177,20 +127,17 @@ def _setup_ui(self) -> None:
         right_layout.addWidget(create_horizontal_line())
         notes_group = self._create_session_notes_group()
         right_layout.addWidget(notes_group)
-
-        # left_container.setMinimumWidth(500)
         right_widget.setMinimumWidth(400)
 
         # Splitter: right panel shrinks first (stretch=1), left stays stable (stretch=0)
         splitter = QSplitter(Qt.Horizontal)
-        splitter.addWidget(left_container)
+        splitter.addWidget(left_widget)
         splitter.addWidget(right_widget)
         splitter.setStretchFactor(0, 0)
         splitter.setStretchFactor(1, 1)
         splitter.setChildrenCollapsible(False)
 
         self.main_layout.addWidget(splitter)
-        # self.main_layout.addStretch(1)
 
         self.undo_button = QPushButton("Undo")
         self.undo_button.setIcon(
@@ -231,12 +178,14 @@ def _setup_ui(self) -> None:
         # Set menu to button
         self.export_button.setMenu(self.export_menu)
 
-    def _create_stimulation_params_group(self) -> QWidget:
-        """Create the stimulation parameters container."""
-        container = QWidget()
-        container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        # container.setMinimumWidth(380)
-        sidebar_layout = QVBoxLayout(container)
+    def _create_session_settings_group(self) -> QGroupBox:
+        """Create the session settings group box."""
+        gb_session = QGroupBox("Session settings")
+        gb_session.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        container_layout = QHBoxLayout()
+
+        sidebar_layout = QVBoxLayout()
 
         group_row = QGroupBox("Program")
         group_row_layout = QHBoxLayout()
@@ -262,8 +211,6 @@ def _create_stimulation_params_group(self) -> QWidget:
         edit_programs_btn.clicked.connect(self._edit_program_names)
         group_row_layout.addWidget(edit_programs_btn)
 
-        group_row_layout.addStretch()
-
         group_row.setLayout(group_row_layout)
 
         freq_limits = STIMULATION_LIMITS["frequency"]
@@ -447,7 +394,61 @@ def _create_stimulation_params_group(self) -> QWidget:
         sidebar_layout.addWidget(self.right_group)
         sidebar_layout.addStretch(1)
 
-        return container
+        sidebar_widget = QWidget()
+        sidebar_widget.setLayout(sidebar_layout)
+        sidebar_scroll = QScrollArea()
+        sidebar_scroll.setStyleSheet("""
+            QScrollArea {
+                background: transparent;
+                border: none;
+            }
+            QScrollArea > QWidget > QWidget {
+                background: transparent;
+            }
+        """)
+        sidebar_scroll.setWidgetResizable(True)
+        sidebar_scroll.setFrameShape(QFrame.NoFrame)
+        sidebar_scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        sidebar_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+        sidebar_scroll.setMinimumWidth(380)
+        sidebar_scroll.setWidget(sidebar_widget)
+
+        electrodes_layout = QVBoxLayout()
+        electrodes_row = QHBoxLayout()
+
+        self.left_canvas_group = QGroupBox("Left electrode")
+        self.left_canvas_group.setCheckable(True)
+        self.left_canvas_group.setChecked(True)
+        self.left_canvas_group.toggled.connect(
+            lambda checked: self._toggle_electrode("left", checked)
+        )
+        left_canvas_layout = QVBoxLayout()
+        left_canvas_layout.addWidget(self.left_canvas, 1)
+        self.left_canvas_group.setLayout(left_canvas_layout)
+
+        self.right_canvas_group = QGroupBox("Right electrode")
+        self.right_canvas_group.setCheckable(True)
+        self.right_canvas_group.setChecked(True)
+        self.right_canvas_group.toggled.connect(
+            lambda checked: self._toggle_electrode("right", checked)
+        )
+        right_canvas_layout = QVBoxLayout()
+        right_canvas_layout.addWidget(self.right_canvas, 1)
+        self.right_canvas_group.setLayout(right_canvas_layout)
+
+        electrodes_row.addWidget(self.left_canvas_group, 1)
+        electrodes_row.addWidget(self.right_canvas_group, 1)
+
+        electrodes_layout.addLayout(electrodes_row)
+        electrodes_layout.addLayout(self._create_electrode_legend_layout())
+
+        container_layout.addWidget(sidebar_scroll, 0)
+        container_layout.addLayout(electrodes_layout, 1)
+
+        layout = QVBoxLayout(gb_session)
+        layout.addLayout(container_layout)
+
+        return gb_session
 
     def _on_left_canvas_validation(self, is_valid: bool, error_msg: str) -> None:
         """Callback when left electrode canvas validation state changes."""