1、修复了修改采样率后保存数据时保存错误的问题。

2、删去了导入设置中,保存路径随着采样率变化而变化的功能,即采样率变化时将不再把实际的文件保存路径输出到文本框中显示
This commit is contained in:
2025-06-04 21:59:24 +08:00
parent d329476521
commit 06af421ce0
8 changed files with 6 additions and 95 deletions

View File

@ -986,8 +986,6 @@ class Data():
Config["Path"]["Input_BCG"] = str(Path(Config["Path"]["Input_BCG"]).parent) Config["Path"]["Input_BCG"] = str(Path(Config["Path"]["Input_BCG"]).parent)
if Path(Config["Path"]["Input_Artifact"]).is_file(): if Path(Config["Path"]["Input_Artifact"]).is_file():
Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent) Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent)
if Path(Config["Path"]["Save"]).is_file():
Config["Path"]["Save"] = str(Path(Config["Path"]["Save"]).parent)
result = PublicFunc.examine_file(Config["Path"]["Input_BCG"], Filename.BCG_SYNC, Params.ENDSWITH_TXT) result = PublicFunc.examine_file(Config["Path"]["Input_BCG"], Filename.BCG_SYNC, Params.ENDSWITH_TXT)
if result.status: if result.status:

View File

@ -111,13 +111,6 @@ class SettingWindow(QMainWindow):
Path(Filename.BCG_FILTER + Path(Filename.BCG_FILTER +
str(self.ui.spinBox_input_freq.value()) + str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_TEXT /
Path(str(self.sampID)) /
Path(Filename.JPEAK_REVISE +
str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT))))
class MainWindow_detect_Jpeak(QMainWindow): class MainWindow_detect_Jpeak(QMainWindow):

View File

@ -108,13 +108,6 @@ class SettingWindow(QMainWindow):
Path(Filename.ECG_FILTER + Path(Filename.ECG_FILTER +
str(self.ui.spinBox_input_freq.value()) + str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_TEXT /
Path(str(self.sampID)) /
Path(Filename.RPEAK_FINAL +
str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT))))
class MainWindow_detect_Rpeak(QMainWindow): class MainWindow_detect_Rpeak(QMainWindow):

View File

