修改了文件命名规则

优化<ECG的R峰算法定位>的代码

func/Module_detect_Rpeak.py

@@ -71,12 +71,9 @@ class SettingWindow(QMainWindow):
         Config.update({
             "Path": {
                 "Input": str((Path(self.root_path) / ConfigParams.PUBLIC_PATH_PSG_TEXT /
-                              Path(str(self.sampID)) / Path(ConfigParams.DETECT_RPEAK_INPUT_ECG_FILENAME +
+                              Path(str(self.sampID)))),
-                                                            str(Config["InputConfig"]["Freq"]) +
-                                                            ConfigParams.ENDSWITH_TXT))),
                 "Save": str((Path(self.root_path) / ConfigParams.PUBLIC_PATH_PSG_TEXT /
-                             Path(str(self.sampID)) / Path(ConfigParams.DETECT_RPEAK_SAVE_FILENAME +
+                             Path(str(self.sampID))))
-                                                           ConfigParams.ENDSWITH_TXT)))
             }
         })
 
@@ -107,7 +104,7 @@ class SettingWindow(QMainWindow):
             str((Path(self.root_path) /
                  ConfigParams.PUBLIC_PATH_PSG_TEXT /
                  Path(str(self.sampID)) /
-                 Path(ConfigParams.DETECT_RPEAK_INPUT_ECG_FILENAME +
+                 Path(ConfigParams.ECG_FILTER +
                       str(self.ui.spinBox_input_freq.value()) +
                       ConfigParams.ENDSWITH_TXT))))
 
@@ -261,7 +258,7 @@ class MainWindow_detect_Rpeak(QMainWindow):
         # TODO：获取检测方法的解耦
         method_list = get_method()
         if len(method_list) == 0 or method_list is None:
-            result = Result().failure(info=Constants.DETECT_RPEAK_LOAD_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Method_Not_Exist"])
+            result = Result().failure(info=Constants.DETECT_RPEAK_LOAD_FAILURE + Constants.FAILURE_REASON["Method_Not_Exist"])
         else:
             result = Result().success(info=Constants.DETECT_RPEAK_LOAD_FINISHED)
         if not result.status:
@@ -291,7 +288,7 @@ class MainWindow_detect_Rpeak(QMainWindow):
         PublicFunc.__disableAllButton__(self, ButtonState)
 
         # 数据预处理
-        PublicFunc.progressbar_update(self, 1, 3, Constants.DETECT_RPEAK_PROCESSING_DATA, 0)
+        PublicFunc.progressbar_update(self, 1, 3, Constants.PREPROCESSING_DATA, 0)
         result = self.data.preprocess()
         if not result.status:
             PublicFunc.text_output(self.ui, "(1/3)" + result.info, Constants.TIPS_TYPE_ERROR)
@@ -390,21 +387,35 @@ class Data:
         self.RRIV = None
 
     def open_file(self):
+        if Path(Config["Path"]["Input"]).is_file():
+            Config["Path"]["Input"] = str(Path(Config["Path"]["Input"]).parent)
+
         if not Path(Config["Path"]["Input"]).exists():
-            return Result().failure(info=Constants.INPUT_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Data_Path_Not_Exist"])
+            return Result().failure(info=Constants.INPUT_FAILURE + Constants.FAILURE_REASON["Path_Not_Exist"])
+
+        result = PublicFunc.examine_file(Config["Path"]["Input"], ConfigParams.ECG_FILTER)
+        if result.status:
+            Config["Path"]["Input"] = result.data["path"]
+            Config["InputConfig"]["Freq"] = result.data["freq"]
+            Config["Path"]["Save"] = str(
+                Path(Config["Path"]["Save"]) / Path(ConfigParams.RPEAK_FINAL + str(Config["InputConfig"]["Freq"]) + ConfigParams.ENDSWITH_TXT))
+        else:
+            return result
 
         try:
             self.raw_data = read_csv(Config["Path"]["Input"],
                                      encoding=ConfigParams.UTF8_ENCODING,
                                      header=None).to_numpy().reshape(-1)
         except Exception as e:
-            return Result().failure(info=Constants.INPUT_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Read_Data_Exception"] + "\n" + format_exc())
+            return Result().failure(info=Constants.INPUT_FAILURE +
+                                         Constants.FAILURE_REASON["Read_Data_Exception"] + "\n" + format_exc())
 
         return Result().success(info=Constants.INPUT_FINISHED)
 
     def preprocess(self):
         if self.raw_data is None:
-            return Result().failure(info=Constants.DETECT_RPEAK_PROCESS_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Raw_Data_Not_Exist"])
+            return Result().failure(info=Constants.PREPROCESS_FAILURE +
+                                         Constants.FAILURE_REASON["Data_Not_Exist"])
 
         try:
             self.processed_data = preprocess(self.raw_data,
@@ -412,13 +423,15 @@ class Data:
                                              Config["Filter"]["BandPassLow"],
                                              Config["Filter"]["BandPassHigh"])
         except Exception as e:
-            return Result().failure(info=Constants.DETECT_RPEAK_PROCESS_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Filter_Exception"] + "\n" + format_exc())
+            return Result().failure(info=Constants.PREPROCESS_FAILURE +
+                                         Constants.FAILURE_REASON["Preprocess_Exception"] + "\n" + format_exc())
 
-        return Result().success(info=Constants.DETECT_RPEAK_PROCESS_FINISHED)
+        return Result().success(info=Constants.PREPROCESS_FINISHED)
 
     def predict_Rpeak(self):
         if self.processed_data is None:
-            return Result().failure(info=Constants.DETECT_RPEAK_PREDICT_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Processed_Data_Not_Exist"])
+            return Result().failure(info=Constants.DETECT_RPEAK_PREDICT_FAILURE +
+                                         Constants.FAILURE_REASON["Data_Not_Exist"])
 
         try:
             self.peak, self.interval, self.RRIV = Rpeak_Detection(self.processed_data,
@@ -426,18 +439,20 @@ class Data:
                                                                   Config["PeaksValue"],
                                                                   Config["DetectMethod"])
         except Exception as e:
-            return Result().failure(info=Constants.DETECT_RPEAK_PREDICT_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Predict_Exception"] + "\n" + format_exc())
+            return Result().failure(info=Constants.DETECT_RPEAK_PREDICT_FAILURE +
+                                         Constants.FAILURE_REASON["Predict_Exception"] + "\n" + format_exc())
 
         return Result().success(info=Constants.DETECT_RPEAK_PREDICT_FINISHED)
 
     def save(self, chunk):
         if self.peak is None:
 
-            return Result().failure(info=Constants.SAVING_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Peak_Not_Exist"])
+            return Result().failure(info=Constants.SAVING_FAILURE + Constants.FAILURE_REASON["Data_Not_Exist"])
 
         try:
             chunk.to_csv(Config["Path"]["Save"], mode='a', index=False, header=False)
         except Exception as e:
-            return Result().failure(info=Constants.SAVING_FAILURE + Constants.DETECT_RPEAK_FAILURE_REASON["Save_Exception"] + "\n" + format_exc())
+            return Result().failure(info=Constants.SAVING_FAILURE +
+                                         Constants.FAILURE_REASON["Save_Exception"] + "\n" + format_exc())
 
         return Result().success(info=Constants.SAVING_FINISHED)

func/utils/ConfigParams.py

@@ -36,7 +36,10 @@ class ConfigParams:
 
     BCG_FILTER: str = "BCG_Filter_"
     ECG_FILTER: str = "ECG_Filter_"
-    JPEAK_REVISE: str = "JPeak_revise_"
+    JPEAK_REVISE: str = "Jpeak_revise_"
+    RPEAK_FINAL: str = "Rpeak_final_"
+    JPEAK_REVISE_CORRECTED: str = "Jpeak_revise_corrected_"
+    RPEAK_FINAL_CORRECTED: str = "Rpeak_final_corrected_"
 
 
 

func/utils/Constants.py

@@ -119,6 +119,36 @@ class Constants:
     DETECT_JPEAK_PLOT_LABEL_J_PEAKS: str = "J_Peaks"
     DETECT_JPEAK_PLOT_LABEL_INTERVAL: str = "Interval"
 
+    # ECG的R峰算法定位
+    DETECT_RPEAK_LOADING_METHOD: str = "正在读取方法"
+    DETECT_RPEAK_LOAD_FINISHED: str = "读取完成"
+    DETECT_RPEAK_LOAD_FAILURE: str = "读取失败"
+
+    DETECT_RPEAK_PREDICTING_PEAK: str = "正在预测峰值"
+    DETECT_RPEAK_PREDICT_FINISHED: str = "预测完成"
+    DETECT_RPEAK_PREDICT_FAILURE: str = "预测失败"
+
+    DETECT_RPEAK_FAILURE_REASON = {
+        "Data_Path_Not_Exist": "（数据路径不存在）",
+        "Read_Data_Exception": "（读取数据异常）",
+        "Method_Not_Exist": "（检测方法不存在）",
+        "Read_Method_Exception": "（读取方法异常）",
+        "Predict_Exception": "（峰值预测异常）",
+        "Raw_Data_Not_Exist": "（原始数据不存在）",
+        "Filter_Exception": "（滤波器异常）",
+        "Processed_Data_Not_Exist": "（处理后数据不存在）",
+        "Peak_Not_Exist": "（预测的峰值不存在）",
+        "Save_Exception": "（保存异常）"
+    }
+
+    DETECT_RPEAK_DATA_LENGTH_POINTS: str = "数据长度（点数）："
+    DETECT_RPEAK_DURATION_MIN: str = "数据时长（分钟）："
+    DETECT_RPEAK_PEAK_AMOUNT: str = "R峰个数："
+    DETECT_RPEAK_PLOT_LABEL_RRIV: str = "RRIV"
+    DETECT_RPEAK_PLOT_LABEL_ECG: str = "ECG"
+    DETECT_RPEAK_PLOT_LABEL_R_PEAKS: str = "R_Peaks"
+    DETECT_RPEAK_PLOT_LABEL_INTERVAL: str = "Interval"
+
     # 数据粗同步
     APPROXIMATELY_ONLY_ALIGN_RESAMPLING: str = "正在仅重采样"
     APPROXIMATELY_ONLY_ALIGN_RESAMPLE_FINISHED: str = "仅重采样完成"
@@ -181,41 +211,6 @@ class Constants:
         "Save_Exception": "（保存异常）"
     }
 
-
-    # ECG的R峰算法定位
-    DETECT_RPEAK_LOADING_METHOD: str = "正在读取方法"
-    DETECT_RPEAK_LOAD_FINISHED: str = "读取完成"
-    DETECT_RPEAK_LOAD_FAILURE: str = "读取失败"
-
-    DETECT_RPEAK_PROCESSING_DATA: str = "正在处理数据"
-    DETECT_RPEAK_PROCESS_FINISHED: str = "处理完成"
-    DETECT_RPEAK_PROCESS_FAILURE: str = "处理失败"
-
-    DETECT_RPEAK_PREDICTING_PEAK: str = "正在预测峰值"
-    DETECT_RPEAK_PREDICT_FINISHED: str = "预测完成"
-    DETECT_RPEAK_PREDICT_FAILURE: str = "预测失败"
-
-    DETECT_RPEAK_FAILURE_REASON = {
-        "Data_Path_Not_Exist": "（数据路径不存在）",
-        "Read_Data_Exception": "（读取数据异常）",
-        "Method_Not_Exist": "（检测方法不存在）",
-        "Read_Method_Exception": "（读取方法异常）",
-        "Predict_Exception": "（峰值预测异常）",
-        "Raw_Data_Not_Exist": "（原始数据不存在）",
-        "Filter_Exception": "（滤波器异常）",
-        "Processed_Data_Not_Exist": "（处理后数据不存在）",
-        "Peak_Not_Exist": "（预测的峰值不存在）",
-        "Save_Exception": "（保存异常）"
-    }
-
-    DETECT_RPEAK_DATA_LENGTH_POINTS: str = "数据长度（点数）："
-    DETECT_RPEAK_DURATION_MIN: str = "数据时长（分钟）："
-    DETECT_RPEAK_PEAK_AMOUNT: str = "R峰个数："
-    DETECT_RPEAK_PLOT_LABEL_RRIV: str = "RRIV"
-    DETECT_RPEAK_PLOT_LABEL_ECG: str = "ECG"
-    DETECT_RPEAK_PLOT_LABEL_R_PEAKS: str = "R_Peaks"
-    DETECT_RPEAK_PLOT_LABEL_INTERVAL: str = "Interval"
-
     # 人工纠正
     LABEL_CHECK_PROCESSING_DATA: str = "正在处理数据"
     LABEL_CHECK_PROCESS_FINISHED: str = "处理完成"

数据结构化输入和输出命名规范.md

@@ -24,8 +24,8 @@
 .../OrgBCG_Text/<sampID>
     |-OrgBCG_Raw_采样率.txt
     |-BCG_Filter_采样率.txt
-    |-JPeak_revise_采样率.txt
+    |-Jpeak_revise_采样率.txt
-    |-JPeak_revise_corrected_采样率.txt
+    |-Jpeak_revise_corrected_采样率.txt
 .../OrgBCG_Origin/<sampID>
     |-...
 .../PSG_Aligned/<sampID>
@@ -118,7 +118,7 @@
 
 输出：
 
-算法定位的J峰坐标：`./OrgBCG_Text/<sampID>/JPeak_revise_采样率.txt`
+算法定位的J峰坐标：`./OrgBCG_Text/<sampID>/Jpeak_revise_采样率.txt`
 
 
 #### 3.2 人工纠正
@@ -147,13 +147,13 @@
 
 带通滤波BCG信号：`./OrgBCG_Text/<sampID>/BCG_Filter_采样率.txt`
 
-算法定位的J峰坐标：`./OrgBCG_Text/<sampID>/JPeak_revise_采样率.txt`
+算法定位的J峰坐标：`./OrgBCG_Text/<sampID>/Jpeak_revise_采样率.txt`
 
 粗同步后的位置索引：`./Label/<sampID>/Approximately_Align_Info.csv`
 
 输出：
 
-人工纠正后的J峰坐标：`./OrgBCG_Text/<sampID>/JPeak_revise_corrected_采样率.txt`
+人工纠正后的J峰坐标：`./OrgBCG_Text/<sampID>/Jpeak_revise_corrected_采样率.txt`
 
 
 #### 3.3 数据片段起止对齐、数据采样率同步
@@ -167,7 +167,7 @@
 
 带通滤波BCG信号：`./OrgBCG_Text/<sampID>/BCG_Filter_采样率.txt`
 
-人工纠正后的J峰坐标：`./OrgBCG_Text/<sampID>/JPeak_revise_corrected_采样率.txt`
+人工纠正后的J峰坐标：`./OrgBCG_Text/<sampID>/Jpeak_revise_corrected_采样率.txt`
 
 原始orgBcg信号：`./OrgBCG_Text/<sampID>/OrgBCG_Raw_采样率.txt`