恢复之前的版本废弃掉单例类模式

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

@@ -242,14 +242,7 @@ void ChartsAndCamerasWnd::on_CheckBox_clicked()
     }
 }
 #endif
-// 初始化静态成员
-ChartsAndCamerasWnd* ChartsAndCamerasWnd::m_instance = nullptr;
-ChartsAndCamerasWnd* ChartsAndCamerasWnd::GetInstance() {
-    if (!m_instance) {
-        m_instance = new ChartsAndCamerasWnd();
-    }
-    return m_instance;
-}
+
 void ChartsAndCamerasWnd::initFrom() 
 {
     m_allGroup.clear();
@@ -598,7 +591,7 @@ void ChartsAndCamerasWnd::initWidget() {
         BindImageOrMaterial(m_nMaterialIndex);
 
     }
-    m_timerMaterial->start(10000);
+    //m_timerMaterial->start(10000);
 }
 
 void ChartsAndCamerasWnd::saveInfoOfLast() {

View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.h

@@ -26,8 +26,6 @@ public:
     explicit ChartsAndCamerasWnd(QWidget* parent = nullptr);
     ~ChartsAndCamerasWnd();
 
-    // 获取唯一实例的静态方法
-    static ChartsAndCamerasWnd* GetInstance();
 
     void initFrom();
     void updateMaterialWidget(int materialWndType, int groupId);
@@ -162,7 +160,6 @@ private:
     const int                       m_nMaterialIndex = 2;
     QTimer* m_timerMaterial;
     ns_module::CViewInterface* m_pCViewInterface;
-    static ChartsAndCamerasWnd* m_instance; // 声明静态实例指针
 
 };
 

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -203,14 +203,6 @@ void MainAndSecondaryCamerasWnd::InitPage()
         //}
     }
 }
-// 初始化静态成员
-MainAndSecondaryCamerasWnd* MainAndSecondaryCamerasWnd::m_instance = nullptr;
-MainAndSecondaryCamerasWnd* MainAndSecondaryCamerasWnd::GetInstance() {
-    if (!m_instance) {
-        m_instance = new MainAndSecondaryCamerasWnd();
-    }
-    return m_instance;
-}
 
 void MainAndSecondaryCamerasWnd::CameraConnectUpdateImageFun(int nIndex, Group* widget, bool isUnCameraBind /*= false*/)
 {
@@ -301,12 +293,15 @@ void MainAndSecondaryCamerasWnd::initLeftAndRightWidget() {
                 ui->viewwidgetgroup_R->setEnableControls(true);
                 BindImageOrMaterial(m_nLastLeft, m_nMaterialIndex);
                 ui->viewwidgetgroup_L->setEnableControls(false);
+
             }
             else {
                 BindImageOrMaterial(m_nCurrentRight, m_nMaterialIndex);
                 ui->viewwidgetgroup_R->setEnableControls(false);
                 BindImageOrMaterial(m_nLastLeft, m_nImageIndex);
                 ui->viewwidgetgroup_L->setEnableControls(true);
+                QPixmap pixmap_L = ui->viewwidgetgroup_L->getCurrentComboBoxPixmap(currentLeftComboBoxIndex);
+                GetGroupImageShowSignalsTo_L(pixmap_L);
                 
             }
 
@@ -357,7 +352,7 @@ void MainAndSecondaryCamerasWnd::initLeftAndRightWidget() {
 
         }
     }
-    m_timerMaterial->start(10000);
+    m_timerMaterial->start(1000);
 }
 
 void MainAndSecondaryCamerasWnd::BindImageOrMaterial(int location, int index) 

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -22,8 +22,7 @@ public:
     explicit MainAndSecondaryCamerasWnd(QWidget *parent = nullptr);
 
     ~MainAndSecondaryCamerasWnd();
-    // 获取唯一实例的静态方法
-    static MainAndSecondaryCamerasWnd* GetInstance();
+
     void initFrom();
 
     void InitPage();
@@ -183,7 +182,6 @@ private:
     const int           m_nMaterialIndex = 2;
     QTimer*             m_timerMaterial;
     ns_module::CViewInterface* m_pCViewInterface;
-    static MainAndSecondaryCamerasWnd* m_instance; // 声明静态实例指针
 
 };
 

View/die-bonder-ui/OriginalWnd/OriginalWnd.cpp

