working version

2026-05-18 17:27:00 +03:00
parent 907dbf29ce
commit 0da8b1283c
23 changed files with 1479 additions and 133 deletions
@@ -20,10 +20,19 @@ from PyQt6.QtWidgets import (
 from python_app.gui.controllers.sections.layout_helpers import FormRow, build_two_column_form_widget


+def _format_geometry_row(position: int, x_m: float, y_m: float, z_m: float) -> str:
+    """Render one geometry row, trimming trailing zero y/z so 1D layouts stay compact."""
+    if z_m != 0.0:
+        return f"{position} {x_m:g} {y_m:g} {z_m:g}"
+    if y_m != 0.0:
+        return f"{position} {x_m:g} {y_m:g}"
+    return f"{position} {x_m:g}"
+
+
 def _format_tx_geometry(owner) -> str:
    """Render Tx geometry defaults into editable line-based text."""
    return "\n".join(
-        f"{int(entry.output_pos)} {float(entry.x_m):g}"
+        _format_geometry_row(int(entry.output_pos), float(entry.x_m), float(entry.y_m), float(entry.z_m))
        for entry in owner._defaults_config.gpr.tx_geometry
    )

@@ -31,7 +40,7 @@ def _format_tx_geometry(owner) -> str:
 def _format_rx_geometry(owner) -> str:
    """Render Rx geometry defaults into editable line-based text."""
    return "\n".join(
-        f"{int(entry.input_pos)} {float(entry.x_m):g}"
+        _format_geometry_row(int(entry.input_pos), float(entry.x_m), float(entry.y_m), float(entry.z_m))
        for entry in owner._defaults_config.gpr.rx_geometry
    )

@@ -71,6 +80,9 @@ def build_processing_group(owner) -> QGroupBox:
    owner._show_phase_checkbox = QCheckBox("Show phase")
    owner._show_phase_checkbox.setChecked(bool(pass_defaults.show_phase))

+    owner._pass_through_combo_filter_input = QLineEdit(str(pass_defaults.combo_filter))
+    owner._pass_through_combo_filter_input.setPlaceholderText("empty = all, e.g. 0:0,1:0")
+
    owner._pass_through_fixed_y_enabled = QCheckBox("Fix magnitude Y range")
    owner._pass_through_fixed_y_enabled.setChecked(bool(pass_defaults.fixed_y_enabled))

@@ -93,11 +105,12 @@ def build_processing_group(owner) -> QGroupBox:
        [
            owner._show_magnitude_checkbox,
            owner._show_phase_checkbox,
+            ("Switch combos", owner._pass_through_combo_filter_input),
            owner._pass_through_fixed_y_enabled,
            ("Y min dB", owner._pass_through_y_min_db),
            ("Y max dB", owner._pass_through_y_max_db),
        ],
-        split_index=3,
+        split_index=4,
    )
    owner._processing_mode_pages.addWidget(pass_through_page)

@@ -162,11 +175,11 @@ def build_processing_group(owner) -> QGroupBox:
    owner._gpr_relative_permittivity.setValue(float(gpr_defaults.relative_permittivity))

    owner._gpr_tx_geometry_input = QPlainTextEdit(_format_tx_geometry(owner))
-    owner._gpr_tx_geometry_input.setPlaceholderText("output_pos x_m")
+    owner._gpr_tx_geometry_input.setPlaceholderText("output_pos x_m [y_m] [z_m]")
    owner._gpr_tx_geometry_input.setFixedHeight(78)

    owner._gpr_rx_geometry_input = QPlainTextEdit(_format_rx_geometry(owner))
