Add color/colormap UI and refactor layouts

Introduce a new color_dropdowns module to provide colormap and bbox-color QComboBox helpers (gradient swatches, matplotlib registry integration, and enum-based BGR swatches). Refactor layouts.make_two_field_row (renamed and enhanced) to support flexible key/value pairs, styling, and optional spacing, and add enable_combo_shrink_to_current to size combos to their current item. Integrate these into the main window: wire a Visualization group with colormap and bbox color controls, use the new helpers to populate and manage combo state, add _on_colormap_changed, and update bbox color handling. Also update ui_blocks to use make_two_field_row, tweak several UI labels/rows, comment out the PYLON emulation env var, and change several CameraConfigDialog log statements from INFO to DEBUG for less noisy logging.

Author: C-Achard

dlclivegui/gui/camera_config/camera_config_dialog.py

@@ -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,
@@ -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),
@@ -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,
@@ -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:
@@ -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(),
@@ -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
 

dlclivegui/gui/camera_config/ui_blocks.py

@@ -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
@@ -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:",
@@ -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:",
@@ -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 ---
@@ -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 ---
@@ -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 ---

dlclivegui/gui/main_window.py

@@ -9,8 +9,10 @@
 import time
 from pathlib import Path
 
-os.environ["PYLON_CAMEMU"] = "2"
-
+# NOTE @C-Achard: his could be added in settings eventually
+# Forces pypylon to create 2 emulation virtual cameras,
+# mostly for testing. This shold not be enabled for release.
+# os.environ["PYLON_CAMEMU"] = "2"
 import cv2
 import numpy as np
 from PySide6.QtCore import QRect, QSettings, Qt, QTimer, QUrl
@@ -72,6 +74,8 @@
 from ..utils.stats import format_dlc_stats
 from ..utils.utils import FPSTracker
 from .camera_config.camera_config_dialog import CameraConfigDialog
+from .misc import color_dropdowns as color_ui
+from .misc import layouts as lyts
 from .misc.drag_spinbox import ScrubSpinBox
 from .misc.eliding_label import ElidingPathLabel
 from .recording_manager import RecordingManager
@@ -306,7 +310,7 @@ def _setup_ui(self) -> None:
         controls_layout.addWidget(self._build_camera_group())
         controls_layout.addWidget(self._build_dlc_group())
         controls_layout.addWidget(self._build_recording_group())
-        controls_layout.addWidget(self._build_bbox_group())
+        controls_layout.addWidget(self._build_viz_group())
 
         # Preview/Stop buttons at bottom of controls - wrap in widget
         button_bar_widget = QWidget()
@@ -378,7 +382,7 @@ def _build_menus(self) -> None:
         self._init_theme_actions()
 
     def _build_camera_group(self) -> QGroupBox:
-        group = QGroupBox("Camera settings")
+        group = QGroupBox("Camera")
         form = QFormLayout(group)
 
         # Camera config button - opens dialog for all camera configuration
@@ -397,7 +401,7 @@ def _build_camera_group(self) -> QGroupBox:
         return group
 
     def _build_dlc_group(self) -> QGroupBox:
-        group = QGroupBox("DLCLive settings")
+        group = QGroupBox("DLCLive")
         form = QFormLayout(group)
 
         path_layout = QHBoxLayout()
@@ -443,7 +447,7 @@ def _build_dlc_group(self) -> QGroupBox:
         # form.addRow("Additional options", self.additional_options_edit)
         self.dlc_camera_combo = QComboBox()
         self.dlc_camera_combo.setToolTip("Select which camera to use for pose inference")
-        form.addRow("Inference Camera", self.dlc_camera_combo)
+        form.addRow("Inference camera", self.dlc_camera_combo)
 
         # Wrap inference buttons in a widget to prevent shifting
         inference_button_widget = QWidget()
@@ -461,9 +465,9 @@ def _build_dlc_group(self) -> QGroupBox:
         inference_buttons.addWidget(self.stop_inference_button)
         form.addRow(inference_button_widget)
 
-        self.show_predictions_checkbox = QCheckBox("Display pose predictions")
-        self.show_predictions_checkbox.setChecked(True)
-        form.addRow(self.show_predictions_checkbox)
+        # self.show_predictions_checkbox = QCheckBox("Display pose predictions")
+        # self.show_predictions_checkbox.setChecked(True)
+        # form.addRow(self.show_predictions_checkbox)
 
         self.allow_processor_ctrl_checkbox = QCheckBox("Allow processor-based control")
         self.allow_processor_ctrl_checkbox.setChecked(False)
@@ -495,15 +499,19 @@ def _build_recording_group(self) -> QGroupBox:
         # Session + run name
         self.session_name_edit = QLineEdit()
         self.session_name_edit.setPlaceholderText("e.g. mouseA_day1")
-        form.addRow("Session name", self.session_name_edit)
+        # form.addRow("Session name", self.session_name_edit)
 
         self.use_timestamp_checkbox = QCheckBox("Use timestamp for run folder name")
         self.use_timestamp_checkbox.setChecked(True)
         self.use_timestamp_checkbox.setToolTip(
             "If checked, run folder will be run_YYYYMMDD_HHMMSS_mmm.\n"
             "If unchecked, run folder will be run_0001, run_0002, ..."
         )
-        form.addRow("", self.use_timestamp_checkbox)
+        # form.addRow("", self.use_timestamp_checkbox)
+        session_opts = lyts.make_two_field_row(
+            "Session name", self.session_name_edit, None, self.use_timestamp_checkbox, key_width=100
+        )
+        form.addRow(session_opts)
 
         # Show recording path preview
 
