From 668b40db8e394058c7e0abad2fbe539a631043c2 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 01 7월 2021 10:03:42 +0900
Subject: [PATCH] Merge branch 'feature/#3417_CF_AOI_Review_전설비_Log_Process개선' into develop
---
Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp b/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
index 605d716..18fa0fb 100644
--- a/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
+++ b/Internal_Library/CHCameraControl_Pylon/CameraControl_Pylon.cpp
@@ -62,14 +62,22 @@
if (m_pCamera)
{
//SetHeartbeatTimeout(10000); // set heartbeat
-
+ //if (controlInfo.GetCameraReverseX() == TRUE)//210614占쏙옙占싹론몌옙 占쏙옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙
+ //{
+ // m_pCamera->ReverseX = TRUE;
+ //}
+ //else
+ //{
+ // m_pCamera->ReverseX = FALSE;
+ //}
+
m_pCamera->SetCameraContext(m_nTotalIndex);///m_nCameraIndex); // set context
m_pCamera->MaxNumBuffer = m_nGrabCount;
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 +329,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