同步

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

@@ -74,13 +74,10 @@ ChartsAndCamerasWnd::ChartsAndCamerasWnd(QWidget* parent) :
 ChartsAndCamerasWnd::~ChartsAndCamerasWnd()
 {
     m_pMainCameraBind = nullptr;
-    delete ui;
     UnCameraBind();
-}
-
-
-
 
+    delete ui;
+}
 
 void ChartsAndCamerasWnd::initializeSeriesInfo()
 {
@@ -246,11 +243,20 @@ void ChartsAndCamerasWnd::initFrom() {
         for (int i = 0; i < numbers.size(); ++i)
         {
             int num = numbers[i];
-            CameraInfo test;
-            test.iCameraId = i;
-            test.name = ("camera" + QString::number(i)).toStdString();
-            test.eType = MATERIAL_WAFER;
-            CameraImageHandler* manager = new CameraImageHandler(num, test);
+            CameraImageHandler* manager = nullptr;
+            if (nSize == 5) // 测试数据
+            {
+                CameraInfo test;
+                test.iCameraId = i;
+                test.name = ("camera" + QString::number(i)).toStdString();
+                test.eType = MATERIAL_WAFER;
+                manager = new CameraImageHandler(num, test);
+            }
+            else
+            {
+                manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
+            }
+
             Group* widget = manager->getGroup();
             //connect(widget,&Group::send_button_Signal,this,&ChartsAndCamerasWnd::showAndHide);
             if (widget != nullptr)

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

@@ -93,11 +93,21 @@ void MainAndSecondaryCamerasWnd::InitPage()
         for (int i = 0; i < numbers.size(); ++i)
         {
             int num = numbers[i];
-            CameraInfo test; 
-            test.iCameraId = i;
-            test.name = ("camera" + QString::number(i)).toStdString();
-            test.eType = MATERIAL_WAFER;
-            CameraImageHandler* manager = new CameraImageHandler(num,test);
+
+            CameraImageHandler* manager = nullptr;
+            if (nSize == 5) // 测试数据
+            {
+                CameraInfo test;
+                test.iCameraId = i;
+                test.name = ("camera" + QString::number(i)).toStdString();
+                test.eType = MATERIAL_WAFER;
+                manager = new CameraImageHandler(num, test);
+            }
+            else
+            {
+                manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
+            }
+
             Group* widget = manager->getGroup();
             CameraConnectUpdateImageFun(i, widget);
 

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

@@ -23,10 +23,9 @@ SingleCameraOperationWnd::SingleCameraOperationWnd(QWidget* parent)
 
 SingleCameraOperationWnd::~SingleCameraOperationWnd()
 {
-    delete ui;
     UnCameraBind();
 
-
+    delete ui;
 }
 
 void SingleCameraOperationWnd::initFrom() {
@@ -56,13 +55,24 @@ void SingleCameraOperationWnd::initFrom() {
         }
 
 
-        for (int i = 0; i < numbers.size(); ++i) {
+        for (int i = 0; i < numbers.size(); ++i) 
+        {
             int num = numbers[i];
-            CameraInfo test;
-            test.iCameraId = i;
-            test.name = ("camera" + QString::number(i)).toStdString();
-            test.eType = MATERIAL_WAFER;
-            CameraImageHandler* manager = new CameraImageHandler(num, test);
+
+            CameraImageHandler* manager = nullptr;
+            if (nSize == 5) // 测试数据
+            {
+                CameraInfo test;
+                test.iCameraId = i;
+                test.name = ("camera" + QString::number(i)).toStdString();
+                test.eType = MATERIAL_WAFER;
+                manager = new CameraImageHandler(num, test);
+            }
+            else
+            {
+                manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
+            }
+           
             Group* widget = manager->getGroup();
             if (widget != nullptr)
             {