awe/radar_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new GPR parameters and some UI fixes

Browse Source
This commit is contained in:
Ayzen
2026-04-07 12:55:26 +03:00
parent 4b78c2808d
commit 202993325d
27 changed files with 1494 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python_app/gui/controllers/sections/data_actions_section.py
+1 -5
View File
@@ -31,9 +31,6 @@ def build_data_actions_group(owner) -> QGroupBox:
remove_last_button = QPushButton("Remove Last Measurement")
remove_last_button.clicked.connect(owner._remove_last_runtime_history)
remove_last_button.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
clear_history_button = QPushButton("Clear Runtime History")
clear_history_button.clicked.connect(owner._clear_all_runtime_history)
clear_history_button.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
owner._save_count = QSpinBox()
owner._save_count.setMinimum(1)
owner._save_count.setMaximum(10_000)
@@ -44,8 +41,7 @@ def build_data_actions_group(owner) -> QGroupBox:
button_grid.setVerticalSpacing(8)
button_grid.addWidget(save_button, 0, 0)
button_grid.addWidget(save_vna_json_button, 0, 1)
button_grid.addWidget(remove_last_button, 1, 0)
button_grid.addWidget(clear_history_button, 1, 1)
button_grid.addWidget(remove_last_button, 1, 0, 1, 2)
button_grid.setColumnStretch(0, 1)
button_grid.setColumnStretch(1, 1)
layout.addLayout(button_grid)
python_app/gui/controllers/sections/layout_helpers.py
+60
View File
@@ -0,0 +1,60 @@
"""Shared layout helpers for section builders."""
from __future__ import annotations
from typing import TypeAlias
from PyQt6.QtWidgets import QFormLayout, QHBoxLayout, QWidget
FormLabel: TypeAlias = str | QWidget
FormRow: TypeAlias = QWidget | tuple[FormLabel, QWidget]
def build_two_column_form_widget(
parent: QWidget,
rows: list[FormRow],
*,
split_index: int | None = None,
) -> QWidget:
"""Build one widget containing two side-by-side form columns."""
panel = QWidget(parent)
panel_layout = QHBoxLayout(panel)
panel_layout.setContentsMargins(0, 0, 0, 0)
panel_layout.setSpacing(12)
left_column = QWidget(panel)
left_form = _create_form_layout(left_column)
right_column = QWidget(panel)
right_form = _create_form_layout(right_column)
panel_layout.addWidget(left_column, stretch=1)
panel_layout.addWidget(right_column, stretch=1)
actual_split_index = (len(rows) + 1) // 2 if split_index is None else split_index
actual_split_index = max(0, min(actual_split_index, len(rows)))
for row in rows[:actual_split_index]:
_add_form_row(left_form, row)
for row in rows[actual_split_index:]:
_add_form_row(right_form, row)
return panel
def _create_form_layout(parent: QWidget) -> QFormLayout:
"""Create a compact growing form layout for one column."""
form = QFormLayout(parent)
form.setContentsMargins(0, 0, 0, 0)
form.setHorizontalSpacing(10)
form.setVerticalSpacing(6)
form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
return form
def _add_form_row(form: QFormLayout, row: FormRow) -> None:
"""Append one form row, with or without an explicit label."""
if isinstance(row, tuple):
label, field = row
form.addRow(label, field)
return
form.addRow(row)
python_app/gui/controllers/sections/preprocess_summary_section.py
+9 -4
View File
@@ -2,20 +2,25 @@
from __future__ import annotations
from PyQt6.QtWidgets import QFormLayout, QGroupBox, QLabel
from PyQt6.QtWidgets import QGroupBox, QLabel, QVBoxLayout
from python_app.gui.controllers.sections.layout_helpers import build_two_column_form_widget
from python_app.orchestration.preprocess_assets import VISIBLE_PREPROCESS_ASSET_KEYS, preprocess_asset_display_name
def build_preprocess_summary_group(owner) -> QGroupBox:
"""Create selected preprocess-set summary section."""
group = QGroupBox("Selected Preprocess Sets")
form = QFormLayout(group)
form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
layout = QVBoxLayout(group)
layout.setContentsMargins(10, 10, 10, 10)
layout.setSpacing(8)
owner._selected_preprocess_labels = {}
rows = []
for key in VISIBLE_PREPROCESS_ASSET_KEYS:
label = QLabel("<not selected>")
owner._selected_preprocess_labels[key] = label
form.addRow(preprocess_asset_display_name(key), label)
rows.append((preprocess_asset_display_name(key), label))
layout.addWidget(build_two_column_form_widget(group, rows, split_index=(len(rows) + 1) // 2))
return group
python_app/gui/controllers/sections/primary_actions_section.py
+5 -1
View File
@@ -45,7 +45,11 @@ def build_primary_actions_group(owner) -> QGroupBox:
preprocess_button = _expanding_button("Preprocessing")
preprocess_button.clicked.connect(owner._open_preprocess_panel)
layout.addWidget(preprocess_button, 2, 0, 1, 3)
layout.addWidget(preprocess_button, 2, 0)
clear_history_button = _expanding_button("Clear Runtime History")
clear_history_button.clicked.connect(owner._clear_all_runtime_history)
layout.addWidget(clear_history_button, 2, 1, 1, 2)
layout.setColumnStretch(0, 1)
layout.setColumnStretch(1, 1)
python_app/gui/controllers/sections/processing_section.py
+121 -42
View File
@@ -13,9 +13,13 @@ from PyQt6.QtWidgets import (
QSizePolicy,
QSpinBox,
QStackedWidget,
QVBoxLayout,
QWidget,
)
from python_app.gui.controllers.sections.layout_helpers import FormRow, build_two_column_form_widget
def _format_tx_geometry(owner) -> str:
"""Render Tx geometry defaults into editable line-based text."""
return "\n".join(
@@ -32,6 +36,17 @@ def _format_rx_geometry(owner) -> str:
)
def _build_processing_mode_page(parent: QStackedWidget, rows: list[FormRow], *, split_index: int | None = None) -> QWidget:
"""Create one processing-mode page with a two-column form body."""
page = QWidget(parent)
page.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
page_layout = QVBoxLayout(page)
page_layout.setContentsMargins(0, 0, 0, 0)
page_layout.setSpacing(0)
page_layout.addWidget(build_two_column_form_widget(page, rows, split_index=split_index))
return page
def build_processing_group(owner) -> QGroupBox:
"""Create processing mode section with pass-through, B-scan, and GPR pages."""
group = QGroupBox("Processing")
@@ -49,11 +64,6 @@ def build_processing_group(owner) -> QGroupBox:
owner._processing_mode_pages = QStackedWidget(group)
owner._processing_mode_pages.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
pass_through_page = QWidget(owner._processing_mode_pages)
pass_through_page.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
pass_through_form = QFormLayout(pass_through_page)
pass_through_form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
owner._show_magnitude_checkbox = QCheckBox("Show magnitude")
owner._show_magnitude_checkbox.setChecked(bool(pass_defaults.show_magnitude))
@@ -77,18 +87,19 @@ def build_processing_group(owner) -> QGroupBox:
owner._sync_pass_through_y_controls()
pass_through_form.addRow(owner._show_magnitude_checkbox)
pass_through_form.addRow(owner._show_phase_checkbox)
pass_through_form.addRow(owner._pass_through_fixed_y_enabled)
pass_through_form.addRow("Y min dB", owner._pass_through_y_min_db)
pass_through_form.addRow("Y max dB", owner._pass_through_y_max_db)
pass_through_page = _build_processing_mode_page(
owner._processing_mode_pages,
[
owner._show_magnitude_checkbox,
owner._show_phase_checkbox,
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,
)
owner._processing_mode_pages.addWidget(pass_through_page)
bscan_page = QWidget(owner._processing_mode_pages)
bscan_page.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
bscan_form = QFormLayout(bscan_page)
bscan_form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
owner._bscan_axis = QComboBox()
owner._bscan_axis.addItems(["abs", "real", "phase"])
owner._set_combo_current_text(owner._bscan_axis, bscan_defaults.axis)
@@ -123,18 +134,20 @@ def build_processing_group(owner) -> QGroupBox:
owner._bscan_stop_freq_mhz.setSingleStep(10.0)
owner._bscan_stop_freq_mhz.setValue(float(bscan_defaults.stop_freq_mhz))
bscan_form.addRow("Axis", owner._bscan_axis)
bscan_form.addRow("Cut m", owner._bscan_cut_m)
bscan_form.addRow("Max depth m", owner._bscan_max_depth_m)
bscan_form.addRow("Gain", owner._bscan_gain)
bscan_form.addRow("Start MHz", owner._bscan_start_freq_mhz)
bscan_form.addRow("Stop MHz", owner._bscan_stop_freq_mhz)
bscan_page = _build_processing_mode_page(
owner._processing_mode_pages,
[
("Axis", owner._bscan_axis),
("Cut m", owner._bscan_cut_m),
("Max depth m", owner._bscan_max_depth_m),
("Gain", owner._bscan_gain),
("Start MHz", owner._bscan_start_freq_mhz),
("Stop MHz", owner._bscan_stop_freq_mhz),
],
split_index=3,
)
owner._processing_mode_pages.addWidget(bscan_page)
gpr_page = QWidget(owner._processing_mode_pages)
gpr_page.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
gpr_form = QFormLayout(gpr_page)
gpr_form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
gpr_defaults = owner._defaults_config.gpr
owner._gpr_config_mode = QComboBox()
@@ -149,11 +162,11 @@ def build_processing_group(owner) -> QGroupBox:
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.setMinimumHeight(88)
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.setMinimumHeight(120)
owner._gpr_rx_geometry_input.setFixedHeight(78)
owner._gpr_input_positions_input = QLineEdit(str(gpr_live_defaults.input_positions))
owner._gpr_input_positions_input.setPlaceholderText("0,1,2")
@@ -203,6 +216,18 @@ def build_processing_group(owner) -> QGroupBox:
owner._gpr_look_angle_deg.setSingleStep(0.1)
owner._gpr_look_angle_deg.setValue(float(gpr_live_defaults.look_angle_deg))
owner._gpr_snr_thresh = QDoubleSpinBox()
owner._gpr_snr_thresh.setDecimals(2)
owner._gpr_snr_thresh.setRange(0.0, 1_000.0)
owner._gpr_snr_thresh.setSingleStep(0.1)
owner._gpr_snr_thresh.setValue(float(gpr_live_defaults.snr_thresh))
owner._gpr_snr_comp_max = QDoubleSpinBox()
owner._gpr_snr_comp_max.setDecimals(2)
owner._gpr_snr_comp_max.setRange(0.0, 1_000.0)
owner._gpr_snr_comp_max.setSingleStep(0.5)
owner._gpr_snr_comp_max.setValue(float(gpr_live_defaults.snr_comp_max))
owner._gpr_background_subtract_enabled = QCheckBox("Subtract mean of previous collections")
owner._gpr_background_subtract_enabled.setChecked(bool(gpr_live_defaults.background_subtract_enabled))
@@ -210,21 +235,67 @@ def build_processing_group(owner) -> QGroupBox:
owner._gpr_background_mean_count.setRange(0, 10_000)
owner._gpr_background_mean_count.setValue(int(gpr_live_defaults.background_mean_count))
gpr_form.addRow("Config mode", owner._gpr_config_mode)
gpr_form.addRow("Relative permittivity", owner._gpr_relative_permittivity)
gpr_form.addRow("Tx geometry", owner._gpr_tx_geometry_input)
gpr_form.addRow("Rx geometry", owner._gpr_rx_geometry_input)
gpr_form.addRow("Input positions", owner._gpr_input_positions_input)
gpr_form.addRow("Output positions", owner._gpr_output_positions_input)
gpr_form.addRow("Min depth m", owner._gpr_min_depth_m)
gpr_form.addRow("Max depth m", owner._gpr_max_depth_m)
gpr_form.addRow("Comp power", owner._gpr_comp_power)
gpr_form.addRow("Start MHz", owner._gpr_start_freq_mhz)
gpr_form.addRow("Stop MHz", owner._gpr_stop_freq_mhz)
gpr_form.addRow("Speed m/s", owner._gpr_speed_m_s)
gpr_form.addRow("Look angle deg", owner._gpr_look_angle_deg)
gpr_form.addRow(owner._gpr_background_subtract_enabled)
gpr_form.addRow("Mean count", owner._gpr_background_mean_count)
owner._gpr_render_mode = QComboBox()
owner._gpr_render_mode.addItems(["heatmap", "objects_only"])
owner._set_combo_current_text(owner._gpr_render_mode, gpr_live_defaults.render_mode)
owner._gpr_min_visible_pair_count = QSpinBox()
owner._gpr_min_visible_pair_count.setRange(1, 10_000)
owner._gpr_min_visible_pair_count.setValue(int(gpr_live_defaults.min_visible_pair_count))
owner._gpr_visible_x_min_m = QDoubleSpinBox()
owner._gpr_visible_x_min_m.setDecimals(2)
owner._gpr_visible_x_min_m.setRange(-100.0, 100.0)
owner._gpr_visible_x_min_m.setSingleStep(0.1)
owner._gpr_visible_x_min_m.setValue(float(gpr_live_defaults.visible_x_min_m))
owner._gpr_visible_x_max_m = QDoubleSpinBox()
owner._gpr_visible_x_max_m.setDecimals(2)
owner._gpr_visible_x_max_m.setRange(-100.0, 100.0)
owner._gpr_visible_x_max_m.setSingleStep(0.1)
owner._gpr_visible_x_max_m.setValue(float(gpr_live_defaults.visible_x_max_m))
owner._gpr_visible_z_min_m = QDoubleSpinBox()
owner._gpr_visible_z_min_m.setDecimals(2)
owner._gpr_visible_z_min_m.setRange(0.0, 100.0)
owner._gpr_visible_z_min_m.setSingleStep(0.1)
owner._gpr_visible_z_min_m.setValue(float(gpr_live_defaults.visible_z_min_m))
owner._gpr_visible_z_max_m = QDoubleSpinBox()
owner._gpr_visible_z_max_m.setDecimals(2)
owner._gpr_visible_z_max_m.setRange(0.0, 100.0)
owner._gpr_visible_z_max_m.setSingleStep(0.1)
owner._gpr_visible_z_max_m.setValue(float(gpr_live_defaults.visible_z_max_m))
gpr_page = _build_processing_mode_page(
owner._processing_mode_pages,
[
("Config mode", owner._gpr_config_mode),
("Relative permittivity", owner._gpr_relative_permittivity),
("Input positions", owner._gpr_input_positions_input),
("Output positions", owner._gpr_output_positions_input),
("Min depth m", owner._gpr_min_depth_m),
("Max depth m", owner._gpr_max_depth_m),
("Comp power", owner._gpr_comp_power),
("SNR thresh", owner._gpr_snr_thresh),
("SNR comp max", owner._gpr_snr_comp_max),
("Speed m/s", owner._gpr_speed_m_s),
("Render mode", owner._gpr_render_mode),
("Min visible pairs", owner._gpr_min_visible_pair_count),
("Tx geometry", owner._gpr_tx_geometry_input),
("Rx geometry", owner._gpr_rx_geometry_input),
("Start MHz", owner._gpr_start_freq_mhz),
("Stop MHz", owner._gpr_stop_freq_mhz),
("Look angle deg", owner._gpr_look_angle_deg),
("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),
("Visible Z max m", owner._gpr_visible_z_max_m),
owner._gpr_background_subtract_enabled,
("Mean count", owner._gpr_background_mean_count),
],
split_index=11,
)
owner._processing_mode_pages.addWidget(gpr_page)
owner._processing_mode.currentTextChanged.connect(owner._on_processing_mode_changed)
@@ -252,8 +323,16 @@ def build_processing_group(owner) -> QGroupBox:
owner._gpr_stop_freq_mhz.valueChanged.connect(owner._on_processing_live_settings_changed)
owner._gpr_speed_m_s.valueChanged.connect(owner._on_processing_live_settings_changed)
owner._gpr_look_angle_deg.valueChanged.connect(owner._on_processing_live_settings_changed)
owner._gpr_snr_thresh.valueChanged.connect(owner._on_processing_live_settings_changed)
owner._gpr_snr_comp_max.valueChanged.connect(owner._on_processing_live_settings_changed)
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_render_mode.currentTextChanged.connect(owner._on_gpr_visual_settings_changed)
owner._gpr_min_visible_pair_count.valueChanged.connect(owner._on_gpr_visual_settings_changed)
owner._gpr_visible_x_min_m.valueChanged.connect(owner._on_gpr_visual_settings_changed)
owner._gpr_visible_x_max_m.valueChanged.connect(owner._on_gpr_visual_settings_changed)
owner._gpr_visible_z_min_m.valueChanged.connect(owner._on_gpr_visual_settings_changed)
owner._gpr_visible_z_max_m.valueChanged.connect(owner._on_gpr_visual_settings_changed)
owner._on_processing_mode_changed(owner._processing_mode.currentText())
return group
python_app/gui/controllers/sections/radar_section.py
+23 -9
View File
@@ -2,14 +2,17 @@
from __future__ import annotations
from PyQt6.QtWidgets import QComboBox, QFormLayout, QGroupBox, QLabel, QLineEdit
from PyQt6.QtWidgets import QComboBox, QGroupBox, QLabel, QLineEdit, QVBoxLayout
from python_app.gui.controllers.sections.layout_helpers import build_two_column_form_widget
def build_radar_group(owner) -> QGroupBox:
"""Create radar settings controls and labels."""
group = QGroupBox("Radar")
form = QFormLayout(group)
form.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow)
layout = QVBoxLayout(group)
layout.setContentsMargins(10, 10, 10, 10)
layout.setSpacing(8)
defaults = owner._defaults_config.radar
owner._serial_input = QLineEdit(defaults.serial)
@@ -30,6 +33,9 @@ def build_radar_group(owner) -> QGroupBox:
owner._radar_mode.currentTextChanged.connect(owner._on_radar_identity_changed)
owner._start_hz_input.editingFinished.connect(owner._on_radar_sweep_limits_changed)
owner._stop_hz_input.editingFinished.connect(owner._on_radar_sweep_limits_changed)
owner._points_input.editingFinished.connect(owner._on_radar_sweep_limits_changed)
owner._ifbw_input.editingFinished.connect(owner._on_radar_sweep_limits_changed)
owner._power_input.editingFinished.connect(owner._on_radar_sweep_limits_changed)
owner._radar_start_label = QLabel("Start Hz")
owner._radar_stop_label = QLabel("Stop Hz")
@@ -40,10 +46,18 @@ def build_radar_group(owner) -> QGroupBox:
owner._radar_limits_hint = QLabel("Mock mode: device limits are not applied.")
owner._radar_limits_hint.setObjectName("hintLabel")
form.addRow(owner._radar_start_label, owner._start_hz_input)
form.addRow(owner._radar_stop_label, owner._stop_hz_input)
form.addRow(owner._radar_points_label, owner._points_input)
form.addRow(owner._radar_ifbw_label, owner._ifbw_input)
form.addRow(owner._radar_power_label, owner._power_input)
form.addRow(owner._radar_limits_hint)
layout.addWidget(
build_two_column_form_widget(
group,
[
(owner._radar_start_label, owner._start_hz_input),
(owner._radar_stop_label, owner._stop_hz_input),
(owner._radar_points_label, owner._points_input),
(owner._radar_ifbw_label, owner._ifbw_input),
(owner._radar_power_label, owner._power_input),
],
split_index=3,
)
)
layout.addWidget(owner._radar_limits_hint)
return group