@@ -575,7 +583,7 @@ def _build_recording_group(self) -> QGroupBox:
 
         ## CRF
         crf_label = QLabel("CRF")
-        crf_label.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
+        crf_label.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
         grid.addWidget(crf_label, 0, 4)
 
         self.crf_spin = QSpinBox()
@@ -618,24 +626,55 @@ def _build_recording_group(self) -> QGroupBox:
 
         return group
 
-    def _build_bbox_group(self) -> QGroupBox:
-        group = QGroupBox("Bounding Box Visualization")
+    def _build_viz_group(self) -> QGroupBox:
+        group = QGroupBox("Visualization")
         form = QFormLayout(group)
+        self.show_predictions_checkbox = QCheckBox("Display pose predictions")
+        self.show_predictions_checkbox.setChecked(True)
+
+        self.cmap_combo = QComboBox()
+        self.cmap_combo.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+        self.cmap_combo.setToolTip("Select colormap to use when displaying keypoints (bodypart-based coloring)")
+        color_ui.populate_colormap_combo(
+            self.cmap_combo,
+            current=self._colormap,
+            favorites_first=["turbo", "jet", "hsv"],
+            exclude_reversed=True,
+            filters={"cet_": 5},  # include only first 5 colormaps from the 'cet_' family to avoid redundant options
+        )
+        lyts.enable_combo_shrink_to_current(self.cmap_combo, min_width=80, max_width=200)
+
+        keypoints_settings = lyts.make_two_field_row(
+            "Keypoint colormap: ",
+            self.cmap_combo,
+            None,
+            self.show_predictions_checkbox,
+            key_width=None,
+            left_stretch=0,
+            right_stretch=0,
+        )
+        form.addRow(keypoints_settings)
 
-        row_widget = QWidget()
-        checkbox_layout = QHBoxLayout(row_widget)
-        checkbox_layout.setContentsMargins(0, 0, 0, 0)
         self.bbox_enabled_checkbox = QCheckBox("Show bounding box")
         self.bbox_enabled_checkbox.setChecked(False)
-        checkbox_layout.addWidget(self.bbox_enabled_checkbox)
-        checkbox_layout.addWidget(QLabel("Color:"))
 
         self.bbox_color_combo = QComboBox()
-        self._populate_bbox_color_combo_with_swatches()
+        self.bbox_color_combo.setToolTip("Select color for bounding box")
+        self.bbox_color_combo.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+        color_ui.populate_bbox_color_combo(self.bbox_color_combo, BBoxColors, current_bgr=self._bbox_color)
         self.bbox_color_combo.setCurrentIndex(0)
-        checkbox_layout.addWidget(self.bbox_color_combo)
-        checkbox_layout.addStretch(1)
-        form.addRow(row_widget)
+        lyts.enable_combo_shrink_to_current(self.bbox_color_combo, min_width=80, max_width=200)
+
+        bbox_settings = lyts.make_two_field_row(
+            "Bounding box color: ",
+            self.bbox_color_combo,
+            None,
+            self.bbox_enabled_checkbox,
+            key_width=None,
+            left_stretch=0,
+            right_stretch=0,
+        )
+        form.addRow(bbox_settings)
 
         bbox_layout = QHBoxLayout()
         self.bbox_x0_spin = ScrubSpinBox()
@@ -679,7 +718,10 @@ def _connect_signals(self) -> None:
         # Camera config dialog
         self.config_cameras_button.clicked.connect(self._open_camera_config_dialog)
 
-        # Connect bounding box controls
+        # Visualization settings
+        ## Colormap change
+        self.cmap_combo.currentIndexChanged.connect(self._on_colormap_changed)
+        ## Connect bounding box controls
         self.bbox_enabled_checkbox.stateChanged.connect(self._on_bbox_changed)
         self.bbox_x0_spin.valueChanged.connect(self._on_bbox_changed)
         self.bbox_y0_spin.valueChanged.connect(self._on_bbox_changed)
@@ -760,9 +802,11 @@ def _apply_config(self, config: ApplicationSettings) -> None:
         viz = config.visualization
         self._p_cutoff = viz.p_cutoff
         self._colormap = viz.colormap
+        if hasattr(self, "cmap_combo"):
+            color_ui.set_cmap_combo_from_name(self.cmap_combo, self._colormap, fallback="viridis")
         self._bbox_color = viz.get_bbox_color_bgr()
         if hasattr(self, "bbox_color_combo"):
-            self._set_combo_from_color(self._bbox_color)
+            color_ui.set_bbox_combo_from_bgr(self.bbox_color_combo, self._bbox_color)
 
         # Update DLC camera list
         self._refresh_dlc_camera_list()
@@ -1050,11 +1094,16 @@ def _on_use_timestamp_changed(self, _state: int) -> None:
         self._settings_store.set_use_timestamp(self.use_timestamp_checkbox.isChecked())
         self._update_recording_path_preview()
 
+    def _on_colormap_changed(self, _index: int) -> None:
+        self._colormap = color_ui.get_cmap_name_from_combo(self.cmap_combo, fallback=self._colormap)
+        if self._current_frame is not None:
+            self._display_frame(self._current_frame, force=True)
+
     def _on_bbox_color_changed(self, _index: int) -> None:
-        enum_item = self.bbox_color_combo.currentData()
-        if enum_item is None:
+        bgr = color_ui.get_bbox_bgr_from_combo(self.bbox_color_combo, fallback=self._bbox_color)
+        if bgr is None:
             return
-        self._bbox_color = enum_item.value
+        self._bbox_color = bgr
         if self._current_frame is not None:
             self._display_frame(self._current_frame, force=True)