@ -174,13 +174,6 @@ class SettingWindow(QMainWindow):
Path(Filename.JPEAK_REVISE + Path(Filename.JPEAK_REVISE +
str(self.ui.spinBox_input_freq_signal.value()) + str(self.ui.spinBox_input_freq_signal.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_ORGBCG_TEXT /
Path(str(self.sampID)) /
Path(Filename.JPEAK_REVISE_CORRECTED +
str(self.ui.spinBox_input_freq_signal.value()) +
Params.ENDSWITH_TXT))))
elif self.mode == "ECG": elif self.mode == "ECG":
self.ui.plainTextEdit_file_path_input_signal.setPlainText( self.ui.plainTextEdit_file_path_input_signal.setPlainText(
str((Path(self.root_path) / str((Path(self.root_path) /
@ -196,13 +189,6 @@ class SettingWindow(QMainWindow):
Path(Filename.RPEAK_FINAL + Path(Filename.RPEAK_FINAL +
str(self.ui.spinBox_input_freq_signal.value()) + str(self.ui.spinBox_input_freq_signal.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_TEXT /
Path(str(self.sampID)) /
Path(Filename.RPEAK_FINAL_CORRECTED +
str(self.ui.spinBox_input_freq_signal.value()) +
Params.ENDSWITH_TXT))))
else: else:
raise ValueError("模式不存在") raise ValueError("模式不存在")
@ -932,8 +918,6 @@ class Data:
Config["Path"]["Input_Peak"] = str(Path(Config["Path"]["Input_Peak"]).parent) Config["Path"]["Input_Peak"] = str(Path(Config["Path"]["Input_Peak"]).parent)
if Path(Config["Path"]["Input_Approximately_Align"]).is_file(): if Path(Config["Path"]["Input_Approximately_Align"]).is_file():
Config["Path"]["Input_Approximately_Align"] = str(Path(Config["Path"]["Input_Approximately_Align"]).parent) Config["Path"]["Input_Approximately_Align"] = str(Path(Config["Path"]["Input_Approximately_Align"]).parent)
if Path(Config["Path"]["Save"]).is_file():
Config["Path"]["Save"] = str(Path(Config["Path"]["Save"]).parent)
result = PublicFunc.examine_file(Config["Path"]["Input_Signal"], signal, Params.ENDSWITH_TXT) result = PublicFunc.examine_file(Config["Path"]["Input_Signal"], signal, Params.ENDSWITH_TXT)
if result.status: if result.status:
@ -949,7 +933,6 @@ class Data:
Filename.APPROXIMATELY_ALIGN_INFO + Params.ENDSWITH_CSV)) Filename.APPROXIMATELY_ALIGN_INFO + Params.ENDSWITH_CSV))
Config["Path"]["Save"] = str( Config["Path"]["Save"] = str(
Path(Config["Path"]["Save"]) / Path(save + str(Config["InputConfig"]["Freq"]) + Params.ENDSWITH_TXT)) Path(Config["Path"]["Save"]) / Path(save + str(Config["InputConfig"]["Freq"]) + Params.ENDSWITH_TXT))
if not Path(Config["Path"]["Input_Peak"]).exists(): if not Path(Config["Path"]["Input_Peak"]).exists():
return Result().failure(info=Constants.INPUT_FAILURE + "\n" + return Result().failure(info=Constants.INPUT_FAILURE + "\n" +
peak + "" + peak + "" +

View File

@ -252,41 +252,6 @@ class SettingWindow(QMainWindow):
Path(Filename.ECG_FILTER + Path(Filename.ECG_FILTER +
str(self.ui.spinBox_input_freq_ECG.value()) + str(self.ui.spinBox_input_freq_ECG.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save_orgBcg.setPlainText(
str((Path(self.root_path) /
Filename.PATH_ORGBCG_ALIGNED /
Path(str(self.sampID)) /
Path(Filename.ORGBCG_SYNC +
str(self.ui.spinBox_input_freq_orgBcg.value()) +
Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save_BCG.setPlainText(
str((Path(self.root_path) /
Filename.PATH_ORGBCG_ALIGNED /
Path(str(self.sampID)) /
Path(Filename.BCG_SYNC +
str(self.ui.spinBox_input_freq_BCG.value()) +
Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save_ECG.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_ALIGNED /
Path(str(self.sampID)) /
Path(Filename.ECG_SYNC +
str(self.ui.spinBox_input_freq_ECG.value()) +
Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save_Jpeak.setPlainText(
str((Path(self.root_path) /
Filename.PATH_ORGBCG_ALIGNED /
Path(str(self.sampID)) /
Path(Filename.JPEAK_SYNC +
str(self.ui.spinBox_input_freq_BCG.value()) +
Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save_Rpeak.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_ALIGNED /
Path(str(self.sampID)) /
Path(Filename.RPEAK_SYNC +
str(self.ui.spinBox_input_freq_ECG.value()) +
Params.ENDSWITH_TXT))))
class MainWindow_precisely_align(QMainWindow): class MainWindow_precisely_align(QMainWindow):

View File

@ -129,13 +129,6 @@ class SettingWindow(QMainWindow):
Path(Filename.ORGBCG_RAW + Path(Filename.ORGBCG_RAW +
str(self.ui.spinBox_input_freq.value()) + str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_ORGBCG_TEXT /
Path(str(self.sampID)) /
Path(Filename.BCG_FILTER +
str(self.ui.spinBox_output_freq.value()) +
Params.ENDSWITH_TXT))))
elif self.mode == "ECG": elif self.mode == "ECG":
self.ui.plainTextEdit_file_path_input.setPlainText( self.ui.plainTextEdit_file_path_input.setPlainText(
str((Path(self.root_path) / str((Path(self.root_path) /
@ -144,13 +137,6 @@ class SettingWindow(QMainWindow):
Path(Filename.ECG_RAW + Path(Filename.ECG_RAW +
str(self.ui.spinBox_input_freq.value()) + str(self.ui.spinBox_input_freq.value()) +
Params.ENDSWITH_TXT)))) Params.ENDSWITH_TXT))))
self.ui.plainTextEdit_file_path_save.setPlainText(
str((Path(self.root_path) /
Filename.PATH_PSG_TEXT /
Path(str(self.sampID)) /
Path(Filename.ECG_FILTER +
str(self.ui.spinBox_output_freq.value()) +
Params.ENDSWITH_TXT))))
else: else:
raise ValueError("模式不存在") raise ValueError("模式不存在")
@ -411,6 +397,7 @@ class Data:
save = Filename.ECG_FILTER save = Filename.ECG_FILTER
else: else:
raise ValueError("模式不存在") raise ValueError("模式不存在")
if Path(Config["Path"]["Input"]).is_file(): if Path(Config["Path"]["Input"]).is_file():
Config["Path"]["Input"] = str(Path(Config["Path"]["Input"]).parent) Config["Path"]["Input"] = str(Path(Config["Path"]["Input"]).parent)

View File

@ -1312,10 +1312,6 @@ class Data():
Config["Path"]["Input_Tho"] = str(Path(Config["Path"]["Input_Tho"]).parent) Config["Path"]["Input_Tho"] = str(Path(Config["Path"]["Input_Tho"]).parent)
if Path(Config["Path"]["Input_Artifact"]).is_file(): if Path(Config["Path"]["Input_Artifact"]).is_file():
Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent) Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent)
if Path(Config["Path"]["Save_Resp_quality_label"]).is_file():
Config["Path"]["Save_Resp_quality_label"] = str(Path(Config["Path"]["Save_Resp_quality_label"]).parent)
if Path(Config["Path"]["Save_Tho_peak"]).is_file():
Config["Path"]["Save_Tho_peak"] = str(Path(Config["Path"]["Save_Tho_peak"]).parent)
result = PublicFunc.examine_file(Config["Path"]["Input_Tho"], Filename.THO_SYNC, Params.ENDSWITH_TXT) result = PublicFunc.examine_file(Config["Path"]["Input_Tho"], Filename.THO_SYNC, Params.ENDSWITH_TXT)
if result.status: if result.status:
@ -1407,10 +1403,6 @@ class Data():
Config["Path"]["Input_Tho"] = str(Path(Config["Path"]["Input_Tho"]).parent) Config["Path"]["Input_Tho"] = str(Path(Config["Path"]["Input_Tho"]).parent)
if Path(Config["Path"]["Input_Artifact"]).is_file(): if Path(Config["Path"]["Input_Artifact"]).is_file():
Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent) Config["Path"]["Input_Artifact"] = str(Path(Config["Path"]["Input_Artifact"]).parent)
if Path(Config["Path"]["Save_Resp_quality_label"]).is_file():
Config["Path"]["Save_Resp_quality_label"] = str(Path(Config["Path"]["Save_Resp_quality_label"]).parent)
if Path(Config["Path"]["Save_Tho_peak"]).is_file():
Config["Path"]["Save_Tho_peak"] = str(Path(Config["Path"]["Save_Tho_peak"]).parent)
result = PublicFunc.examine_file(Config["Path"]["Input_OrgBCG"], Filename.ORGBCG_SYNC, Params.ENDSWITH_TXT) result = PublicFunc.examine_file(Config["Path"]["Input_OrgBCG"], Filename.ORGBCG_SYNC, Params.ENDSWITH_TXT)
if result.status: if result.status:

View File

@ -103,7 +103,7 @@ class Constants:
"Align_Label_SALabel_Format_not_Correct": "映射标签时SA Label中的文件格式不正确", "Align_Label_SALabel_Format_not_Correct": "映射标签时SA Label中的文件格式不正确",
"Filename_Format_not_Correct": "(文件名格式不正确)", "Filename_Format_not_Correct": "(文件名格式不正确)",
"Method_Not_Exist": "(检测方法不存在)", "Method_Not_Exist": "(检测方法不存在)",
"Data_Length_not_Correct": "orgBcg和BCG长度不匹配", "Data_Length_not_Correct": "OrgBCG和BCG长度不匹配",
"Artifact_Format_Not_Correct": "(体动长度或格式不正确)", "Artifact_Format_Not_Correct": "(体动长度或格式不正确)",
"Data_Length_Not_Correct": "(信号长度不正确)", "Data_Length_Not_Correct": "(信号长度不正确)",
"Filter_Args_Not_Correct": "滤波器参数输入不正确上下截止频率都要大于0且上截止频率应大于下截止频率", "Filter_Args_Not_Correct": "滤波器参数输入不正确上下截止频率都要大于0且上截止频率应大于下截止频率",
@ -142,7 +142,7 @@ class Constants:
"Label_Format_Exception": "(获取标签格式异常)", "Label_Format_Exception": "(获取标签格式异常)",
"Calculate_Peak_Exception": "(计算峰值异常)", "Calculate_Peak_Exception": "(计算峰值异常)",
"res_orgBcg_Not_Exist": "(切割后orgBcg不存在)", "res_orgBcg_Not_Exist": "(切割后OrgBCG不存在)",
"res_BCG_Not_Exist": "切割后BCG不存在", "res_BCG_Not_Exist": "切割后BCG不存在",
"cut_ECG_Not_Exist": "切割后ECG不存在", "cut_ECG_Not_Exist": "切割后ECG不存在",
"cut_Jpeak_Not_Exist": "切割后J峰不存在", "cut_Jpeak_Not_Exist": "切割后J峰不存在",
@ -270,9 +270,9 @@ class Constants:
PRECISELY_ALIGN_SAVING_ALIGNINFO_FINISHED: str = "保存对齐信息完成" PRECISELY_ALIGN_SAVING_ALIGNINFO_FINISHED: str = "保存对齐信息完成"
PRECISELY_ALIGN_SAVING_ALIGNINFO_FAILURE: str = "保存对齐信息失败" PRECISELY_ALIGN_SAVING_ALIGNINFO_FAILURE: str = "保存对齐信息失败"
PRECISELY_ALIGN_SAVING_RES_ORGBCG: str = "正在保存切割后orgBcg" PRECISELY_ALIGN_SAVING_RES_ORGBCG: str = "正在保存切割后OrgBCG"
PRECISELY_ALIGN_SAVING_RES_ORGBCG_FINISHED: str = "保存切割后orgBcg完成" PRECISELY_ALIGN_SAVING_RES_ORGBCG_FINISHED: str = "保存切割后OrgBCG完成"
PRECISELY_ALIGN_SAVING_RES_ORGBCG_FAILURE: str = "保存切割后orgBcg失败" PRECISELY_ALIGN_SAVING_RES_ORGBCG_FAILURE: str = "保存切割后OrgBCG失败"
PRECISELY_ALIGN_SAVING_RES_BCG: str = "正在保存切割后BCG" PRECISELY_ALIGN_SAVING_RES_BCG: str = "正在保存切割后BCG"
PRECISELY_ALIGN_SAVING_RES_BCG_FINISHED: str = "保存切割后BCG完成" PRECISELY_ALIGN_SAVING_RES_BCG_FINISHED: str = "保存切割后BCG完成"