修复了导入设置窗口活动的情况下,关闭模块窗口或点击了开始导入后,导入设置未同时关闭的问题

This commit is contained in:
Yorusora
2025-06-11 08:37:24 +08:00
parent 07223f222b
commit 3c60f769ca
10 changed files with 22 additions and 1 deletions

View File

@ -480,6 +480,7 @@ class MainWindow_SA_label(QMainWindow):
self.ax6.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -790,6 +791,7 @@ class MainWindow_SA_label(QMainWindow):
PublicFunc.msgbox_output(self, Constants.SA_LABEL_ALL_LABELED, Constants.MSGBOX_TYPE_INFO)
self.__reset__()
self.setting.close()
self.figToolbar.action_Reset_Signal_and_Time.setEnabled(True)
for action in self.figToolbar._actions.values():
action.setEnabled(True)

View File

@ -3,6 +3,7 @@ from pathlib import Path
from traceback import format_exc
import matplotlib.pyplot as plt
from PySide6.QtCore import QEvent
from PySide6.QtWidgets import QMessageBox, QMainWindow, QApplication
from matplotlib.backends.backend_qt import NavigationToolbar2QT
from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
@ -298,7 +299,6 @@ class MainWindow_approximately_align(QMainWindow):
self.ui.radioButton_freqTHO.clicked.connect(self.__EstimateFrequencySelect__)
self.ui.radioButton_freqABD.clicked.connect(self.__EstimateFrequencySelect__)
@overrides
def closeEvent(self, event):
reply = QMessageBox.question(self, '确认', '确认退出吗?', QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
@ -309,6 +309,7 @@ class MainWindow_approximately_align(QMainWindow):
QApplication.processEvents()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -421,6 +422,7 @@ class MainWindow_approximately_align(QMainWindow):
self.ui.label_orgBcg_length.setText(str(orgBcg_seconds))
self.ui.label_PSG_length.setText(str(PSG_seconds))
self.__reset__()
self.setting.close()
PublicFunc.finish_operation(self, ButtonState)
def __slot_btn_save__(self):

View File

@ -337,6 +337,7 @@ class MainWindow_artifact_label(QMainWindow):
self.ax1.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -670,6 +671,7 @@ class MainWindow_artifact_label(QMainWindow):
PublicFunc.text_output(self.ui, "(6/6)" + result.info, Constants.TIPS_TYPE_INFO)
self.__reset__()
self.setting.close()
self.figToolbar.action_Label_Artifact.setEnabled(True)
for action in self.figToolbar._actions.values():
action.setEnabled(True)

View File

@ -292,6 +292,7 @@ class MainWindow_bcg_quality_label(QMainWindow):
self.ax0.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -481,6 +482,7 @@ class MainWindow_bcg_quality_label(QMainWindow):
self.update_tableWidget()
self.update_status()
self.change_labelBtn_color()
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input"] = False
ButtonState["Current"]["pushButton_invalid_signal_label"] = True

View File

@ -222,6 +222,7 @@ class MainWindow_detect_Jpeak(QMainWindow):
self.ax0.clear()
# 释放资源
self.setting.close()
del self.data
del self.model
self.fig.clf()
@ -306,6 +307,7 @@ class MainWindow_detect_Jpeak(QMainWindow):
else:
PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input"] = False
ButtonState["Current"]["pushButton_view"] = True

View File

@ -218,6 +218,7 @@ class MainWindow_detect_Rpeak(QMainWindow):
self.ax1.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -304,6 +305,7 @@ class MainWindow_detect_Rpeak(QMainWindow):
else:
PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input"] = False
ButtonState["Current"]["pushButton_view"] = True

View File

@ -359,6 +359,7 @@ class MainWindow_label_check(QMainWindow):
self.ax1.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -556,6 +557,7 @@ class MainWindow_label_check(QMainWindow):
PublicFunc.text_output(self.ui, "(7/7)" + result.info, Constants.TIPS_TYPE_INFO)
self.__reset__()
self.setting.close()
self.canvas.mpl_connect("motion_notify_event", self.on_motion)
self.figToolbar.action_Label_Multiple.setEnabled(True)
for action in self.figToolbar._actions.values():

View File

@ -437,6 +437,7 @@ class MainWindow_precisely_align(QMainWindow):
self.ax4.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -701,6 +702,7 @@ class MainWindow_precisely_align(QMainWindow):
else:
PublicFunc.text_output(self.ui, "(4/4)" + result.info, Constants.TIPS_TYPE_INFO)
self.setting.close()
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

View File

@ -257,6 +257,7 @@ class MainWindow_preprocess(QMainWindow):
self.ax0.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -334,6 +335,7 @@ class MainWindow_preprocess(QMainWindow):
else:
PublicFunc.text_output(self.ui, "(2/2)" + result.info, Constants.TIPS_TYPE_INFO)
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input"] = False
ButtonState["Current"]["pushButton_view"] = True

View File

@ -351,6 +351,7 @@ class MainWindow_resp_quality_label(QMainWindow):
self.ax1_spectrum.clear()
# 释放资源
self.setting.close()
del self.data
self.fig.clf()
plt.close(self.fig)
@ -591,6 +592,7 @@ class MainWindow_resp_quality_label(QMainWindow):
else:
PublicFunc.text_output(self.ui, "(3/3)" + result.info, Constants.TIPS_TYPE_INFO)
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = False
ButtonState["Current"]["pushButton_calculate_peaks"] = True
@ -759,6 +761,7 @@ class MainWindow_resp_quality_label(QMainWindow):
Config["CurrentPartNum"] = 1
self.update_info()
self.update_tableWidget()
self.setting.close()
ButtonState["Current"]["pushButton_input_setting"] = False
ButtonState["Current"]["pushButton_input_and_calculate_peaks"] = False
ButtonState["Current"]["pushButton_calculate_peaks"] = False