diff --git a/func/Module_approximately_align.py b/func/Module_approximately_align.py
index 7ba7a4b..bcc223e 100644
--- a/func/Module_approximately_align.py
+++ b/func/Module_approximately_align.py
@@ -931,11 +931,14 @@ class Data:
def Standardize_2(self):
# 预重采样
try:
+
# 修改Config
if Config["InputConfig"]["ThoFreq"] < Config["InputConfig"]["AbdFreq"]:
Config.update({"TempFrequency": Config["InputConfig"]["ThoFreq"]})
+ self.processed_Abd = self.processed_Abd[::int(Config["InputConfig"]["orgBcgFreq"] / Config["TempFrequency"])]
else:
Config.update({"TempFrequency": Config["InputConfig"]["AbdFreq"]})
+ self.processed_Tho = self.processed_Tho[::int(Config["InputConfig"]["orgBcgFreq"] / Config["TempFrequency"])]
# 如果orgBcg采样率大于PSG采样率,那么orgBcg重采样到PSG采样率
if Config["InputConfig"]["orgBcgFreq"] > Config["TempFrequency"]:
# 用[::]完成
@@ -945,6 +948,17 @@ class Data:
# 用repeat完成
self.processed_orgBcg = repeat(self.processed_orgBcg, int(Config["TempFrequency"] / Config["InputConfig"]["orgBcgFreq"]), axis=0)
+ # 如果orgBcg采样率大于PSG采样率,那么orgBcg重采样到PSG采样率
+ if Config["InputConfig"]["orgBcgFreq"] > Config["TempFrequency"]:
+ # 用[::]完成
+ self.processed_orgBcg = self.processed_orgBcg[::int(Config["InputConfig"]["orgBcgFreq"] / Config["TempFrequency"])]
+ # 如果orgBcg采样率小于PSG采样率,那么orgBcg重采样到PSG采样率
+ elif Config["InputConfig"]["orgBcgFreq"] < Config["TempFrequency"]:
+ # 用repeat完成
+ self.processed_orgBcg = repeat(self.processed_orgBcg, int(Config["TempFrequency"] / Config["InputConfig"]["orgBcgFreq"]), axis=0)
+
+
+
except Exception:
return Result().failure(info=Constants.APPROXIMATELY_PRE_ALIGN_RESAMPLE_FAILURE + Constants.APPROXIMATELY_ALIGN_FAILURE_REASON["Pre_Resample_Exception"])
diff --git a/ui/setting/approximately_align_input_setting.py b/ui/setting/approximately_align_input_setting.py
index bde3cfd..64936ea 100644
--- a/ui/setting/approximately_align_input_setting.py
+++ b/ui/setting/approximately_align_input_setting.py
@@ -219,7 +219,7 @@ class Ui_MainWindow_approximately_align_input_setting(object):
self.spinBox_display_freq = QSpinBox(self.groupBox_6)
self.spinBox_display_freq.setObjectName(u"spinBox_display_freq")
self.spinBox_display_freq.setFont(font)
- self.spinBox_display_freq.setMinimum(1)
+ self.spinBox_display_freq.setMinimum(5)
self.spinBox_display_freq.setMaximum(1000)
self.horizontalLayout_5.addWidget(self.spinBox_display_freq)
diff --git a/ui/setting/approximately_align_input_setting.ui b/ui/setting/approximately_align_input_setting.ui
index 12f0e27..176a859 100644
--- a/ui/setting/approximately_align_input_setting.ui
+++ b/ui/setting/approximately_align_input_setting.ui
@@ -349,7 +349,7 @@
- 1
+ 5
1000