fix: ML 报告进度增加 on_progress 回调 + 两条报告逻辑审查确认
ML 报告: 参数循环中加入 on_progress 回调,
终端显示 ML报告 参数 3/13: Chlorophyll
审查结论:
公式报告 (_generate_formula_report):
数据源: 10_WaterIndex_CSV + 11_Thematic_Map + 1_water_mask
不含 ML 内容 (无 scatter/boxplot/heatmap/R²/RMSE)
进度: 数据驱动 (N_csv + N_maps + 4 固定)
ML 报告 (_generate_ml_report):
数据源: 12_visualization + 5_Data_Cleaning + 9_Concentration
完整 ML 流程 (统计表→热力图→浓度→逐参数图表→总结)
进度: 图片数 + 参数数 + 2
This commit is contained in:
@ -864,9 +864,14 @@ class WaterQualityReportGenerator:
|
|||||||
|
|
||||||
# 按参数生成内容(带编号):参数章节从 5 开始编号
|
# 按参数生成内容(带编号):参数章节从 5 开始编号
|
||||||
base_section_num = 5
|
base_section_num = 5
|
||||||
last_param_section_num = base_section_num + len(parameters) - 1
|
n_params = len(parameters)
|
||||||
for section_num, param in enumerate(parameters, base_section_num):
|
last_param_section_num = base_section_num + n_params - 1
|
||||||
progress.set_description(f"正在分析 {param} 数据 ({section_num - base_section_num + 1}/{len(parameters)})")
|
for s_i, param in enumerate(parameters):
|
||||||
|
section_num = base_section_num + s_i
|
||||||
|
pct = int((s_i + 1) / n_params * 100)
|
||||||
|
if on_progress:
|
||||||
|
try: on_progress(pct, f"ML报告 参数 {s_i+1}/{n_params}: {param}")
|
||||||
|
except Exception: pass
|
||||||
figure_counter = self._add_parameter_section(
|
figure_counter = self._add_parameter_section(
|
||||||
doc,
|
doc,
|
||||||
param,
|
param,
|
||||||
|
|||||||
Reference in New Issue
Block a user