Merge branch 'master' into cxh_dev

func/Module_precisely_align.py

@@ -666,6 +666,46 @@ class MainWindow_precisely_align(QMainWindow):
             action.setEnabled(True)
         ButtonState["Current"].update(ButtonState["Statue_1"].copy())
         PublicFunc.finish_operation(self, ButtonState)
+        self.ui.pushButton_input.clicked.disconnect()
+        self.ui.pushButton_input.clicked.connect(self.__slot_btn_repick__)
+        self.ui.pushButton_input.setText("重新选取")
+
+    def __slot_btn_repick__(self):
+        PublicFunc.__disableAllButton__(self, ButtonState)
+
+        # 清空画框
+        self.reset_axes()
+        self.canvas.draw()
+
+        # 处理数据
+        PublicFunc.progressbar_update(self, 1, 2, Constants.PRECISELY_ALIGN_PROCESSING_DATA, 50)
+        result = self.data.data_process_for_calculate_correlation()
+        if not result.status:
+            PublicFunc.text_output(self.ui, "(1/2)" + result.info, Constants.TIPS_TYPE_ERROR)
+            PublicFunc.msgbox_output(self, result.info, Constants.MSGBOX_TYPE_ERROR)
+            PublicFunc.finish_operation(self, ButtonState)
+            return
+        else:
+            PublicFunc.text_output(self.ui, "(1/2)" + result.info, Constants.TIPS_TYPE_INFO)
+
+        # 绘图
+        PublicFunc.progressbar_update(self, 2, 2, Constants.DRAWING_DATA, 70)
+        result = self.__plot__(result.data)
+        if not result.status:
+            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_ERROR)
+            PublicFunc.msgbox_output(self, result.info, Constants.MSGBOX_TYPE_ERROR)
+            PublicFunc.finish_operation(self, ButtonState)
+            return
+        else:
+            PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)
+
+        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
+        for action in self.figToolbar._actions.values():
+            action.setEnabled(True)
+        ButtonState["Current"].update(ButtonState["Statue_1"].copy())
+        PublicFunc.finish_operation(self, ButtonState)
 
     def __slot_btn_calculate_correlation__(self, test1=None, shift_front=None, shift_back=None):
         # TODO：这里有个未知的BUG，虽然不影响功能，但会影响代码整洁性，第一个形参赋值为None时，之后使用变量时将会变成False，不知道为什么