修复相机初始化同步的bug

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

@@ -248,6 +248,9 @@ void ChartsAndCamerasWnd::initFrom() {
         {
             materialBoxMap.insert(num,manager->getMaterialBox());
         }
+        if (manager->getBond()) {
+            bondMap.insert(num, manager->getBond());
+        }
 
         delete manager;
     }
@@ -321,6 +324,7 @@ void ChartsAndCamerasWnd::updateMaterialWidget( int materialWndType, int groupId
     case 1: ui->viewwidgetgroup->setWafer(waferMap.value(lastGroupId)); break;
     case 2: ui->viewwidgetgroup->setWaffle(waffleMap.value(lastGroupId)); break;
     case 3: ui->viewwidgetgroup->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
+    case 4: ui->viewwidgetgroup->setBond(bondMap.value(groupId)); break;
     }
 
 }

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

@@ -116,11 +116,13 @@ private:
     Wafer *wafer; // 声明Wafer指针
     Waffle *waffle; // 声明Waffle指针
     MaterialBox *materialbox; // 声明materialbox指针
+    Bond* bond;
     bool isShow;
 
     QMap<int, Wafer*> waferMap;
     QMap<int, Waffle*> waffleMap;
     QMap<int, MaterialBox*> materialBoxMap;
+    QMap<int, Bond*> bondMap;
     OperateMode currentMode = ModeImage;
     QGraphicsView *currentView = nullptr;
     QPoint mousePos;

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

@@ -87,9 +87,9 @@ void MainAndSecondaryCamerasWnd::initFrom()
         GetCurrentSelectSlots(lastGroupId, lastIndex);
     }
 
-    if(index == 1)
+    if(lastLastIndex == 1)
     {
-        GetCurrentSelectSlots(groupId, index);
+        GetCurrentSelectSlots(lastLastGroupId, lastLastIndex);
     }
 
 }
@@ -458,6 +458,7 @@ void MainAndSecondaryCamerasWnd::timerEvent(QTimerEvent* event)
 
 void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
 {
+
     int nOnClickGroupId = groupId - 1; // 这里new 有些是0,有些是1 暂时选择
     if (m_pMainCameraBind == nullptr || m_allGroup.size() < nOnClickGroupId)
     {
@@ -601,7 +602,7 @@ void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals4(const QPixmap& image
     QSize size_left = ui->viewwidgetgroup_R->getOperatewidget()->size();
     QPixmap scaledPixmap_left = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     ui->viewwidgetgroup_R->getOperatewidget()->setPixmap(scaledPixmap_left);
-    //m_lastRightPixmap = imageData;
+    m_lastRightPixmap = imageData;
 }
 
 

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

@@ -134,6 +134,8 @@ private:
 
     MaterialBox         *materialbox; // 声明materialbox指针
 
+    Bond                *bond;
+
     QMap<int, Wafer*>   waferMap;
 
     /**当前选中的group
@@ -148,6 +150,7 @@ private:
 
     QMap<int, Waffle*> waffleMap;
     QMap<int, MaterialBox*> materialBoxMap;
+    QMap<int, Bond*> bondMap;
 
     OperateMode         Left_currentMode = ModeImage;
 

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

@@ -62,6 +62,9 @@ void SingleCameraOperationWnd::initFrom() {
         if(manager->getMaterialBox()){
             materialBoxMap.insert(num,manager->getMaterialBox());
         }
+        if (manager->getBond()) {
+            bondMap.insert(num, manager->getBond());
+        }
 
         delete manager;
     }
@@ -149,6 +152,7 @@ void SingleCameraOperationWnd::updateMaterialWidget( int materialWndType, int gr
         case 1: ui->viewwidgetgroup->setWafer(waferMap.value(lastGroupId)); break;
         case 2: ui->viewwidgetgroup->setWaffle(waffleMap.value(lastGroupId)); break;
         case 3: ui->viewwidgetgroup->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
+        case 4: ui->viewwidgetgroup->setBond(bondMap.value(groupId)); break;
     }
 }
 

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

@@ -86,6 +86,7 @@ private :
     Wafer *wafer; // 声明Wafer指针
     Waffle *waffle; // 声明Waffle指针
     MaterialBox *materialbox; // 声明materialbox指针
+    Bond* bond;
     bool isShow;
     ImageGrabber *m_grabber;
     QMap<int, Group*> groupMap;
@@ -93,6 +94,7 @@ private :
     QMap<int, Wafer*> waferMap;
     QMap<int, Waffle*> waffleMap;
     QMap<int, MaterialBox*> materialBoxMap;
+    QMap<int, Bond*> bondMap;
     OperateMode currentMode = ModeImage;
     QGraphicsView *currentView = nullptr;
     QPoint mousePos;