|
@@ -168,13 +168,12 @@ void MainAndSecondaryCamerasWnd::CameraConnectUpdateImageFun(int nIndex, Group*
|
|
|
{
|
|
|
if (isUnCameraBind)
|
|
|
{
|
|
|
- disconnect(widget, &Group::SetCurrentSelectSig, this, &MainAndSecondaryCamerasWnd::GetCurrentSelectSlots);
|
|
|
+ //disconnect(widget, &Group::SetCurrentSelectSig, this, &MainAndSecondaryCamerasWnd::GetCurrentSelectSlots);
|
|
|
disconnect(this, pCamerasImage, widget, &Group::UpDataImageShowSlots);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
//共用函数
|
|
|
- //connect(widget, &Group::send_button_Signal, this, &MainAndSecondaryCamerasWnd::CheckIs);
|
|
|
// connect(widget, &Group::SetCurrentSelectSig, this, &MainAndSecondaryCamerasWnd::GetCurrentSelectSlots);
|
|
|
connect(this, pCamerasImage, widget, &Group::UpDataImageShowSlots);
|
|
|
}
|
|
@@ -387,6 +386,18 @@ void MainAndSecondaryCamerasWnd::UnCameraBind()
|
|
|
{
|
|
|
CameraConnectUpdateImageFun(i, m_allGroup[i], true);
|
|
|
}
|
|
|
+ //判断更新前的左窗口是否是绑定相机
|
|
|
+ if (m_veCurrentSelectGroup_L.isBond == true) {
|
|
|
+ disconnect(m_veCurrentSelectGroup_L.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
|
+ this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_L);
|
|
|
+ }
|
|
|
+
|
|
|
+ //判断更新前的右窗口是否是绑定相机
|
|
|
+ if (m_veCurrentSelectGroup_R.isBond == true) {
|
|
|
+ //解绑
|
|
|
+ disconnect(m_veCurrentSelectGroup_R.pSelectGroup, &Group::SetUpDataImageShowSig,
|
|
|
+ this, &MainAndSecondaryCamerasWnd::GetGroupImageShowSignalsTo_R);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void MainAndSecondaryCamerasWnd::UpdateCameraDisplay0(int iCameraId, JVision::ImageInfo imageData)
|