duxingchen/WQ_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: step13 auto-detect report mode on panel load (in _auto_pull_work_dir), not just on generate click

Browse Source
This commit is contained in:
duxin
2026-07-09 15:38:47 +08:00
parent 208e067334
commit 600400a4d9
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/panels/step13_report_panel.py
View File

@ -362,13 +362,25 @@ class Step13ReportPanel(QWidget):
self.work_dir_edit.setText(str(work_dir)) self.work_dir_edit.setText(str(work_dir))
def _auto_pull_work_dir(self): def _auto_pull_work_dir(self):
"""从主窗口自动同步工作目录到 work_dir_edit（无需用户操作）。""" """从主窗口自动同步工作目录到 work_dir_edit，并自动检测报告模式。"""
mw = self.main_window mw = self.main_window
if mw is not None and getattr(mw, "work_dir", None): if mw is not None and getattr(mw, "work_dir", None):
wd = str(mw.work_dir) wd = str(mw.work_dir)
cur = self.work_dir_edit.text().strip() cur = self.work_dir_edit.text().strip()
if wd and wd != cur: if wd and wd != cur:
self.work_dir_edit.setText(wd) self.work_dir_edit.setText(wd)
# 自动检测报告模式（参考 Step11 逻辑）
self._auto_detect_report_mode(wd)
def _auto_detect_report_mode(self, wd: str):
"""根据工作目录内容自动选择报告模式下拉框"""
wd_path = Path(wd)
ml_dir = wd_path / "9_ML_Prediction"
formula_dir = wd_path / "10_WaterIndex_CSV"
if ml_dir.is_dir() and list(ml_dir.glob("*.csv")):
self.report_mode_cb.setCurrentIndex(0) # ML
elif formula_dir.is_dir() and list(formula_dir.glob("*.csv")):
self.report_mode_cb.setCurrentIndex(1) # 公式
def update_from_config(self, work_dir=None, pipeline=None): def update_from_config(self, work_dir=None, pipeline=None):
"""切入面板时由主窗口统一调用，把当前 work_dir 同步到本面板。 """切入面板时由主窗口统一调用，把当前 work_dir 同步到本面板。
@ -418,15 +430,6 @@ class Step13ReportPanel(QWidget):
) )
return return
# 自动检测报告模式（参考 Step11 逻辑）
wd_path = Path(wd)
ml_dir = wd_path / "9_ML_Prediction"
formula_dir = wd_path / "10_WaterIndex_CSV"
if ml_dir.is_dir() and list(ml_dir.glob("*.csv")):
self.report_mode_cb.setCurrentIndex(0) # ML
elif formula_dir.is_dir() and list(formula_dir.glob("*.csv")):
self.report_mode_cb.setCurrentIndex(1) # 公式
if self._report_thread and self._report_thread.isRunning(): if self._report_thread and self._report_thread.isRunning():
QMessageBox.information(self, "提示", "报告正在生成中，请稍候。") QMessageBox.information(self, "提示", "报告正在生成中，请稍候。")
return return