Rename pipeline method names to match step numbers (Step4)

This commit is contained in:
DXC
2026-06-11 14:58:39 +08:00
parent 7c7a31ce00
commit d3262ae80d
6 changed files with 36 additions and 43 deletions

View File

@ -323,18 +323,17 @@ class WorkerThread(QThread):
'step1': 'step1_generate_water_mask',
'step2': 'step2_find_glint_area',
'step3': 'step3_remove_glint',
'step4': 'step4_process_csv',
'step5': 'step5_extract_training_spectra',
'step7': 'step7_water_quality_indices',
'step8': 'step8_ml_modeling',
'step4': 'step5_process_csv',
'step5': 'step6_extract_spectra',
'step7': 'step7_calc_indices',
'step8': 'step8_train_ml',
'step8_non_empirical_modeling': 'step8_non_empirical_modeling',
'step8_qaa': 'step8_qaa_inversion',
'step9': 'step9_watercolor_inversion',
'step9_concentration': 'step9_concentration_inversion',
'step10': 'step10_sampling',
'step11_ml': 'step11_ml_prediction',
'step10': 'step4_sampling',
'step11_ml': 'step9_predict_ml',
'step11': 'step11_non_empirical_prediction',
'step14': 'step14_distribution_map'
'step14': 'step10_map'
}
if step_name not in step_method_map:
@ -350,12 +349,6 @@ class WorkerThread(QThread):
result = method(**config)
return result
# step9_concentration_inversion 同理,必须透传完整 config dict
if step_name == 'step9_concentration':
method = getattr(self.pipeline, method_name)
result = method(**config)
return result
# 透传面板顶层传入的外部预训练模型GUI step11_prediction_panel 通过 config['_external_model'] 传入)
# 非空才覆盖(遵循 feedback_never_overwrite_with_empty 原则)
for key in ('_external_model', '_external_model_path',

View File

@ -68,7 +68,7 @@ class Step14BatchThread(QThread):
kw["output_image_path"] = str(Path(self.output_dir_optional) / f"{stem}_distribution.png")
else:
kw["output_image_path"] = None
pipeline.step14_distribution_map(**kw)
pipeline.step10_map(**kw)
self.finished_ok.emit(n)
except Exception as e:
self.failed.emit(f"{e}\n{traceback.format_exc()}")

View File

@ -124,7 +124,7 @@ class Step6FeaturePanel(QWidget):
glint_mask_path = self.glint_mask_file.get_path()
if glint_mask_path:
config['glint_mask_path'] = glint_mask_path
# 注意step5_extract_training_spectra 不接受 output_path / training_csv_path
# 注意step6_extract_spectra 不接受 output_path / training_csv_path
# 参数,输出路径由 pipeline 内部根据 training_spectra_dir 自动生成。
return config