Merge branch 'feature/main_ui' of http://www.xj-robot.com:3000/xiongyi/Feeding_control_system into feature/main_ui
This commit is contained in:
@ -1,15 +1,13 @@
|
||||
from PySide6.QtCore import QTimer, Signal, QObject, Qt
|
||||
from PySide6.QtWidgets import QApplication # 用于获取主线程
|
||||
import threading
|
||||
from hardware import transmitter
|
||||
from view.main_window import MainWindow
|
||||
from .camera_controller import CameraController
|
||||
from .bottom_control_controller import BottomControlController
|
||||
from .hopper_controller import HopperController
|
||||
from .hopper_controller import UpperHopperPosition
|
||||
|
||||
from service.msg_recorder import MessageRecorder
|
||||
from common.constant_config_manager import ConfigManager
|
||||
from service.msg_recorder import MessageRecorder
|
||||
|
||||
from service.opcua_ui_client import OpcuaUiClient
|
||||
from service.artifact_query_thread import ArtifactInfoQueryThread # 管片任务查询
|
||||
@ -24,7 +22,7 @@ class MainController:
|
||||
|
||||
self.msg_recorder = MessageRecorder()
|
||||
self.msg_recorder.normal_record("开始自动智能浇筑系统") # 记录系统状态消息
|
||||
|
||||
|
||||
# 初始化子界面和控制器
|
||||
self._initSubViews()
|
||||
self._initSubControllers()
|
||||
@ -72,7 +70,8 @@ class MainController:
|
||||
|
||||
def _initSubViews(self):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
|
||||
def __connectSignals(self):
|
||||
self.main_window.about_to_close.connect(self.handleMainWindowClose) # 处理主界面关闭
|
||||
@ -84,11 +83,11 @@ class MainController:
|
||||
|
||||
def handleMainWindowClose(self):
|
||||
"""主界面关闭"""
|
||||
self.msg_recorder.normal_record("关闭自动智能浇筑系统") # 记录系统状态消息
|
||||
|
||||
self.msg_recorder.normal_record("关闭自动智能浇筑系统")
|
||||
|
||||
# 停止系统底部控制器中的线程
|
||||
if hasattr(self, 'bottom_control_controller'):
|
||||
self.bottom_control_controller.stop_threads()
|
||||
self.bottom_control_controller.stop_threads()
|
||||
# 停止opc客户端
|
||||
if hasattr(self, 'opc_client'):
|
||||
self._stop_opc_client()
|
||||
|
||||
Reference in New Issue
Block a user