From 1adb3a714e9bdfafa978d390fe3dcab371e4a65f Mon Sep 17 00:00:00 2001 From: mipt-user Date: Wed, 26 Nov 2025 13:49:54 +0300 Subject: [PATCH] small bug fixed --- .../core/processors/configs/bscan_config.json | 23 +++++++++++-------- .../implementations/bscan_processor.py | 14 +++++------ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/vna_system/core/processors/configs/bscan_config.json b/vna_system/core/processors/configs/bscan_config.json index 6696aa4..8fc800e 100644 --- a/vna_system/core/processors/configs/bscan_config.json +++ b/vna_system/core/processors/configs/bscan_config.json @@ -1,16 +1,21 @@ { "open_air": true, "axis": "abs", - "cut": 0.23, + "cut": 0.2, "max": 1.5, "gain": 1.0, - "start_freq": 470.0, - "stop_freq": 8800.0, + "start_freq": 400.0, + "stop_freq": 3000.0, "clear_history": false, - "sigma": 3.42, - "border_border_m": 0.26, - "if_normalize": false, - "if_draw_level": false, - "detection_level": 3.0, - "data_limit": 500 + "sigma": 2.0, + "border_border_m": 0.3, + "if_normalize": true, + "if_draw_level": true, + "detection_level": 8.0, + "data_limit": 500, + "y_min": -50, + "y_max": 40, + "autoscale": true, + "show_magnitude": true, + "show_phase": true } \ No newline at end of file diff --git a/vna_system/core/processors/implementations/bscan_processor.py b/vna_system/core/processors/implementations/bscan_processor.py index 239f202..49c86d4 100644 --- a/vna_system/core/processors/implementations/bscan_processor.py +++ b/vna_system/core/processors/implementations/bscan_processor.py @@ -130,33 +130,33 @@ class BScanProcessor(BaseProcessor): name="sigma", label="Степень сглаживания в abs режиме", type="slider", - value=0.01, + value=cfg["sigma"], options={"min": 0.01, "max": 5.0, "step": 0.01, "dtype": "float"}, ), UIParameter( name="if_normalize", label="Нормировка", type="toggle", - value=False, + value=cfg["if_normalize"], ), UIParameter( name="border_border_m", label="Глубина границы", type="slider", - value=0.5, + value=cfg["border_border_m"], options={"min": 0.0, "max": 2.5, "step": 0.01, "dtype": "float"}, ), UIParameter( name="if_draw_level", label="Детекция", type="toggle", - value=False, + value=cfg["if_draw_level"], ), UIParameter( name="detection_level", label="Порог детекции,%", type="slider", - value=5, + value=cfg["detection_level"], options={"min": 0.0, "max": 100.0, "step": 0.1, "dtype": "float"}, ), @@ -165,7 +165,7 @@ class BScanProcessor(BaseProcessor): name="clear_history", label="Очистить историю", type="button", - value=False, + value=cfg["clear_history"], options={"action": "Очистить накопленную историю графика"}, ), ] @@ -471,7 +471,7 @@ class BScanProcessor(BaseProcessor): "autosize": True, } - print(self._config['if_normalize'], self._config['if_draw_level']) + # print(self._config['if_normalize'], self._config['if_draw_level']) if self._config['if_normalize'] or self._config['if_draw_level']: layout["shapes"] = layout.get("shapes", []) + [ {