From 6f6b415bffd6193ae55810bf773e0be78e941958 Mon Sep 17 00:00:00 2001 From: KenanZhu <3471685733@qq.com> Date: Sat, 17 Jan 2026 22:32:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ALMainWindow,=20ALMainWorkers):=20?= =?UTF-8?q?=E9=87=8D=E6=9E=84=20Qt=20=E4=BF=A1=E5=8F=B7=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/ALConfigWidget.py | 4 ++-- src/gui/ALMainWindow.py | 16 ++++++++-------- src/gui/ALMainWorkers.py | 22 +++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/gui/ALConfigWidget.py b/src/gui/ALConfigWidget.py index c2e7785..2ca1cd2 100644 --- a/src/gui/ALConfigWidget.py +++ b/src/gui/ALConfigWidget.py @@ -33,7 +33,7 @@ from utils.ConfigWriter import ConfigWriter class ALConfigWidget(QWidget, Ui_ALConfigWidget): - configWidgetCloseSingal = Signal(dict) + configWidgetIsClosed = Signal(dict) def __init__( self, @@ -126,7 +126,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget): event: QCloseEvent ): - self.configWidgetCloseSingal.emit(self.__config_paths) + self.configWidgetIsClosed.emit(self.__config_paths) super().closeEvent(event) diff --git a/src/gui/ALMainWindow.py b/src/gui/ALMainWindow.py index d07e2fe..67ab8b9 100644 --- a/src/gui/ALMainWindow.py +++ b/src/gui/ALMainWindow.py @@ -241,7 +241,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): self.__output_queue, self.__config_paths ) - self.__current_timer_task_thread.finishedSignal_TimerWorker.connect(self.onTimerTaskFinished) + self.__current_timer_task_thread.TimerTaskWorkerIsFinished.connect(self.onTimerTaskFinished) self.__current_timer_task_thread.start() except queue.Empty: self.__is_running_timer_task = False @@ -306,7 +306,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): ): if self.__alConfigWidget: - self.__alConfigWidget.configWidgetCloseSingal.disconnect(self.onConfigWidgetClosed) + self.__alConfigWidget.configWidgetIsClosed.disconnect(self.onConfigWidgetClosed) self.__alConfigWidget.deleteLater() self.__alConfigWidget = None self.setControlButtons(True, None, None) @@ -328,7 +328,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): ): self.__current_timer_task_thread.wait(1000) - self.__current_timer_task_thread.finishedSignal_TimerWorker.disconnect(self.onTimerTaskFinished) + self.__current_timer_task_thread.TimerTaskWorkerIsFinished.disconnect(self.onTimerTaskFinished) self.__current_timer_task_thread.deleteLater() self.__current_timer_task_thread = None self.setControlButtons(None, False, True) @@ -369,7 +369,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): self, self.__config_paths ) - self.__alConfigWidget.configWidgetCloseSingal.connect(self.onConfigWidgetClosed) + self.__alConfigWidget.configWidgetIsClosed.connect(self.onConfigWidgetClosed) self.__alConfigWidget.show() self.__alConfigWidget.raise_() self.__alConfigWidget.activateWindow() @@ -387,8 +387,8 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): self.__output_queue, self.__config_paths ) - self.__auto_lib_thread.finishedSignal.connect(self.onStopButtonClicked) - self.__auto_lib_thread.finishedWithErrorSignal.connect(self.onStopButtonClicked) + self.__auto_lib_thread.AutoLibWorkerIsFinished.connect(self.onStopButtonClicked) + self.__auto_lib_thread.AutoLibWorkerFinishedWithError.connect(self.onStopButtonClicked) self.__auto_lib_thread.start() @Slot() @@ -400,8 +400,8 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow): self.showTrace("正在停止操作......") self.__auto_lib_thread.wait(2000) self.showTrace("操作已停止") - self.__auto_lib_thread.finishedSignal.disconnect(self.onStopButtonClicked) - self.__auto_lib_thread.finishedWithErrorSignal.disconnect(self.onStopButtonClicked) + self.__auto_lib_thread.AutoLibWorkerIsFinished.disconnect(self.onStopButtonClicked) + self.__auto_lib_thread.AutoLibWorkerFinishedWithError.disconnect(self.onStopButtonClicked) self.__auto_lib_thread.deleteLater() self.__auto_lib_thread = None self.setControlButtons(None, False, True) diff --git a/src/gui/ALMainWorkers.py b/src/gui/ALMainWorkers.py index 19faad0..6f53c72 100644 --- a/src/gui/ALMainWorkers.py +++ b/src/gui/ALMainWorkers.py @@ -22,8 +22,8 @@ from utils.ConfigReader import ConfigReader class AutoLibWorker(QThread, MsgBase): - finishedSignal = Signal() - finishedWithErrorSignal = Signal() + AutoLibWorkerIsFinished = Signal() + AutoLibWorkerFinishedWithError = Signal() def __init__( self, @@ -116,17 +116,17 @@ class AutoLibWorker(QThread, MsgBase): ) except Exception as e: self._showTrace(f"AutoLibrary 运行时发生异常 : {e}") - self.finishedWithErrorSignal.emit() + self.AutoLibWorkerFinishedWithError.emit() return if auto_lib: auto_lib.close() self._showTrace("AutoLibrary 运行结束") - self.finishedSignal.emit() + self.AutoLibWorkerIsFinished.emit() class TimerTaskWorker(AutoLibWorker): - finishedSignal_TimerWorker = Signal(bool, dict) + TimerTaskWorkerIsFinished = Signal(bool, dict) def __init__( self, @@ -139,8 +139,8 @@ class TimerTaskWorker(AutoLibWorker): super().__init__(input_queue, output_queue, config_paths) self.__timer_task = timer_task - self.finishedSignal.connect(self.onTimerTaskIsFinished) - self.finishedWithErrorSignal.connect(self.onTimerTaskIsError) + self.AutoLibWorkerIsFinished.connect(self.onTimerTaskIsFinished) + self.AutoLibWorkerFinishedWithError.connect(self.onTimerTaskIsError) def run( self @@ -149,18 +149,18 @@ class TimerTaskWorker(AutoLibWorker): self._showTrace(f"定时任务 {self.__timer_task['name']} 开始运行") super().run() - @Slot(dict) + @Slot() def onTimerTaskIsError( self ): self._showTrace(f"定时任务 {self.__timer_task['name']} 运行时发生异常") - self.finishedSignal_TimerWorker.emit(True, self.__timer_task) + self.TimerTaskWorkerIsFinished.emit(True, self.__timer_task) - @Slot(dict) + @Slot() def onTimerTaskIsFinished( self ): self._showTrace(f"定时任务 {self.__timer_task['name']} 运行结束") - self.finishedSignal_TimerWorker.emit(False, self.__timer_task) + self.TimerTaskWorkerIsFinished.emit(False, self.__timer_task)