From 07a62310a7480610663ffc608491cf46370d99b8 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 15 10월 2021 15:26:33 +0900
Subject: [PATCH] Ongoing90 #3671 CF AOI Review 전설비 Align Matching 방법 개선
---
ReviewSystem/ReviewSystem/CameraControlAlign.cpp | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
index c75bc2a..2b4ac05 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
@@ -663,7 +663,10 @@
// result process
if (findResult.nResultCode==AlignMatch_Success)
{
- g_pLog->DisplayMessage(_T("Main TempleteMatching Success!"));
+ /*< LYW 20211015 - #3671 ADD Start >*/
+ m_pACC2P->IACC2P_SetAccumaulate(0);
+ /*< LYW 20211015 - #3671 ADD End >*/
+ g_pLog->DisplayMessage(_T("Main TempleteMatching Success! Accumaulate = %d"), m_pACC2P->IACC2P_GetAccumaulate());
m_AlignResult.nFindAlign[nCameraIdx] = 1;
m_AlignResult.dFindPixelX[nCameraIdx] = int(findResult.dPosX + 0.5);
m_AlignResult.dFindPixelY[nCameraIdx] = int(findResult.dPosY + 0.5);
@@ -677,7 +680,10 @@
g_pLog->DisplayMessage(_T("Assistant TempleteMatching Result : %d Cam ResultCode = %d, PixelX = %d, PixelY = %d, MatchingRate = %.3lf"), nCameraIdx, findAssistantResult.nResultCode, int(findAssistantResult.dPosX + 0.5), int(findAssistantResult.dPosY + 0.5), findAssistantResult.dMatchValue);
if (findAssistantResult.nResultCode == AlignMatch_Success)
{
- g_pLog->DisplayMessage(_T("Assistant TempleteMatching Success!"));
+ /*< LYW 20211015 - #3671 ADD Start >*/
+ m_pACC2P->IACC2P_SetAccumaulate(0);
+ /*< LYW 20211015 - #3671 ADD End >*/
+ g_pLog->DisplayMessage(_T("Assistant TempleteMatching Success! Accumaulate = %d"),m_pACC2P->IACC2P_GetAccumaulate());
m_AlignResult.nFindAlign[nCameraIdx] = 1;
m_AlignResult.dFindPixelX[nCameraIdx] = int(findAssistantResult.dPosX + 0.5);
m_AlignResult.dFindPixelY[nCameraIdx] = int(findAssistantResult.dPosY + 0.5);
@@ -707,7 +713,7 @@
m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
}
- if (m_pACC2P->IACC2P_GetAccumaulate() > findParam.dMatchingAlarmCondition)
+ if (m_pACC2P->IACC2P_GetAccumaulate() >= findParam.dMatchingAlarmCondition)
{
m_AlignResult.nFindAlign[nCameraIdx] = 0;
m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
--
Gitblit v1.9.3