-    owner._gpr_rx_geometry_input.setPlaceholderText("input_pos x_m")
+    owner._gpr_rx_geometry_input.setPlaceholderText("input_pos x_m [y_m] [z_m]")
    owner._gpr_rx_geometry_input.setFixedHeight(78)

    owner._gpr_common_page = _build_processing_mode_page(
@@ -277,6 +290,15 @@ def build_processing_group(owner) -> QGroupBox:
    owner._gpr_visible_z_max_m.setSingleStep(0.1)
    owner._gpr_visible_z_max_m.setValue(float(gpr_live_defaults.visible_z_max_m))

+    owner._gpr_imaging_plane_y_m = QDoubleSpinBox()
+    owner._gpr_imaging_plane_y_m.setDecimals(3)
+    owner._gpr_imaging_plane_y_m.setRange(-50.0, 50.0)
+    owner._gpr_imaging_plane_y_m.setSingleStep(0.05)
+    owner._gpr_imaging_plane_y_m.setValue(float(gpr_live_defaults.imaging_plane_y_m))
+    owner._gpr_imaging_plane_y_m.setToolTip(
+        "Y coordinate of the BP imaging slice (m). Use 0 for legacy 1D antenna layouts."
+    )
+
    gpr_page = _build_processing_mode_page(
        owner._processing_mode_pages,
        [
@@ -293,6 +315,7 @@ def build_processing_group(owner) -> QGroupBox:
            ("Draw top M objects", owner._gpr_draw_top_m_objects),
            ("Start MHz", owner._gpr_start_freq_mhz),
            ("Stop MHz", owner._gpr_stop_freq_mhz),
+            ("Imaging plane Y m", owner._gpr_imaging_plane_y_m),
            ("Visible X min m", owner._gpr_visible_x_min_m),
            ("Visible X max m", owner._gpr_visible_x_max_m),
            ("Visible Z min m", owner._gpr_visible_z_min_m),
@@ -445,6 +468,7 @@ def build_processing_group(owner) -> QGroupBox:
    owner._processing_mode.currentTextChanged.connect(owner._on_processing_mode_changed)
    owner._show_magnitude_checkbox.toggled.connect(owner._on_trace_visibility_changed)
    owner._show_phase_checkbox.toggled.connect(owner._on_trace_visibility_changed)
+    owner._pass_through_combo_filter_input.editingFinished.connect(owner._on_trace_visibility_changed)
    owner._pass_through_fixed_y_enabled.toggled.connect(owner._sync_pass_through_y_controls)
    owner._pass_through_fixed_y_enabled.toggled.connect(owner._on_processing_live_settings_changed)
    owner._pass_through_y_min_db.valueChanged.connect(owner._on_processing_live_settings_changed)
@@ -472,6 +496,7 @@ def build_processing_group(owner) -> QGroupBox:
    owner._gpr_background_subtract_enabled.toggled.connect(owner._on_processing_live_settings_changed)
    owner._gpr_background_mean_count.valueChanged.connect(owner._on_processing_live_settings_changed)
    owner._gpr_remove_sidelobe_objects_enabled.toggled.connect(owner._on_processing_live_settings_changed)
+    owner._gpr_imaging_plane_y_m.valueChanged.connect(owner._on_processing_live_settings_changed)
    owner._gpr_render_mode.currentTextChanged.connect(owner._on_gpr_visual_settings_changed)
    owner._gpr_min_visible_score.valueChanged.connect(owner._on_gpr_locator_threshold_changed)
    owner._gpr_max_detected_objects_to_draw.valueChanged.connect(owner._on_gpr_locator_threshold_changed)
@@ -49,10 +49,10 @@ def build_switch_group(owner) -> QGroupBox:
    single_row = QHBoxLayout()
    single_row.setSpacing(8)
    single_row.addWidget(QLabel("Single combo"))
-    single_row.addWidget(QLabel("Output"))
-    single_row.addWidget(owner._single_combo_output)
    single_row.addWidget(QLabel("Input"))
    single_row.addWidget(owner._single_combo_input)
+    single_row.addWidget(QLabel("Output"))
+    single_row.addWidget(owner._single_combo_output)
    single_row.addWidget(owner._single_combo_select_button)
    layout.addLayout(single_row)