Merge branch 'master' into cxh_dev

2025-06-07 15:56:19 +08:00
parent 4c8ce6415a dcf703121c
commit 5306c580fa
7 changed files with 31 additions and 32 deletions
--- a/func/Module_detect_Jpeak.py
+++ b/func/Module_detect_Jpeak.py
@ -215,7 +215,6 @@ class MainWindow_detect_Jpeak(QMainWindow):

    def __reset__(self):
        ButtonState["Current"].update(ButtonState["Default"].copy())
-        ButtonState["Current"]["pushButton_view"] = True

    def __plot__(self):
        # 清空画框
@ -287,7 +286,10 @@ class MainWindow_detect_Jpeak(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
+        ButtonState["Current"]["pushButton_input_setting"] = False
+        ButtonState["Current"]["pushButton_input"] = False
+        ButtonState["Current"]["pushButton_view"] = True
+        ButtonState["Current"]["pushButton_save"] = False
        PublicFunc.finish_operation(self, ButtonState)

    def __slot_btn_view__(self):
--- a/func/Module_detect_Rpeak.py
+++ b/func/Module_detect_Rpeak.py
@ -209,7 +209,6 @@ class MainWindow_detect_Rpeak(QMainWindow):

    def __reset__(self):
        ButtonState["Current"].update(ButtonState["Default"].copy())
-        ButtonState["Current"]["pushButton_view"] = True

    def __plot__(self):
        # 清空画框
@ -284,7 +283,10 @@ class MainWindow_detect_Rpeak(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
+        ButtonState["Current"]["pushButton_input_setting"] = False
+        ButtonState["Current"]["pushButton_input"] = False
+        ButtonState["Current"]["pushButton_view"] = True
+        ButtonState["Current"]["pushButton_save"] = False
        PublicFunc.finish_operation(self, ButtonState)

    def __slot_btn_view__(self):
--- a/func/Module_precisely_align.py
+++ b/func/Module_precisely_align.py
@ -48,32 +48,32 @@ ButtonState = {
        "pushButton_save": False
    },
    "Statue_1": {
-        "pushButton_input_setting": True,
-        "pushButton_input": True,
+        "pushButton_input_setting": False,
+        "pushButton_input": False,
        "pushButton_calculate_correlation": True,
        "pushButton_correlation_align": False,
        "pushButton_view_align": False,
        "pushButton_save": False
    },
    "Statue_2": {
-        "pushButton_input_setting": True,
-        "pushButton_input": True,
+        "pushButton_input_setting": False,
+        "pushButton_input": False,
        "pushButton_calculate_correlation": True,
        "pushButton_correlation_align": True,
        "pushButton_view_align": False,
        "pushButton_save": False
    },
    "Statue_3": {
-        "pushButton_input_setting": True,
-        "pushButton_input": True,
+        "pushButton_input_setting": False,
+        "pushButton_input": False,
        "pushButton_calculate_correlation": False,
        "pushButton_correlation_align": False,
        "pushButton_view_align": True,
        "pushButton_save": False
    },
    "Statue_4": {
-        "pushButton_input_setting": True,
-        "pushButton_input": True,
+        "pushButton_input_setting": False,
+        "pushButton_input": False,
        "pushButton_calculate_correlation": False,
        "pushButton_correlation_align": False,
        "pushButton_view_align": False,
@ -637,9 +637,6 @@ class MainWindow_precisely_align(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(2/4)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
-        PublicFunc.finish_operation(self, ButtonState)
-
        # 处理数据
        PublicFunc.progressbar_update(self, 3, 4, Constants.PRECISELY_ALIGN_PROCESSING_DATA, 50)
        result = self.data.data_process_for_calculate_correlation()
@ -662,7 +659,6 @@ class MainWindow_precisely_align(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(4/4)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
        self.figToolbar.action_Get_Range.setEnabled(True)
        self.rect_down = min(self.ax0.get_ylim()[0], self.ax1.get_ylim()[0]) - 10000
        self.rect_up = max(self.ax0.get_ylim()[1], self.ax1.get_ylim()[1]) + 10000
--- a/func/Module_preprocess.py
+++ b/func/Module_preprocess.py
@ -242,7 +242,6 @@ class MainWindow_preprocess(QMainWindow):

    def __reset__(self):
        ButtonState["Current"].update(ButtonState["Default"].copy())
-        ButtonState["Current"]["pushButton_view"] = True

    def __plot__(self):
        # 清空画框
@ -308,7 +307,10 @@ class MainWindow_preprocess(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
+        ButtonState["Current"]["pushButton_input_setting"] = False
+        ButtonState["Current"]["pushButton_input"] = False
+        ButtonState["Current"]["pushButton_view"] = True
+        ButtonState["Current"]["pushButton_save"] = False
        PublicFunc.finish_operation(self, ButtonState)

    def __slot_btn_view__(self):
--- a/func/Module_resp_quality_label.py
+++ b/func/Module_resp_quality_label.py
@ -36,7 +36,7 @@ ButtonState = {
        "pushButton_input_and_calculate_peaks": True,
        "pushButton_calculate_peaks": False,
        "pushButton_calculate_peaks_save": False,
-        "pushButton_input_data_and_label": True,
+        "pushButton_input_and_label": True,
        "pushButton_autoqualitylabel_recalculate": False,
        "pushButton_refilter_orgBcg": False,
        "pushButton_valid": False,
@ -51,7 +51,7 @@ ButtonState = {
        "pushButton_input_and_calculate_peaks": True,
        "pushButton_calculate_peaks": False,
        "pushButton_calculate_peaks_save": False,
-        "pushButton_input_data_and_label": True,
+        "pushButton_input_and_label": True,
        "pushButton_autoqualitylabel_recalculate": False,
        "pushButton_refilter_orgBcg": False,
        "pushButton_valid": False,
@ -563,12 +563,11 @@ class MainWindow_resp_quality_label(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(3/3)" + result.info, Constants.TIPS_TYPE_INFO)

-        self.__reset__()
-        ButtonState["Current"]["pushButton_input_setting"] = True
-        ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = True
+        ButtonState["Current"]["pushButton_input_setting"] = False
+        ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = False
        ButtonState["Current"]["pushButton_calculate_peaks"] = True
        ButtonState["Current"]["pushButton_calculate_peaks_save"] = True
-        ButtonState["Current"]["pushButton_input_data_and_label"] = True
+        ButtonState["Current"]["pushButton_input_and_label"] = False
        ButtonState["Current"]["pushButton_autoqualitylabel_recalculate"] = False
        ButtonState["Current"]["pushButton_refilter_orgBcg"]: False
        ButtonState["Current"]["pushButton_valid"] = False
@ -611,11 +610,11 @@ class MainWindow_resp_quality_label(QMainWindow):
        else:
            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)

-        ButtonState["Current"]["pushButton_input_setting"] = True
-        ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = True
+        ButtonState["Current"]["pushButton_input_setting"] = False
+        ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = False
        ButtonState["Current"]["pushButton_calculate_peaks"] = True
        ButtonState["Current"]["pushButton_calculate_peaks_save"] = True
-        ButtonState["Current"]["pushButton_input_data_and_label"] = True
+        ButtonState["Current"]["pushButton_input_and_label"] = False
        ButtonState["Current"]["pushButton_autoqualitylabel_recalculate"] = False
        ButtonState["Current"]["pushButton_refilter_orgBcg"]: False
        ButtonState["Current"]["pushButton_valid"] = False
@ -732,12 +731,11 @@ class MainWindow_resp_quality_label(QMainWindow):
        Config["CurrentPartNum"] = 1
        self.update_info()
        self.update_tableWidget()
-        self.__reset__()
        ButtonState["Current"]["pushButton_input_setting"] = False
        ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = False
        ButtonState["Current"]["pushButton_calculate_peaks"] = False
        ButtonState["Current"]["pushButton_calculate_peaks_save"] = False
-        ButtonState["Current"]["pushButton_input_data_and_label"] = False
+        ButtonState["Current"]["pushButton_input_and_label"] = False
        ButtonState["Current"]["pushButton_autoqualitylabel_recalculate"] = True
        ButtonState["Current"]["pushButton_refilter_orgBcg"] = True
        ButtonState["Current"]["pushButton_valid"] = True
--- a/func/utils/Constants.py
+++ b/func/utils/Constants.py
@ -131,7 +131,7 @@ class Constants:
        "Invalid_Side_Parameter": "（无效的方向参数）",
        "Get_Epoch_Exception": "（获取epoch异常）",
        "Get_Corr_By_Epoch_Exception": "（通过epoch获取相关性异常）",
-        "Predict_Exception": "（预测异常）",
+        "Predict_Exception": "（预测异常，请检查模型文件存放是否正确或检测方法是否正确）",
        "Read_Model_Exception": "（读取模型异常）",
        "Calculate_Correlation_Value_Equal": "（计算相关性参数相同）",
        "Get_Corresponding_Interval_Exception": "（获取对应区间异常）",
--- a/run.py
+++ b/run.py
@ -37,9 +37,8 @@ if __name__ == '__main__':
    # 解决 Error #15: Initializing libiomp5md.dll
    environ["KMP_DUPLICATE_LIB_OK"] = "TRUE"

-
+    QApplication.setHighDpiScaleFactorRoundingPolicy(Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
    app = QApplication(argv)
-    app.setHighDpiScaleFactorRoundingPolicy(Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
    app.styleHints().setColorScheme(Qt.ColorScheme.Light)   # 强制使用浅色模式
    mainWindow = MainWindow()
    mainWindow.show()