@@ -324,39 +324,34 @@ void OriginalWnd::CreateSwitchMainPage(int nlastIndex /*= -1*/)
     }
 
     // 切换窗口
-    ChartsAndCamerasWnd* chartsAndCamerasWnd;
-    chartsAndCamerasWnd = ChartsAndCamerasWnd::GetInstance();
-    MainAndSecondaryCamerasWnd* mainAndSecondaryCamerasWnd;
-    mainAndSecondaryCamerasWnd = MainAndSecondaryCamerasWnd::GetInstance();
-    SingleCameraOperationWnd* singleCameraOperationWnd;
-    singleCameraOperationWnd = SingleCameraOperationWnd::GetInstance();
+     
     switch (nlastIndex)
     {
     case EN_WND_SWITCH::ChartsAnd:
     {
-
+        ChartsAndCamerasWnd* chartsAndCamerasWnd = new ChartsAndCamerasWnd;
         SwitchMainPage(chartsAndCamerasWnd, ui->ChartButton);
-        chartsAndCamerasWnd->TimerMaterialStart();
-        mainAndSecondaryCamerasWnd->TimerMaterialStop();
-        singleCameraOperationWnd->TimerMaterialStop();
+        //chartsAndCamerasWnd->TimerMaterialStart();
+        //mainAndSecondaryCamerasWnd->TimerMaterialStop();
+        //singleCameraOperationWnd->TimerMaterialStop();
     }
     break;
     case EN_WND_SWITCH::MainAndSecondary:
     {
-
+        MainAndSecondaryCamerasWnd* mainAndSecondaryCamerasWnd = new MainAndSecondaryCamerasWnd;
         SwitchMainPage(mainAndSecondaryCamerasWnd, ui->DoubleImageButton);
-        mainAndSecondaryCamerasWnd->TimerMaterialStart();
-        chartsAndCamerasWnd->TimerMaterialStop();
-        singleCameraOperationWnd->TimerMaterialStop();
+        //mainAndSecondaryCamerasWnd->TimerMaterialStart();
+        //chartsAndCamerasWnd->TimerMaterialStop();
+        //singleCameraOperationWnd->TimerMaterialStop();
     }
     break;
     case EN_WND_SWITCH::SingleCameraOperation:
     {
-
+        SingleCameraOperationWnd* singleCameraOperationWnd = new SingleCameraOperationWnd;
         SwitchMainPage(singleCameraOperationWnd, ui->SingleImageButton);
-        singleCameraOperationWnd->TimerMaterialStart();
-        chartsAndCamerasWnd->TimerMaterialStop();
-        mainAndSecondaryCamerasWnd->TimerMaterialStop();
+        //singleCameraOperationWnd->TimerMaterialStart();
+        //chartsAndCamerasWnd->TimerMaterialStop();
+        //mainAndSecondaryCamerasWnd->TimerMaterialStop();
     }
     break;
     default:

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

@@ -150,14 +150,6 @@ void SingleCameraOperationWnd::initFrom()
 
     }
 }
-// 初始化静态成员
-SingleCameraOperationWnd* SingleCameraOperationWnd::m_instance = nullptr;
-SingleCameraOperationWnd* SingleCameraOperationWnd::GetInstance() {
-    if (!m_instance) {
-        m_instance = new SingleCameraOperationWnd();
-    }
-    return m_instance;
-}
 
 void SingleCameraOperationWnd::closeEvent(QCloseEvent* event) {
     // 保存滑块状态
@@ -440,7 +432,7 @@ void SingleCameraOperationWnd::initWidget() {
         BindImageOrMaterial(m_nMaterialIndex);
 
     }
-    m_timerMaterial->start(10000);
+    //m_timerMaterial->start(10000);
 
 }
 

View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.h

@@ -26,9 +26,6 @@ public:
     explicit SingleCameraOperationWnd(QWidget* parent = nullptr);
     ~SingleCameraOperationWnd();
 
-    // 获取唯一实例的静态方法
-    static SingleCameraOperationWnd* GetInstance();
-
     void initFrom();
     void closeEvent(QCloseEvent* event) override;
 
@@ -125,7 +122,6 @@ private:
     const int                       m_nMaterialIndex = 2;
     QTimer* m_timerMaterial;
     ns_module::CViewInterface* m_pCViewInterface;
-    static SingleCameraOperationWnd* m_instance; // 声明静态实例指针
 };
 
 #endif // SINGLECAMERAOPERATIONWND_H