diff --git a/src/gui/panels/step5_clean_panel.py b/src/gui/panels/step5_clean_panel.py index 34f13f4..a9e4de8 100644 --- a/src/gui/panels/step5_clean_panel.py +++ b/src/gui/panels/step5_clean_panel.py @@ -76,7 +76,7 @@ class Step5CleanPanel(QWidget): "输出处理后CSV:", "CSV Files (*.csv);;All Files (*.*)" ) - self.output_file.line_edit.setPlaceholderText("processed_data.csv") + self.output_file.line_edit.setPlaceholderText("cleaned_sampling_data.csv") layout.addWidget(self.output_file) # 启用步骤 @@ -127,9 +127,9 @@ class Step5CleanPanel(QWidget): self.work_dir = None if self.work_dir: - output_dir = os.path.join(self.work_dir, "4_processed_data") + output_dir = os.path.join(self.work_dir, "5_Data_Cleaning") os.makedirs(output_dir, exist_ok=True) - default_output_path = os.path.join(output_dir, "processed_data.csv").replace('\\', '/') + default_output_path = os.path.join(output_dir, "cleaned_sampling_data.csv").replace('\\', '/') self.output_file.set_path(default_output_path) else: self.output_file.set_path("") diff --git a/src/gui/panels/step6_feature_panel.py b/src/gui/panels/step6_feature_panel.py index af13e55..e42c6f7 100644 --- a/src/gui/panels/step6_feature_panel.py +++ b/src/gui/panels/step6_feature_panel.py @@ -193,7 +193,7 @@ class Step6FeaturePanel(QWidget): # 4. 自动填充输出路径（基于工作目录） if self.work_dir: - output_dir = os.path.join(self.work_dir, "5_training_spectra") + output_dir = os.path.join(self.work_dir, "6_Spectral_Feature_Extraction") os.makedirs(output_dir, exist_ok=True) default_output_path = os.path.join(output_dir, "training_spectra.csv").replace('\\', '/') self.output_file.set_path(default_output_path) diff --git a/src/gui/panels/step7_index_panel.py b/src/gui/panels/step7_index_panel.py index a53443c..abc7041 100644 --- a/src/gui/panels/step7_index_panel.py +++ b/src/gui/panels/step7_index_panel.py @@ -261,7 +261,7 @@ class Step7IndexPanel(QWidget): work_dir = self._get_work_dir() if work_dir: - track_a_dir = os.path.join(work_dir, "6_water_quality_indices") + track_a_dir = os.path.join(work_dir, "7_Water_Quality_Indices") os.makedirs(track_a_dir, exist_ok=True) config['output_file'] = os.path.join(track_a_dir, "training_spectra_indices.csv").replace('\\', '/') diff --git a/src/gui/panels/step8_ml_train_panel.py b/src/gui/panels/step8_ml_train_panel.py index 7a39df3..7376650 100644 --- a/src/gui/panels/step8_ml_train_panel.py +++ b/src/gui/panels/step8_ml_train_panel.py @@ -271,7 +271,7 @@ class Step8MlTrainPanel(QWidget): 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 "" + initial_dir = os.path.join(work_dir, "7_Water_Quality_Indices") if work_dir else "" if initial_dir and not os.path.isdir(initial_dir): os.makedirs(initial_dir, exist_ok=True) @@ -375,17 +375,17 @@ class Step8MlTrainPanel(QWidget): self.training_csv_file.set_path(step5_csv) # 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 + # 输入是 training_spectra.csv → 输出 {work_dir}/7_Water_Quality_Indices/training_spectra_indices.csv + # 输入是 sampling_spectra.csv → 输出 {work_dir}/7_Water_Quality_Indices/sampling_spectra_indices.csv if self.work_dir: - indices_dir = os.path.join(self.work_dir, "6_water_quality_indices") + indices_dir = os.path.join(self.work_dir, "7_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_file = "training_spectra_indices.csv" output_path = os.path.join(indices_dir, output_file).replace('\\', '/') self.output_path.set_path(output_path) else: diff --git a/src/gui/water_quality_gui.py b/src/gui/water_quality_gui.py index 24c1b0a..dd64e3f 100644 --- a/src/gui/water_quality_gui.py +++ b/src/gui/water_quality_gui.py @@ -1369,10 +1369,10 @@ class WaterQualityGUI(QMainWindow): 'step2': "2_glint/severe_glint_area.dat", 'step3': "3_deglint/deglint_kutser.bsq", 'step4_sampling': "4_sampling/sampling_spectra.csv", - 'step5_clean': "4_processed_data/processed_data.csv", - 'step6_feature': "5_training_spectra/training_spectra.csv", - 'step7_index': "6_water_quality_indices/training_spectra_indices.csv", - 'step8_ml_train': "7_Supervised_Model_Training/", + 'step5_clean': "5_Data_Cleaning/cleaned_sampling_data.csv", + 'step6_feature': "6_Spectral_Feature_Extraction/training_spectra.csv", + 'step7_index': "7_Water_Quality_Indices/training_spectra_indices.csv", + 'step8_ml_train': "8_Supervised_Model_Training/", 'step9_ml_predict': "11_12_13_predictions/Machine_Learning_Prediction/", 'step10_watercolor': "10_WaterIndex_Images/", 'step11_map': "14_visualization/" @@ -2381,10 +2381,10 @@ class WaterQualityGUI(QMainWindow): '1_water_mask': 'step1', '2_glint': 'step2', '3_deglint': 'step3', - '4_processed_data': 'step4_sampling', - '5_training_spectra': 'step5_clean', - '6_water_quality_indices': 'step6_feature', - '7_Supervised_Model_Training': 'step7_index', + '5_Data_Cleaning': 'step5_clean', + '6_Spectral_Feature_Extraction': 'step6_feature', + '7_Water_Quality_Indices': 'step7_index', + '8_Supervised_Model_Training': 'step8_ml_train', '8_Regression_Modeling': 'step8_ml_train', '9_Custom_Regression_Modeling': 'step9_ml_predict', '11_12_13_predictions/Machine_Learning_Prediction': 'step9_ml_predict',