Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dlclivegui/gui/camera_config/camera_config_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ def _on_active_camera_selected(self, row: int) -> None:
LOGGER.debug("[Selection] Suppressed currentRowChanged event at index %d.", row)
return
prev_row = self._current_edit_index
LOGGER.info(
LOGGER.debug(
"[Select] row=%s prev=%s preview_state=%s",
row,
prev_row,
Expand Down Expand Up @@ -878,7 +878,7 @@ def _apply_camera_settings(self) -> bool:
self._working_settings.cameras[row] = new_model
self._update_active_list_item(row, new_model)

LOGGER.info(
LOGGER.debug(
"[Apply] backend=%s idx=%s changes=%s",
getattr(new_model, "backend", None),
getattr(new_model, "index", None),
Expand All @@ -903,7 +903,7 @@ def _apply_camera_settings(self) -> bool:
if should_consider_restart:
restart = self._should_restart_preview(old_settings, new_model)

LOGGER.info(
LOGGER.debug(
"[Apply] preview_state=%s restart=%s backend=%s idx=%s",
self._preview.state,
restart,
Expand Down Expand Up @@ -1237,7 +1237,7 @@ def _begin_preview_load(self, cam: CameraSettings, *, reason: str) -> None:
- Creates and wires loader
- Sets requested_cam
"""
LOGGER.info("[Preview] begin load reason=%s backend=%s idx=%s", reason, cam.backend, cam.index)
LOGGER.debug("[Preview] begin load reason=%s backend=%s idx=%s", reason, cam.backend, cam.index)

# If already loading, just coalesce restart/intention
if self._preview.state == PreviewState.LOADING:
Expand Down Expand Up @@ -1292,7 +1292,7 @@ def _start_preview(self) -> None:
return

self._current_edit_index = row
LOGGER.info(
LOGGER.debug(
"[Preview] resolved start row=%s active_row=%s",
self._current_edit_index,
self.active_cameras_list.currentRow(),
Expand All @@ -1313,7 +1313,7 @@ def _stop_preview(self) -> None:

def _stop_preview_internal(self, *, reason: str) -> None:
"""Tear down loader/backend/timer. Safe to call from anywhere."""
LOGGER.info("[Preview] stop reason=%s state=%s", reason, self._preview.state)
LOGGER.debug("[Preview] stop reason=%s state=%s", reason, self._preview.state)

self._preview.state = PreviewState.STOPPING

Expand Down
12 changes: 6 additions & 6 deletions dlclivegui/gui/camera_config/ui_blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from ...cameras import CameraFactory
from ..misc.drag_spinbox import ScrubSpinBox
from ..misc.eliding_label import ElidingPathLabel
from ..misc.layouts import _make_two_field_row
from ..misc.layouts import make_two_field_row

if TYPE_CHECKING:
from camera_config_dialog import CameraConfigDialog
Expand Down Expand Up @@ -250,7 +250,7 @@ def build_settings_group(dlg: CameraConfigDialog) -> QGroupBox:
dlg.cam_index_label = QLabel("0")

dlg.cam_backend_label = QLabel("opencv")
id_backend_row = _make_two_field_row(
id_backend_row = make_two_field_row(
"Index:",
dlg.cam_index_label,
"Backend:",
Expand All @@ -267,7 +267,7 @@ def build_settings_group(dlg: CameraConfigDialog) -> QGroupBox:
dlg.detected_fps_label = QLabel("—")
dlg.detected_fps_label.setTextInteractionFlags(Qt.TextSelectableByMouse)

detected_row = _make_two_field_row(
detected_row = make_two_field_row(
"Detected resolution:",
dlg.detected_resolution_label,
"Detected FPS:",
Expand All @@ -288,7 +288,7 @@ def build_settings_group(dlg: CameraConfigDialog) -> QGroupBox:
dlg.cam_height.setValue(0)
dlg.cam_height.setSpecialValueText("Auto")

res_row = _make_two_field_row("W", dlg.cam_width, "H", dlg.cam_height, key_width=30)
res_row = make_two_field_row("W", dlg.cam_width, "H", dlg.cam_height, key_width=30)
dlg.settings_form.addRow("Resolution:", res_row)

# --- FPS + Rotation grouped ---
Expand All @@ -305,7 +305,7 @@ def build_settings_group(dlg: CameraConfigDialog) -> QGroupBox:
dlg.cam_rotation.addItem("180°", 180)
dlg.cam_rotation.addItem("270°", 270)

fps_rot_row = _make_two_field_row("FPS", dlg.cam_fps, "Rot", dlg.cam_rotation, key_width=30)
fps_rot_row = make_two_field_row("FPS", dlg.cam_fps, "Rot", dlg.cam_rotation, key_width=30)
dlg.settings_form.addRow("Capture:", fps_rot_row)

# --- Exposure + Gain grouped ---
Expand All @@ -321,7 +321,7 @@ def build_settings_group(dlg: CameraConfigDialog) -> QGroupBox:
dlg.cam_gain.setSpecialValueText("Auto")
dlg.cam_gain.setDecimals(2)

exp_gain_row = _make_two_field_row("Exp", dlg.cam_exposure, "Gain", dlg.cam_gain, key_width=30)
exp_gain_row = make_two_field_row("Exp", dlg.cam_exposure, "Gain", dlg.cam_gain, key_width=30)
dlg.settings_form.addRow("Analog:", exp_gain_row)

# --- Crop row ---
Expand Down
Loading