Browse Source

添加对定时器进行关闭操作

yun 1 week ago
parent
commit
03b2286302

+ 1 - 1
View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.cpp

@@ -104,7 +104,7 @@ ChartsAndCamerasWnd::~ChartsAndCamerasWnd()
 {
     m_pMainCameraBind = nullptr;
     UnCameraBind();
-
+    m_timerMaterial->stop();
     delete ui;
 }
 

+ 1 - 0
View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -37,6 +37,7 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget* parent)
 MainAndSecondaryCamerasWnd::~MainAndSecondaryCamerasWnd()
 {
     UnCameraBind();
+    m_timerMaterial->stop();
     delete ui;
 }
 

+ 4 - 0
View/die-bonder-ui/OriginalWnd/OriginalWnd.cpp

@@ -327,6 +327,10 @@ void OriginalWnd::SwitchMainPage(JOriginalMainWnd* pWnd, QToolButton* tooBut)
 
 void OriginalWnd::CreateSwitchMainPage(int nlastIndex /*= -1*/)
 {
+    ui->switchShowPageUI->removeWidget(m_pJOriginalMainWnd);
+    m_pJOriginalMainWnd->deleteLater();
+    m_pJOriginalMainWnd = nullptr;
+
     QSettings settings("OrganizationName__", "ApplicationName__");
     if (nlastIndex <= 0)
     {

+ 1 - 1
View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.cpp

@@ -27,7 +27,7 @@ SingleCameraOperationWnd::SingleCameraOperationWnd(QWidget* parent)
 SingleCameraOperationWnd::~SingleCameraOperationWnd()
 {
     UnCameraBind();
-
+    m_timerMaterial->stop();
     delete ui;
 }