diff --git a/func/Module_preprocess.py b/func/Module_preprocess.py index f706fc2..ad2e337 100644 --- a/func/Module_preprocess.py +++ b/func/Module_preprocess.py @@ -309,6 +309,17 @@ class MainWindow_preprocess(QMainWindow): else: PublicFunc.text_output(self.ui, "(1/1)" + result.info, Constants.TIPS_TYPE_INFO) + # 重采样 + PublicFunc.progressbar_update(self, 2, 2, Constants.RESAMPLING_DATA, 0) + result = self.data.resample() + if not result.status: + PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.msgbox_output(self, result.info, Constants.MSGBOX_TYPE_ERROR) + PublicFunc.finish_operation(self, ButtonState) + return + else: + PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO) + self.__reset__() PublicFunc.finish_operation(self, ButtonState) @@ -419,15 +430,29 @@ class Data: return Result().success(info=Constants.INPUT_FINISHED) - def preprocess(self): + def resample(self): if self.raw_data is None: - Result().failure(info=Constants.PREPROCESS_FAILURE + Constants.FAILURE_REASON["Data_Not_Exist"]) + Result().failure(info=Constants.RESAMPLE_FAILURE + Constants.FAILURE_REASON["Data_Not_Exist"]) try: if Config["InputConfig"]["Freq"] != Config["OutputConfig"]["Freq"]: self.raw_data = resample(self.raw_data, int(len(self.raw_data) * (Config["OutputConfig"]["Freq"] / Config["InputConfig"]["Freq"]))) + else: + return Result().success(info=Constants.RESAMPLE_NO_NEED) + except Exception as e: + Result().failure(info=Constants.RESAMPLE_FAILURE + + Constants.FAILURE_REASON["Resample_Exception"] + "\n" + format_exc()) + + return Result().success(info=Constants.RESAMPLE_FINISHED) + + def preprocess(self): + if self.raw_data is None: + Result().failure(info=Constants.PREPROCESS_FAILURE + Constants.FAILURE_REASON["Data_Not_Exist"]) + + try: + if Config["Mode"] == "BCG": self.processed_data = Butterworth_for_BCG_PreProcess(self.raw_data, type='bandpass', low_cut=Config["Filter"]["BCGBandPassLow"], diff --git a/func/utils/Constants.py b/func/utils/Constants.py index 2cdda0a..31d13a8 100644 --- a/func/utils/Constants.py +++ b/func/utils/Constants.py @@ -26,6 +26,7 @@ class Constants: RESAMPLING_DATA: str = "正在数据重采样" RESAMPLE_FINISHED: str = "重采样完成" RESAMPLE_FAILURE: str = "重采样失败" + RESAMPLE_NO_NEED: str = "无需进行重采样" LOADING_ARCHIVE: str = "正在获取历史存档" ARCHIVE_EXIST: str = "找到历史存档,成功读取"