diff --git a/func/Module_detect_Jpeak.py b/func/Module_detect_Jpeak.py index 080295c..ac636e2 100644 --- 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,9 @@ 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 PublicFunc.finish_operation(self, ButtonState) def __slot_btn_view__(self): diff --git a/func/Module_detect_Rpeak.py b/func/Module_detect_Rpeak.py index 251f55a..12be226 100644 --- 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,9 @@ 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 PublicFunc.finish_operation(self, ButtonState) def __slot_btn_view__(self): diff --git a/func/Module_precisely_align.py b/func/Module_precisely_align.py index 527062f..6b901e1 100644 --- 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, @@ -618,9 +618,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() @@ -643,7 +640,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 diff --git a/func/Module_preprocess.py b/func/Module_preprocess.py index 045a775..f9deb76 100644 --- a/func/Module_preprocess.py +++ b/func/Module_preprocess.py @@ -242,7 +242,7 @@ class MainWindow_preprocess(QMainWindow): def __reset__(self): ButtonState["Current"].update(ButtonState["Default"].copy()) - ButtonState["Current"]["pushButton_view"] = True + def __plot__(self): # 清空画框 @@ -308,7 +308,9 @@ 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 PublicFunc.finish_operation(self, ButtonState) def __slot_btn_view__(self): diff --git a/func/Module_resp_quality_label.py b/func/Module_resp_quality_label.py index 362118a..f96b22b 100644 --- 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