Add width/height UI hooks and adjust OpenCV tests

Enable apply button when cam_width/cam_height change in CameraConfigDialog. Expand test helper make_settings to include width, height, backend and name, and update OpenCV backend tests to: prefer properties.resolution over width/height; fall back to width/height when no property; default to (720,540) when nothing requested; and use width/height if legacy resolution is absent. Adjust tests to expect fast_start to preserve the requested resolution (do not overwrite settings) and to nest OpenCV-specific flags under an "opencv" properties key. Update GUI unit test monkeypatch for backend capabilities and switch a recording UI test to use allow_processor_ctrl_checkbox instead of auto_record_checkbox.

Author: C-Achard

dlclivegui/gui/camera_config_dialog.py

@@ -645,7 +645,15 @@ def _connect_signals(self) -> None:
         self.cancel_btn.clicked.connect(self.reject)
         self.scan_started.connect(lambda _: setattr(self, "_dialog_active", True))
         self.scan_finished.connect(lambda: setattr(self, "_dialog_active", False))
-        for sb in (self.cam_fps, self.cam_crop_x0, self.cam_crop_y0, self.cam_crop_x1, self.cam_crop_y1):
+        for sb in (
+            self.cam_fps,
+            self.cam_crop_x0,
+            self.cam_crop_y0,
+            self.cam_crop_x1,
+            self.cam_crop_y1,
+            self.cam_width,
+            self.cam_height,
+        ):
             if hasattr(sb, "valueChanged"):
                 sb.valueChanged.connect(lambda _=None: self.apply_settings_btn.setEnabled(True))
         self.cam_rotation.currentIndexChanged.connect(lambda _: self.apply_settings_btn.setEnabled(True))

tests/cameras/backends/test_opencv_backend.py

@@ -8,20 +8,45 @@
 pytestmark = pytest.mark.unit
 
 
-def make_settings(index=0, fps=30.0, properties=None):
-    """Minimal settings object compatible with CameraBackend usage."""
+def make_settings(index=0, fps=30.0, properties=None, *, width=0, height=0, backend="opencv", name="Test"):
+    """Minimal settings object compatible with OpenCVCameraBackend usage."""
     if properties is None:
         properties = {}
-    return SimpleNamespace(index=index, fps=fps, properties=properties)
+    return SimpleNamespace(
+        index=index,
+        fps=fps,
+        properties=properties,
+        width=width,
+        height=height,
+        backend=backend,
+        name=name,
+    )
+
 
+def test_requested_resolution_precedence_property_over_width_height():
+    settings = make_settings(
+        properties={"resolution": (800, 600)},
+        width=1280,
+        height=720,
+    )
+    backend = ob.OpenCVCameraBackend(settings)
+    assert backend._get_requested_resolution() == (800, 600)
 
-def test_parse_resolution_defaults_and_invalid_values():
-    backend = ob.OpenCVCameraBackend(make_settings(properties={}))
-    assert backend._parse_resolution(None) == (720, 540)
-    assert backend._parse_resolution([1280, 720]) == (1280, 720)
-    assert backend._parse_resolution(("1920", "1080")) == (1920, 1080)
-    assert backend._parse_resolution(("bad", 123)) == (720, 540)
-    assert backend._parse_resolution("nope") == (720, 540)
+
+def test_requested_resolution_uses_width_height_when_no_property_resolution():
+    settings = make_settings(
+        properties={},
+        width=1280,
+        height=720,
+    )
+    backend = ob.OpenCVCameraBackend(settings)
+    assert backend._get_requested_resolution() == (1280, 720)
+
+
+def test_requested_resolution_defaults_when_no_request():
+    settings = make_settings(properties={}, width=0, height=0)
+    backend = ob.OpenCVCameraBackend(settings)
+    assert backend._get_requested_resolution() == (720, 540)
 
 
 def test_try_open_windows_fallback_to_msmf(monkeypatch, fake_capture_factory):
@@ -68,7 +93,7 @@ def fake_videocapture(index, flag):
 
     monkeypatch.setattr(ob.cv2, "VideoCapture", fake_videocapture)
 
-    settings = make_settings(index=0, fps=30.0, properties={"alt_index_probe": True})
+    settings = make_settings(index=0, fps=30.0, properties={"opencv": {"alt_index_probe": True}})
     backend = ob.OpenCVCameraBackend(settings)
     backend.open()
 
