multi config calibration added

2026-04-09 00:48:23 +03:00
parent 1d7d0a756e
commit 61685d7a4d
10 changed files with 738 additions and 26 deletions
@@ -4,8 +4,10 @@ from __future__ import annotations

 from PyQt6.QtCore import QSignalBlocker, pyqtSignal
 from PyQt6.QtWidgets import (
+    QCheckBox,
    QComboBox,
    QDialog,
+    QFileDialog,
    QFormLayout,
    QGridLayout,
    QGroupBox,
@@ -34,6 +36,8 @@ class PreprocessDialog(QDialog):

    refresh_requested = pyqtSignal()
    selection_changed = pyqtSignal()
+    radar_config_dir_changed = pyqtSignal()
+    multi_radar_option_changed = pyqtSignal()
    start_sequence_requested = pyqtSignal(str)
    capture_next_requested = pyqtSignal()
    capture_all_requested = pyqtSignal()
@@ -88,10 +92,39 @@ class PreprocessDialog(QDialog):
        header_row.addWidget(self._set_name_input, stretch=1)
        header_row.addWidget(refresh_button)
        layout.addLayout(header_row)
+        layout.addWidget(self._build_radar_config_group(group))

        layout.addWidget(self._build_selector_group("S21", VISIBLE_PREPROCESS_ASSET_KEYS, group))
        return group

+    def _build_radar_config_group(self, parent: QGroupBox) -> QGroupBox:
+        """Build radar-config directory controls for multi-radar preprocessing."""
+        group = QGroupBox("Radar Config Variants", parent)
+        layout = QVBoxLayout(group)
+
+        dir_row = QHBoxLayout()
+        self._radar_config_dir_input = QLineEdit(group)
+        self._radar_config_dir_input.setPlaceholderText("Directory with radar JSON configs")
+        self._radar_config_dir_input.editingFinished.connect(self.radar_config_dir_changed.emit)
+        browse_button = QPushButton("Browse...", group)
+        browse_button.clicked.connect(self._choose_radar_config_dir)
+        dir_row.addWidget(QLabel("Directory"))
+        dir_row.addWidget(self._radar_config_dir_input, stretch=1)
+        dir_row.addWidget(browse_button)
+        layout.addLayout(dir_row)
+
+        self._radar_config_summary_label = QLabel("No radar config directory selected.", group)
+        self._radar_config_summary_label.setWordWrap(True)
+        layout.addWidget(self._radar_config_summary_label)
+
+        self._use_all_radar_configs_checkbox = QCheckBox(
+            "Capture current combo for all found radar configs",
+            group,
+        )
+        self._use_all_radar_configs_checkbox.toggled.connect(self.multi_radar_option_changed.emit)
+        layout.addWidget(self._use_all_radar_configs_checkbox)
+        return group
+
    def _build_selector_group(self, title: str, keys: tuple[str, ...], parent: QGroupBox) -> QGroupBox:
        """Build one selector subgroup for a channel family."""
        group = QGroupBox(title, parent)
@@ -201,6 +234,41 @@ class PreprocessDialog(QDialog):
        """Replace requested target set name."""
        self._set_name_input.setText(value)

+    def radar_config_dir(self) -> str:
+        """Return configured radar-config directory path."""
+        return self._radar_config_dir_input.text().strip()
+
+    def set_radar_config_dir(self, value: str) -> None:
+        """Replace configured radar-config directory path."""
+        self._radar_config_dir_input.setText(value)
+
+    def use_all_radar_configs(self) -> bool:
+        """Return whether multi-radar capture mode is enabled."""
+        return bool(self._use_all_radar_configs_checkbox.isChecked())
+
+    def set_use_all_radar_configs(self, enabled: bool) -> None:
+        """Update multi-radar capture checkbox state."""
+        self._use_all_radar_configs_checkbox.setChecked(bool(enabled))
+
+    def set_radar_config_summary(
+        self,
+        *,
+        directory_path: str,
+        json_file_count: int,
+        valid_variant_count: int,
+        skipped_file_count: int,
+        duplicate_variant_count: int,
+    ) -> None:
+        """Update one-line radar-config scan summary."""
+        if not directory_path:
+            self._radar_config_summary_label.setText("No radar config directory selected.")
+            return
+        self._radar_config_summary_label.setText(
+            f"Directory: {directory_path} | "
+            f"json={json_file_count}, valid={valid_variant_count}, "
+            f"skipped={skipped_file_count}, duplicates={duplicate_variant_count}"
+        )
+
    def selection_snapshot(self) -> dict[str, str]:
        """Return currently selected set names keyed by preprocess asset key."""
        return {key: self._set_combos[key].currentText().strip() for key in VISIBLE_PREPROCESS_ASSET_KEYS}
@@ -221,11 +289,12 @@ class PreprocessDialog(QDialog):
        total_count: int,
        input_pos: int,
        output_pos: int,
+        extra_details: str = "",
    ) -> None:
        """Append one capture progress row to dialog log."""
        self._capture_log.appendPlainText(
            f"{kind}: {captured_count}/{total_count} | "
-            f"input={input_pos} output={output_pos}"
+            f"input={input_pos} output={output_pos}{extra_details}"
        )

    def set_capture_state(
@@ -239,6 +308,7 @@ class PreprocessDialog(QDialog):
        can_undo: bool,
        can_finalize: bool,
        can_capture_all: bool,
+        variant_count: int = 1,
    ) -> None:
        """Update sequence progress/status widgets."""
        if kind is None:
@@ -265,7 +335,10 @@ class PreprocessDialog(QDialog):
            self._combo_label.setText("<complete>")
            self._capture_next_button.setEnabled(False)
        else:
-            self._combo_label.setText(f"input={next_input}, output={next_output}")
+            combo_text = f"input={next_input}, output={next_output}"
+            if int(variant_count) > 1:
+                combo_text += f" | radar configs={int(variant_count)}"
+            self._combo_label.setText(combo_text)
            self._capture_next_button.setEnabled(True)

    def set_available_sets(self, available_sets: dict[str, list[str]]) -> None:
@@ -360,6 +433,18 @@ class PreprocessDialog(QDialog):
        """Emit current selection snapshot change."""
        self.selection_changed.emit()

+    def _choose_radar_config_dir(self) -> None:
+        """Pick radar-config directory and notify controller code."""
+        selected_dir = QFileDialog.getExistingDirectory(
+            self,
+            "Select Radar Config Directory",
+            self.radar_config_dir(),
+        )
+        if not selected_dir:
+            return
+        self._radar_config_dir_input.setText(selected_dir)
+        self.radar_config_dir_changed.emit()
+
    @staticmethod
    def _asset_row_label(key: str) -> str:
        """Return short selector label for one preprocess asset."""