From 7921e21750ef962edaaca8f4434cb019271764bc Mon Sep 17 00:00:00 2001 From: duxin Date: Wed, 8 Jul 2026 16:03:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20step4=20=E9=87=87=E6=A0=B7=E7=82=B9?= =?UTF-8?q?=E8=BF=87=E5=AF=86=20=E2=80=94=20=E6=8F=90=E9=AB=98=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E4=B8=8B=E9=99=90=20+=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=87=AA=E9=80=82=E5=BA=94=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题: min_interval=10 导致每个水面产生数千个密集采样点 (8242点) 修复: 1. sampling.py: min_interval 默认值 10→50 (提高 5×) 两个入口函数同步修改 (chunked + full) 2. step4_sampling_panel.py: 自适应采样复选框默认 False 用户设置的固定间隔 (interval=100px) 真正生效 --- src/gui/panels/step4_sampling_panel.py | 2 +- src/utils/sampling.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/panels/step4_sampling_panel.py b/src/gui/panels/step4_sampling_panel.py index 7bf5270..10a1cea 100644 --- a/src/gui/panels/step4_sampling_panel.py +++ b/src/gui/panels/step4_sampling_panel.py @@ -130,7 +130,7 @@ class Step4SamplingPanel(QWidget): params_layout.addRow("内存处理块大小:", w3) self.use_adaptive_sampling = QCheckBox("启用自适应边缘采样") - self.use_adaptive_sampling.setChecked(True) + self.use_adaptive_sampling.setChecked(False) params_layout.addRow("智能模式:", self.use_adaptive_sampling) params_group.setLayout(params_layout) diff --git a/src/utils/sampling.py b/src/utils/sampling.py index 418e1e2..f006024 100644 --- a/src/utils/sampling.py +++ b/src/utils/sampling.py @@ -86,7 +86,7 @@ def get_wavelengths_from_bil_header(bil_file): def get_spectral_sampling_points_chunked(bil_file, water_mask_shp, severe_glint=None, output_csvpath=None, interval=100, sample_radius=1, chunk_size=1000, - use_adaptive_sampling=True, min_interval=10, max_interval=200): + use_adaptive_sampling=True, min_interval=50, max_interval=200): """ 基于bil文件、shp格式water_mask和severe_glint生成采样点并提取光谱数据（分块处理版本） @@ -423,7 +423,7 @@ def get_spectral_sampling_points_chunked(bil_file, water_mask_shp, severe_glint= def get_spectral_sampling_points(bil_file, water_mask_shp, severe_glint=None, output_csvpath=None, interval=100, sample_radius=1, - use_adaptive_sampling=True, min_interval=10, max_interval=200): + use_adaptive_sampling=True, min_interval=50, max_interval=200): """ 基于bil文件、shp格式water_mask和severe_glint生成采样点并提取光谱数据