@@ -145,7 +170,6 @@ def test_configure_capture_sets_resolution_and_fps_non_faststart_windows(monkeyp
     backend._configure_capture()
 
     assert backend.actual_resolution == (800, 600)
-    assert settings.properties["resolution"] == (800, 600)
     assert backend.actual_fps is not None
     assert isinstance(backend.actual_fps, float)
 
@@ -157,18 +181,20 @@ def test_configure_capture_fast_start_does_not_force_resolution(monkeypatch, fak
     cap.props[ob.cv2.CAP_PROP_FRAME_WIDTH] = 1920.0
     cap.props[ob.cv2.CAP_PROP_FRAME_HEIGHT] = 1080.0
 
-    settings = make_settings(index=0, fps=30.0, properties={"resolution": (1280, 720), "opencv": {"fast_start": True}})
+    settings = make_settings(
+        index=0,
+        fps=30.0,
+        properties={"resolution": (1280, 720), "opencv": {"fast_start": True}},
+    )
     backend = ob.OpenCVCameraBackend(settings)
     backend._capture = cap
 
     backend._configure_capture()
 
-    assert backend.actual_resolution == (1920, 1080)
+    # Fast-start still applies requested resolution, just without verification
+    assert backend.actual_resolution == (1280, 720)
 
-    # Fast-start does not configure the camera; it only reports the current mode.
-    # Keep "resolution" as the requested intent (do not overwrite with observed values).
-    # Settings are applied later when user clicks "Apply settings" in the UI,
-    # so it's important not to overwrite them here.
+    # Requested intent must remain unchanged
     assert settings.properties["resolution"] == (1280, 720)
 
 
@@ -181,9 +207,7 @@ def test_configure_capture_applies_only_safe_numeric_properties(monkeypatch, fak
         fps=30.0,
         properties={
             "resolution": (640, 480),
-            "api": "ANY",
-            "fast_start": False,
-            "alt_index_probe": False,
+            "opencv": {"api": "ANY", "fast_start": False, "alt_index_probe": False},
             str(int(getattr(ob.cv2, "CAP_PROP_GAIN", 14))): 7,
             "999": 123,
             "not-a-number": 1,
@@ -213,3 +237,20 @@ def test_close_and_stop_release_capture(fake_capture_factory):
     backend.stop()
     assert backend._capture is None
     assert cap2.released is True
+
+
+def test_configure_capture_uses_width_height_when_no_legacy_resolution(monkeypatch, fake_capture_factory):
+    monkeypatch.setattr(ob.platform, "system", lambda: "Windows")
+
+    cap = fake_capture_factory(opened=True, backend_name="DSHOW")
+    cap.props[ob.cv2.CAP_PROP_FRAME_WIDTH] = 640.0
+    cap.props[ob.cv2.CAP_PROP_FRAME_HEIGHT] = 480.0
+    cap.props[ob.cv2.CAP_PROP_FPS] = 30.0
+
+    settings = make_settings(index=0, fps=30.0, properties={}, width=1024, height=768)
+    backend = ob.OpenCVCameraBackend(settings)
+    backend._capture = cap
+
+    backend._configure_capture()
+
+    assert backend.actual_resolution == (1024, 768)

tests/gui/camera_config/test_cam_dialog_unit.py

@@ -68,7 +68,36 @@ def test_apply_settings_updates_model(dialog, qtbot):
 
 
 @pytest.mark.gui
-def test_backend_control_disables_exposure_gain_for_opencv(dialog):
+def test_backend_control_disables_exposure_gain_for_opencv(dialog, monkeypatch):
+    from dlclivegui.cameras.base import SupportLevel
+
+    def fake_caps(name: str):
+        if name == "opencv":
+            return {
+                "set_exposure": SupportLevel.UNSUPPORTED,  # or UNSUPPORTED if you prefer
+                "set_gain": SupportLevel.UNSUPPORTED,
+                "set_resolution": SupportLevel.SUPPORTED,
+                "set_fps": SupportLevel.BEST_EFFORT,
+                "device_discovery": SupportLevel.SUPPORTED,
+                "stable_identity": SupportLevel.SUPPORTED,
+            }
+        if name == "basler":
+            return {
+                "set_exposure": SupportLevel.SUPPORTED,
+                "set_gain": SupportLevel.SUPPORTED,
+                "set_resolution": SupportLevel.SUPPORTED,
+                "set_fps": SupportLevel.SUPPORTED,
+                "device_discovery": SupportLevel.BEST_EFFORT,
+                "stable_identity": SupportLevel.SUPPORTED,
+            }
+        return {}
+
+    monkeypatch.setattr(
+        "dlclivegui.cameras.CameraFactory.backend_capabilities",
+        lambda backend_name: fake_caps(backend_name),
+        raising=False,
+    )
+
     dialog._update_controls_for_backend("opencv")
     assert not dialog.cam_exposure.isEnabled()
     assert not dialog.cam_gain.isEnabled()

tests/gui/test_recording_paths_ui.py

@@ -139,7 +139,7 @@ def test_processor_overrides_session_name_and_persists(window, start_all_spy, mo
     # Arrange window state so processor status logic runs
     window._dlc_active = True
     window._dlc_initialized = True
-    window.auto_record_checkbox.setChecked(True)
+    window.allow_processor_ctrl_checkbox.setChecked(True)
 
     # Patch start_recording to avoid preview start/timers
     monkeypatch.setattr(window, "_start_recording", lambda: window._start_multi_camera_recording())