Merge branch 'master' into cxh_dev

This commit is contained in:
marques
2025-06-07 15:56:19 +08:00
7 changed files with 31 additions and 32 deletions

View File

@ -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