From b9b6752e83c701cc67241923d2b74dc3a963d243 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 27 9월 2021 13:13:23 +0900
Subject: [PATCH] Ongoing100 #3486 CF AOI Review Review History 프로그램 테스트 및 적용
---
ReviewSystem/ReviewSystem/CameraController.cpp | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraController.cpp b/ReviewSystem/ReviewSystem/CameraController.cpp
index 2231cb6..be17e12 100644
--- a/ReviewSystem/ReviewSystem/CameraController.cpp
+++ b/ReviewSystem/ReviewSystem/CameraController.cpp
@@ -107,6 +107,34 @@
if (!pCameraControl->Connect(*it))
{
+ //#3361_ LYW CF AOI Review �쟾�꽕鍮� Align Cam 鍮꾩젙�긽 �뿰寃� �떆 �뙘�뾽 湲곕뒫 異붽� START
+ if (it->GetLibraryType() == CAMERA_LIBRARY_PYLON)
+ {
+ CString strMessage;
+ strMessage.Format(_T("Align移대찓�씪 �뿰寃� �떎�뙣 idx = %d"), nCamIndex);
+ if (IDOK == AfxMessageBox(strMessage, MB_OK | MB_ICONQUESTION))
+ {
+ g_pLog->DisplayMessage(_T("Align Camera Connet Fail! Exit Review System"));
+ //�뾽�뜲�씠�듃�떆
+ //exit(1);
+ return FALSE;
+ }
+
+ }
+ else if(it->GetLibraryType() == CameraLibrary_Sapera)
+ {
+ CString strMessage;
+ strMessage.Format(_T("Review移대찓�씪 �뿰寃� �떎�뙣 idx = %d"), nCamIndex);
+ if (IDOK == AfxMessageBox(strMessage, MB_OK | MB_ICONQUESTION))
+ {
+ g_pLog->DisplayMessage(_T("Review Camera Connet Fail! Exit Review System"));
+ //�뾽�뜲�씠�듃�떆
+ //exit(1);
+ return FALSE;
+ }
+ }
+
+ ////#3361_ LYW CF AOI Review �쟾�꽕鍮� Align Cam 鍮꾩젙�긽 �뿰寃� �떆 �뙘�뾽 湲곕뒫 異붽� END
delete pCameraControl;
continue;
}
@@ -240,9 +268,19 @@
for (VectorCameraControlIt it=m_vecCameraControl.begin(); it!=m_vecCameraControl.end(); it++)
{
- (*it)->SetTriggerMode(ModeInternal);
- int nSub = (*it)->Grab();
+ //#3561 210908 LYW ADD Start
+ int nSub;
+ try
+ {
+ (*it)->SetTriggerMode(ModeInternal);
+ nSub = (*it)->Grab();
+ }
+ catch (...)
+ {
+ nSub = FALSE;
+ }
+ //#3561 210908 LYW ADD End
if (nSub==1)
g_pLog->DisplayMessage(_T("[CameraController]Camera_Grab Success![ModeInternal]"));
--
Gitblit v1.9.3