瀏覽代碼

问题修复:相机无法显示

JonYang 1 周之前
父節點
當前提交
c4f2a765ae

+ 1 - 1
View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -207,7 +207,7 @@ void Group::UpDataImageShowSlots(const QPixmap& imageData)
     QPixmap scaledPixmap = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     ui->Imagewidget_left->setPixmap(scaledPixmap);
 
-    //emit SetUpDataImageShowSig(imageData);
+    emit SetUpDataImageShowSig(imageData);
 }
 
 void Group::showEvent(QShowEvent *event) {

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

@@ -549,8 +549,14 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
             }
             else
             {
+                if (m_veCurrentSelectGroup.size() == 0)
+                {
+                    connect(pGroup, &Group::SetUpDataImageShowSig,
+                        this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
+                }
                 m_veCurrentSelectGroup.clear();
                 m_veCurrentSelectGroup.push_back(_curr);
+                
             }
             UpdataLightJoystickSwitchPage();
         }