always show checked rows

Author: tlambert03

src/pymmcore_widgets/config_presets/_config_groups_editor.py

@@ -14,6 +14,7 @@
     QLabel,
     QSpacerItem,
     QSplitter,
+    QTableWidgetItem,
     QVBoxLayout,
     QWidget,
 )
@@ -239,11 +240,11 @@ def _update_model_from_gui(self) -> None:
             preset.settings = list(self.currentSettings())
 
 
-def _is_not_objective(prop: DeviceProperty) -> bool:
+def _is_not_objective(item: QTableWidgetItem, prop: DeviceProperty) -> bool:
     return not any(x in prop.device for x in prop.core.guessObjectiveDevices())
 
 
-def _light_path_predicate(prop: DeviceProperty) -> bool | None:
+def _light_path_predicate(item: QTableWidgetItem, prop: DeviceProperty) -> bool | None:
     devtype = prop.deviceType()
     if devtype in (
         DeviceType.Camera,
@@ -258,7 +259,7 @@ def _light_path_predicate(prop: DeviceProperty) -> bool | None:
             return False
     if devtype == DeviceType.Shutter and prop.name == Keyword.State.value:
         return False
-    if not _is_not_objective(prop):
+    if not _is_not_objective(item, prop):
         return False
     return None
 
@@ -299,12 +300,25 @@ def __init__(self, parent: QWidget | None = None) -> None:
         layout.addLayout(shutter_layout)
         layout.addWidget(self.props)
 
-    def _show_all_toggled(self, checked: bool) -> None:
+    def _show_all_toggled(self, show_all: bool) -> None:
+        def predicate_with_checked_override(
+            item: QTableWidgetItem, prop: DeviceProperty
+        ) -> bool | None:
+            """Predicate that shows checked properties regardless of heuristic."""
+            # Always show checked rows
+            if item.checkState() == Qt.CheckState.Checked:
+                return True
+            # For unchecked properties, apply the original heuristic
+            if not show_all:
+                return _light_path_predicate(item, prop)
+            else:
+                return _is_not_objective(item, prop)
+
         self.props.filterDevices(
             exclude_devices=(DeviceType.Camera, DeviceType.Core),
             include_read_only=False,
             include_pre_init=False,
-            predicate=_light_path_predicate if not checked else _is_not_objective,
+            predicate=predicate_with_checked_override,
         )
 
     def settings(self) -> Iterable[tuple[str, str, str]]:

src/pymmcore_widgets/device_properties/_device_property_table.py

@@ -206,28 +206,21 @@ def filterDevices(
         include_read_only: bool = True,
         include_pre_init: bool = True,
         init_props_only: bool = False,
-        predicate: Callable[[DeviceProperty], bool | None] | None = None,
+        predicate: (
+            Callable[[QTableWidgetItem, DeviceProperty], bool | None] | None
+        ) = None,
     ) -> None:
         """Update the table to only show devices that match the given query/filter."""
         exclude_devices = set(exclude_devices)
         include_devices = set(include_devices)
         for row in range(self.rowCount()):
-            item = self.item(row, 0)
-            prop = cast("DeviceProperty", item.data(self.PROP_ROLE))
-            if include_devices and prop.deviceType() not in include_devices:
-                self.hideRow(row)
+            if (item := self.item(row, 0)) is None:
                 continue
-            if predicate:
-                result = predicate(prop)
-                if result is False:
-                    self.hideRow(row)
-                    continue
-                # if result is True:
-                # self.showRow(row)
-                # continue
-                # for None: fall through to other filters
+            prop = cast("DeviceProperty", item.data(self.PROP_ROLE))
             if (
-                (prop.isReadOnly() and not include_read_only)
+                (include_devices and prop.deviceType() not in include_devices)
+                or (predicate and predicate(item, prop) is False)
+                or (prop.isReadOnly() and not include_read_only)
                 or (prop.isPreInit() and not include_pre_init)
                 or (init_props_only and not prop.isPreInit())
                 or (prop.deviceType() in exclude_devices)

tests/test_config_groups_editor.py

@@ -39,7 +39,6 @@ def test_checked_properties_remain_visible(
 
     # First, enable "show all properties" to see all available properties
     show_all_checkbox.setChecked(True)
-    qtbot.wait(10)  # Allow UI to update
 
     # Find a property that would normally be hidden by the heuristic
     # Look for properties visible now but hidden when show_all is False
@@ -52,15 +51,13 @@ def test_checked_properties_remain_visible(
 
     # Temporarily disable show_all to see which rows get hidden
     show_all_checkbox.setChecked(False)
-    qtbot.wait(10)
 
     for row in visible_rows_all:
         if props_table.isRowHidden(row):
             hidden_by_heuristic_rows.append(row)
 
     # Re-enable show_all
     show_all_checkbox.setChecked(True)
-    qtbot.wait(10)
 
     # Skip test if no properties are hidden by heuristic
     if not hidden_by_heuristic_rows:
@@ -74,14 +71,12 @@ def test_checked_properties_remain_visible(
     assert item is not None, f"No item found at row {test_row}"
 
     item.setCheckState(Qt.CheckState.Checked)
-    qtbot.wait(10)
 
     # Verify the property is checked
     assert item.checkState() == Qt.CheckState.Checked
 
     # Now disable "show all properties" - this should trigger the filtering
     show_all_checkbox.setChecked(False)
-    qtbot.wait(10)
 
     # The checked property should still be visible despite the heuristic
     assert not props_table.isRowHidden(test_row), (