From dd04ee323c8c2c183b067143589a21c7c57134c6 Mon Sep 17 00:00:00 2001 From: duxin Date: Thu, 9 Jul 2026 13:26:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ML=20=E6=8A=A5=E5=91=8A=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E5=A2=9E=E5=8A=A0=20on=5Fprogress=20=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=20+=20=E4=B8=A4=E6=9D=A1=E6=8A=A5=E5=91=8A=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=AE=A1=E6=9F=A5=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/postprocessing/report_word.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/postprocessing/report_word.py b/src/postprocessing/report_word.py index ec78e3d..8d57cf2 100644 --- a/src/postprocessing/report_word.py +++ b/src/postprocessing/report_word.py @@ -864,9 +864,14 @@ class WaterQualityReportGenerator: # 按参数生成内容（带编号）：参数章节从 5 开始编号 base_section_num = 5 - last_param_section_num = base_section_num + len(parameters) - 1 - for section_num, param in enumerate(parameters, base_section_num): - progress.set_description(f"正在分析 {param} 数据 ({section_num - base_section_num + 1}/{len(parameters)})") + n_params = len(parameters) + last_param_section_num = base_section_num + n_params - 1 + 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( doc, param,