From 6c48319c60c4eb6ad4ff3631f5caa6b297d2e787 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 18 8월 2021 09:06:18 +0900
Subject: [PATCH] Merge branch 'feature/#3561_CF_AOI_Review_Align_카메라_끊김_현상_조치' into feature/#3562_CF_AOI_Review_실행_프로그램_경로_변경
---
Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp b/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
index 605d716..24691d4 100644
--- a/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
+++ b/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
@@ -62,6 +62,16 @@
if (m_pCamera)
{
//SetHeartbeatTimeout(10000); // set heartbeat
+ //if (controlInfo.GetCameraReverseX() == TRUE)//210614占쏙옙占싹론몌옙 占쏙옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙
+ //{
+ // //m_pCamera->ReverseX = TRUE;
+ // m_pCamera->ReverseX.SetValue(TRUE);
+ //}
+ //else
+ //{
+ // //m_pCamera->ReverseX = FALSE;
+ // m_pCamera->ReverseX.SetValue(FALSE);
+ //}
m_pCamera->SetCameraContext(m_nTotalIndex);///m_nCameraIndex); // set context
@@ -69,7 +79,7 @@
m_pCamera->RegisterImageEventHandler(this, RegistrationMode_Append, Ownership_TakeOwnership);
m_pCamera->RegisterConfiguration(this, RegistrationMode_ReplaceAll, Cleanup_None);
m_pCamera->Open();
-
+
// set buffer info
m_nWidth = (int)m_pCamera->Width.GetValue();
m_nWidthStep = m_nWidth * 3;
@@ -321,7 +331,7 @@
if (m_pCC2P)
{
- m_pCC2P->ICC2P_FrameCaptured(m_nTotalIndex, m_nFrameIndex, m_nFrameCount);// 2014.6.21 m_pCameraFrameBuffer 추가
+ m_pCC2P->ICC2P_FrameCaptured(m_nTotalIndex, m_nFrameIndex, m_nFrameCount);// 2014.6.21 m_pCameraFrameBuffer 占쌩곤옙
}
}
--
Gitblit v1.9.3