From e23f3e8ee054766855425843717150083c0a2c1a Mon Sep 17 00:00:00 2001 From: Yorusora Date: Thu, 29 May 2025 22:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80<=E4=BA=BA=E5=B7=A5=E7=BA=A0?= =?UTF-8?q?=E6=AD=A3>=E6=97=B6=E5=B0=B1=E4=BF=9D=E5=AD=98=E7=BA=A0?= =?UTF-8?q?=E6=AD=A3=E5=90=8E=E7=9A=84=E6=96=87=E4=BB=B6=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- func/Module_label_check.py | 47 +++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/func/Module_label_check.py b/func/Module_label_check.py index 55b1a43..e28b0b1 100644 --- a/func/Module_label_check.py +++ b/func/Module_label_check.py @@ -464,70 +464,81 @@ class MainWindow_label_check(QMainWindow): self.data = Data() # 导入数据 - PublicFunc.progressbar_update(self, 1, 6, Constants.INPUTTING_DATA, 0) + PublicFunc.progressbar_update(self, 1, 7, Constants.INPUTTING_DATA, 0) result = self.data.open_file() if not result.status: - PublicFunc.text_output(self.ui, "(1/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(1/7)" + 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/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(1/7)" + result.info, Constants.TIPS_TYPE_INFO) # 获取存档 - PublicFunc.progressbar_update(self, 2, 6, Constants.LOADING_ARCHIVE, 20) + PublicFunc.progressbar_update(self, 2, 7, Constants.LOADING_ARCHIVE, 20) result = self.data.get_archive() if not result.status: - PublicFunc.text_output(self.ui, "(2/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(2/7)" + 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/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(2/7)" + result.info, Constants.TIPS_TYPE_INFO) + + # 保存 + PublicFunc.progressbar_update(self, 3, 7, Constants.SAVING_DATA, 25) + result = self.data.save() + if not result.status: + PublicFunc.text_output(self.ui, "(3/7)" + 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, "(3/7)" + result.info, Constants.TIPS_TYPE_INFO) # 数据预处理 - PublicFunc.progressbar_update(self, 3, 6, Constants.PREPROCESSING_DATA, 30) + PublicFunc.progressbar_update(self, 4, 7, Constants.PREPROCESSING_DATA, 30) result = self.data.preprocess() if not result.status: - PublicFunc.text_output(self.ui, "(3/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(4/7)" + 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, "(3/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(4/7)" + result.info, Constants.TIPS_TYPE_INFO) # 更新表格 - PublicFunc.progressbar_update(self, 4, 6, Constants.UPDATING_TABLEWIDGET_AND_INFO, 50) + PublicFunc.progressbar_update(self, 5, 7, Constants.UPDATING_TABLEWIDGET_AND_INFO, 50) result = self.__update_tableWidget_and_info__() if not result.status: - PublicFunc.text_output(self.ui, "(4/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(5/7)" + 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, "(4/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(5/7)" + result.info, Constants.TIPS_TYPE_INFO) # 绘图 - PublicFunc.progressbar_update(self, 5, 6, Constants.DRAWING_DATA, 60) + PublicFunc.progressbar_update(self, 6, 7, Constants.DRAWING_DATA, 60) result = self.__plot__() if not result.status: - PublicFunc.text_output(self.ui, "(5/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(6/7)" + 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, "(5/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(6/7)" + result.info, Constants.TIPS_TYPE_INFO) # 绘点 - PublicFunc.progressbar_update(self, 6, 6, Constants.DRAWING_DATA, 80) + PublicFunc.progressbar_update(self, 7, 7, Constants.DRAWING_DATA, 80) result = self.__plot_peaks__() if not result.status: - PublicFunc.text_output(self.ui, "(6/6)" + result.info, Constants.TIPS_TYPE_ERROR) + PublicFunc.text_output(self.ui, "(7/7)" + 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, "(6/6)" + result.info, Constants.TIPS_TYPE_INFO) + PublicFunc.text_output(self.ui, "(7/7)" + result.info, Constants.TIPS_TYPE_INFO) self.__reset__() self.canvas.mpl_connect("motion_notify_event", self.on_motion)