fix: step4 采样点过密 — 提高自适应下限 + 默认关闭自适应模式

问题: min_interval=10 导致每个水面产生数千个密集采样点 (8242点)

修复:
  1. sampling.py: min_interval 默认值 10→50 (提高 5×)
     两个入口函数同步修改 (chunked + full)
  2. step4_sampling_panel.py: 自适应采样复选框默认 False
     用户设置的固定间隔 (interval=100px) 真正生效
This commit is contained in:
duxin
2026-07-08 16:03:42 +08:00
parent 197f58c187
commit 7921e21750
2 changed files with 3 additions and 3 deletions

View File

@ -130,7 +130,7 @@ class Step4SamplingPanel(QWidget):
params_layout.addRow("内存处理块大小:", w3) params_layout.addRow("内存处理块大小:", w3)
self.use_adaptive_sampling = QCheckBox("启用自适应边缘采样") 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_layout.addRow("智能模式:", self.use_adaptive_sampling)
params_group.setLayout(params_layout) params_group.setLayout(params_layout)

View File

@ -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, 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, 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生成采样点并提取光谱数据(分块处理版本) 基于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, def get_spectral_sampling_points(bil_file, water_mask_shp, severe_glint=None, output_csvpath=None,
interval=100, sample_radius=1, 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生成采样点并提取光谱数据 基于bil文件、shp格式water_mask和severe_glint生成采样点并提取光谱数据