fix: default to select all on first load, preserve selection on update

Author: Carogg28

poriscope/plugins/analysistabs/utils/eventAnalysisControls.py

@@ -43,6 +43,7 @@
     QGroupBox,
     QHBoxLayout,
     QLabel,
+    QListWidgetItem,
     QPushButton,
     QSizePolicy,
     QToolButton,
@@ -612,18 +613,50 @@ def on_button_clicked(self, button_type):
         button_mapping.get(button_type, lambda: None).setChecked(False)
 
     def update_channels(self, channels):
+        """
+        Updates the channels displayed in the MultiSelectComboBox widget and restores previous selections.
+        """
         self.logger.info(f"Updating channels to {channels}")
 
-        # Store the current selection(s)
-        current_selections = self.channel_comboBox.getSelectedItems()
+        # Get current selections from the MultiSelectComboBox BEFORE clearing
+        current_selections = set(self.channel_comboBox.getSelectedItems())
+        self.logger.debug(
+            f"Current selections before restoration: {current_selections}"
+        )
+
+        new_channels = [str(i) for i in channels]
+
+        # Check if this is a first load (no items exist yet) to default to Select All
+        is_first_load = self.channel_comboBox.listWidget.count() == 0
+
+        # Block signals during the entire rebuild to avoid emitting incorrect states
+        self.channel_comboBox.listWidget.itemChanged.disconnect(
+            self.channel_comboBox.handleItemChanged
+        )
+
+        # Clear and rebuild items, preserving checked state from previous selections.
+        # On first load, default all channels to checked (Select All behavior).
+        self.channel_comboBox.listWidget.clear()
+        for text in new_channels:
+            item = QListWidgetItem(text, self.channel_comboBox.listWidget)
+            item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
+            # On first load select all by default, otherwise restore previous selection
+            state = Qt.Checked if (is_first_load or text in current_selections) else Qt.Unchecked
+            item.setCheckState(state)
+
+        self.logger.debug(f"Added channels: {new_channels}")
+
+        self.channel_comboBox.listWidget.itemChanged.connect(
+            self.channel_comboBox.handleItemChanged
+        )
 
-        self.channel_comboBox.clear()
-        self.channel_comboBox.addItems([str(i) for i in channels])
+        # Update display text and Select All button without emitting selectionChanged
+        self.channel_comboBox.refreshDisplayText()
+        self.channel_comboBox.updateSelectAllButton()
 
-        # Restore selections if they still exist
-        for selection in current_selections:
-            if selection in [str(i) for i in channels]:
-                self.channel_comboBox.selectItem(selection)
+        # Log the final state of selections
+        restored_selections = self.channel_comboBox.getSelectedItems()
+        self.logger.debug(f"Selected items after restoration: {restored_selections}")
 
     def update_loaders(self, loaders: list[str]) -> None:
         self.logger.info(f"Updating loaders: {loaders}")

poriscope/plugins/analysistabs/utils/rawdatacontrols.py

@@ -28,14 +28,15 @@
 import os
 from pathlib import Path
 
-from PySide6.QtCore import QCoreApplication, QSize, Signal
+from PySide6.QtCore import QCoreApplication, QSize, Qt, Signal
 from PySide6.QtGui import QFont
 from PySide6.QtWidgets import (
     QComboBox,
     QGridLayout,
     QGroupBox,
     QHBoxLayout,
     QLabel,
+    QListWidgetItem,
     QPushButton,
     QSizePolicy,
     QToolButton,
@@ -679,31 +680,44 @@ def update_channels(self, channels):
         """
         self.logger.info(f"Updating channels to {channels}")
 
-        # Get current selections from the MultiSelectComboBox
-        current_selections = self.channel_comboBox.getSelectedItems()
+        # Get current selections from the MultiSelectComboBox BEFORE clearing
+        current_selections = set(self.channel_comboBox.getSelectedItems())
         self.logger.debug(
             f"Current selections before restoration: {current_selections}"
         )
 
-        # Clear and add new channels to the MultiSelectComboBox
         new_channels = [str(i) for i in channels]
-        self.channel_comboBox.addItems(new_channels)
-        self.logger.debug(f"Added channels: {new_channels}")
 
-        # Restore previous selections that are still valid
+        # Check if this is a first load (no items exist yet) to default to Select All
+        is_first_load = self.channel_comboBox.listWidget.count() == 0
+
+        # Block signals during the entire rebuild to avoid emitting incorrect states
         self.channel_comboBox.listWidget.itemChanged.disconnect(
             self.channel_comboBox.handleItemChanged
         )
-        for selection in current_selections:
-            if selection in new_channels:
-                self.channel_comboBox.selectItem(selection)
+
+        # Clear and rebuild items, preserving checked state from previous selections.
+        # On first load, default all channels to checked (Select All behavior).
+        self.channel_comboBox.listWidget.clear()
+        for text in new_channels:
+            item = QListWidgetItem(text, self.channel_comboBox.listWidget)
+            item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
+            # On first load select all by default, otherwise restore previous selection
+            state = Qt.Checked if (is_first_load or text in current_selections) else Qt.Unchecked
+            item.setCheckState(state)
+
+        self.logger.debug(f"Added channels: {new_channels}")
+
         self.channel_comboBox.listWidget.itemChanged.connect(
             self.channel_comboBox.handleItemChanged
         )
 
+        # Update display text and Select All button without emitting selectionChanged
+        self.channel_comboBox.refreshDisplayText()
+        self.channel_comboBox.updateSelectAllButton()
+
         # Log the final state of selections
         restored_selections = self.channel_comboBox.getSelectedItems()
-        self.channel_comboBox.refreshDisplayText()
         self.logger.debug(f"Selected items after restoration: {restored_selections}")
 
     def update_readers(self, readers: list[str]) -> None: