界面优化

src/gui/panels/step6_panel.py

@@ -42,15 +42,15 @@ class Step6Panel(QWidget):
         layout.addWidget(self.ml_page)
 
         # 输出文件路径
-        self.output_dir = FileSelectWidget(
-            "输出模型目录:",
-            "Directories;;All Files (*.*)"
+        self.output_path = FileSelectWidget(
+            "输出文件:",
+            "CSV Files (*.csv);;All Files (*.*)",
+            mode="save"
         )
-        self.output_dir.line_edit.setPlaceholderText("models_output")
-        # 修改浏览按钮为选择目录
-        self.output_dir.browse_btn.clicked.disconnect()
-        self.output_dir.browse_btn.clicked.connect(self.browse_output_dir)
-        layout.addWidget(self.output_dir)
+        self.output_path.line_edit.setPlaceholderText("自动生成，或手动指定输出文件路径...")
+        self.output_path.browse_btn.clicked.disconnect()
+        self.output_path.browse_btn.clicked.connect(self.browse_output_path)
+        layout.addWidget(self.output_path)
 
         # 启用步骤
         self.enable_checkbox = QCheckBox("启用此步骤")
@@ -198,11 +198,38 @@ class Step6Panel(QWidget):
         for checkbox in checkboxes_dict.values():
             checkbox.setChecked(checked)
 
-    def browse_output_dir(self):
-        """浏览输出目录"""
-        dir_path = QFileDialog.getExistingDirectory(self, "选择输出模型目录", "")
-        if dir_path:
-            self.output_dir.set_path(dir_path)
+    def _get_default_work_dir(self):
+        """获取 work_dir，优先用 panel 自身缓存的，否则尝试从主窗口取"""
+        if hasattr(self, 'work_dir') and self.work_dir:
+            return str(self.work_dir)
+        mw = self.window()
+        if mw and hasattr(mw, 'work_dir') and mw.work_dir:
+            return str(mw.work_dir)
+        return ""
+
+    def browse_output_path(self):
+        """浏览输出文件路径（保存对话框）"""
+        current = self.output_path.get_path().strip()
+        if current:
+            initial_dir = os.path.dirname(current)
+            initial_file = os.path.basename(current)
+        else:
+            initial_dir = ""
+            initial_file = ""
+
+        if not initial_dir or not os.path.isdir(initial_dir):
+            # 默认定位到 indices 目录
+            work_dir = self._get_default_work_dir()
+            initial_dir = os.path.join(work_dir, "6_water_quality_indices") if work_dir else ""
+            if initial_dir and not os.path.isdir(initial_dir):
+                os.makedirs(initial_dir, exist_ok=True)
+
+        file_path, _ = QFileDialog.getSaveFileName(
+            self, "保存输出文件", os.path.join(initial_dir, initial_file) if initial_file else initial_dir,
+            "CSV Files (*.csv);;All Files (*.*)"
+        )
+        if file_path:
+            self.output_path.set_path(file_path)
 
     def get_config(self):
         """获取配置"""
@@ -229,7 +256,9 @@ class Step6Panel(QWidget):
         training_csv_path = self.training_csv_file.get_path()
         if training_csv_path:
             config['training_csv_path'] = training_csv_path
-        # 注意：step6_train_models 不接受 output_dir 参数，输出目录由 pipeline 内部根据 work_dir 生成
+        output_path = self.output_path.get_path()
+        if output_path:
+            config['output_path'] = output_path
         return config
 
     def set_config(self, config):
@@ -252,8 +281,8 @@ class Step6Panel(QWidget):
                 checkbox.setChecked(method in methods)
         if 'training_csv_path' in config:
             self.training_csv_file.set_path(config['training_csv_path'])
-        if 'output_dir' in config:
-            self.output_dir.set_path(config['output_dir'])
+        if 'output_path' in config:
+            self.output_path.set_path(config['output_path'])
 
     def update_from_config(self, work_dir=None, pipeline=None):
         """从全局配置自动填充训练数据和输出路径
@@ -288,13 +317,22 @@ class Step6Panel(QWidget):
                 if step5_csv:
                     self.training_csv_file.set_path(step5_csv)
 
-        # 2. 自动填充输出目录（基于工作目录）
+        # 2. 自动填充输出文件路径（基于工作目录和输入文件名）
+        # 输入是 training_spectra.csv → 输出 {work_dir}/6_water_quality_indices/training_spectra_indices.csv
+        # 输入是 sampling_spectra.csv   → 输出 {work_dir}/6_water_quality_indices/sampling_spectra_indices.csv
         if self.work_dir:
-            output_dir = os.path.join(self.work_dir, "7_Supervised_Model_Training")
-            os.makedirs(output_dir, exist_ok=True)
-            self.output_dir.set_path(output_dir.replace('\\', '/'))
+            indices_dir = os.path.join(self.work_dir, "6_water_quality_indices")
+            os.makedirs(indices_dir, exist_ok=True)
+            training_csv = self.training_csv_file.get_path()
+            if training_csv:
+                basename = os.path.splitext(os.path.basename(training_csv))[0]
+                output_file = f"{basename}_indices.csv"
+            else:
+                output_file = "water_quality_indices.csv"
+            output_path = os.path.join(indices_dir, output_file).replace('\\', '/')
+            self.output_path.set_path(output_path)
         else:
-            self.output_dir.set_path("")
+            self.output_path.set_path("")
 
     def run_step(self):
         """独立运行步骤6"""