From e5fa774d622d6852fe8e1f033045aed221649108 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 15 10월 2021 13:24:54 +0900
Subject: [PATCH] Ongoing80 #3662 CF AOI Review 전설비 알람 발생 조치
---
ReviewSystem/ReviewSystem/CameraControlAlign.cpp | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 insertions(+), 6 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
index aafd737..c75bc2a 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
@@ -267,21 +267,37 @@
CString strFilename = _T("");
CCHImageData tempImage;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ CCHImageData assistanttempImage;
+ /*< LYW 20211012 - #3671 ADD End >*/
for (int i=0; i<2; i++)
{
if(m_vecCameraImage.size() <= i) continue;
(m_vecCameraImage[i]->GetImageData(View_Template))->ReleaseImage();
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ (m_vecCameraImage[i]->GetImageData(View_AssistantTemplate))->ReleaseImage();
+ /*< LYW 20211012 - #3671 ADD End >*/
// load
CString strFilename = ALIGN_IMAGE_PATH;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ CString strAssistantFilename = ALIGN_IMAGE_PATH;
+ /*< LYW 20211012 - #3671 ADD End >*/
if (i==0)
{
strFilename += _T("\\") + m_AlignRecipe.strFirstImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ strAssistantFilename += _T("\\") + m_AlignRecipe.strFirstAssistantImageFile;
+ /*< LYW 20211012 - #3671 ADD End >*/
+
}
else if (i==1)
{
strFilename += _T("\\") + m_AlignRecipe.strSecondImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ strAssistantFilename += _T("\\") + m_AlignRecipe.strSecondAssistantImageFile;
+ /*< LYW 20211012 - #3671 ADD End >*/
}
//strFilename += m_AlignRecipe.strTemplateName[i];
@@ -292,7 +308,18 @@
continue;
}
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ if (assistanttempImage.LoadImage(strAssistantFilename) == FALSE)
+ {
+ bAllLoad = bAllLoad && FALSE;
+ continue;
+ }
+ /*< LYW 20211012 - #3671 ADD End >*/
+
bAllLoad = bAllLoad && tempImage.GetBandImage(BandTypeGray, m_vecCameraImage[i]->GetImageData(View_Template));
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ bAllLoad = bAllLoad && assistanttempImage.GetBandImage(BandTypeGray, m_vecCameraImage[i]->GetImageData(View_AssistantTemplate));
+ /*< LYW 20211012 - #3671 ADD End >*/
}
return bAllLoad;
@@ -561,7 +588,11 @@
CCameraImageData* pCameraImage = m_vecCameraImage[nCameraIdx];
CAlignFinder* pAlignFinder = m_vecAlignFinder[nCameraIdx];
- if (pCameraImage==NULL || pAlignFinder==NULL) return FALSE;
+ /*< LYW 20211014 - #index MOD Start >*/
+ if (pCameraImage == NULL || pAlignFinder == NULL || m_pACC2P == NULL) return FALSE;
+ /*< LYW 20211014 - #index MOD End >*/
+ /*< Origin Code >*/
+ //if (pCameraImage == NULL || pAlignFinder == NULL) return FALSE;
// set find param;
SAlignFindParam findParam;
@@ -574,6 +605,8 @@
findParam.nEdgeThreshold = m_AlignRecipe.nEdgeThreshold;
findParam.nMergeRange = m_AlignRecipe.nMergeRange;
findParam.dEdgeRate = m_AlignRecipe.dEdgeRate;
+ findParam.dMatchingPixelStandard = _tcstod(m_AlignRecipe.strMatchingPixelStandard,NULL);
+ findParam.dMatchingAlarmCondition = _tcstod(m_AlignRecipe.strMatchingAlarmCondition, NULL);
// findParam.m_nAlignMarkPos = m_AlignRecipe.nAlignMarkPosition;
@@ -597,10 +630,26 @@
wcstombs_s(&CharactersConverted,CDitGlassRawClient::GetInstance()->GetGlassData()->m_strAlignMarkSecond, uploadAlignimage, _TRUNCATE);
}*/
// find process
-
-
- // find process 諛붿뒳�윭 移대찓�씪媛� 3梨꾨꼸吏쒕━�씪�꽌 �떆���뒪 �룎�븣�뒗 1梨꾨꼸濡� 諛붽퓭�꽌 �룘 ksm
CCHImageData camImage;
+
+ //#3671 TEST CODE Start
+// CCHImageData TestImage;
+//
+// (m_vecCameraImage[nCameraIdx]->GetImageData(View_Camera))->ReleaseImage();
+// CString strFilename = ALIGN_IMAGE_PATH;
+// if (nCameraIdx == 0)
+// {
+// strFilename += _T("\\Test1.BMP");
+// }
+// else
+// {
+// strFilename += _T("\\Test2.BMP");
+// }
+// TestImage.LoadImage(strFilename);
+// TestImage.GetBandImage(BandTypeGray, m_vecCameraImage[nCameraIdx]->GetImageData(View_Camera));
+// (m_vecCameraImage[nCameraIdx]->GetImageData(View_Camera))->GetBandImage(BandTypeGray, &camImage);
+ //#3671 TEST CODE End
+// find process 諛붿뒳�윭 移대찓�씪媛� 3梨꾨꼸吏쒕━�씪�꽌 �떆���뒪 �룎�븣�뒗 1梨꾨꼸濡� 諛붽퓭�꽌 �룘 ksm
if ((pCameraImage->GetImageData(View_Camera))->GetChannels() > 1)
(pCameraImage->GetImageData(View_Camera))->GetBandImage(BandTypeGray, &camImage);
else
@@ -609,20 +658,73 @@
//SAlignFindResult findResult = pAlignFinder->FindAlign(pCameraImage->GetImageData(View_Matching), findParam, pCameraImage->GetImageData(View_Template));
SAlignFindResult findResult = pAlignFinder->FindAlign(&camImage, findParam, pCameraImage->GetImageData(View_Template));
+ g_pLog->DisplayMessage(_T("Main TempleteMatching Result : %d Cam ResultCode = %d, PixelX = %d, PixelY = %d, MatchingRate = %.3lf"), nCameraIdx, findResult.nResultCode, int(findResult.dPosX + 0.5), int(findResult.dPosY + 0.5), findResult.dMatchValue);
// result process
if (findResult.nResultCode==AlignMatch_Success)
{
+ g_pLog->DisplayMessage(_T("Main TempleteMatching Success!"));
m_AlignResult.nFindAlign[nCameraIdx] = 1;
m_AlignResult.dFindPixelX[nCameraIdx] = int(findResult.dPosX + 0.5);
m_AlignResult.dFindPixelY[nCameraIdx] = int(findResult.dPosY + 0.5);
m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
}
+ /*< LYW 20211013 - #3671 ADD Start >*/
+
else
{
- m_AlignResult.nFindAlign[nCameraIdx] = 0;
- m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+ SAlignFindResult findAssistantResult = pAlignFinder->FindAlign(&camImage, findParam, pCameraImage->GetImageData(View_AssistantTemplate));
+ 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!"));
+ m_AlignResult.nFindAlign[nCameraIdx] = 1;
+ m_AlignResult.dFindPixelX[nCameraIdx] = int(findAssistantResult.dPosX + 0.5);
+ m_AlignResult.dFindPixelY[nCameraIdx] = int(findAssistantResult.dPosY + 0.5);
+ m_AlignResult.dFindScore[nCameraIdx] = findAssistantResult.dMatchValue;
+ }
+
+ else
+ {
+ int dffmain2assistanstX = int(findResult.dPosX) - int(findAssistantResult.dPosX);
+ int dffmain2assistanstY = int(findResult.dPosY) - int(findAssistantResult.dPosY);
+ g_pLog->DisplayMessage(_T("Main, Assistant TempleteMatching All Low Score! differenceX = %d, differenceY = %d"), dffmain2assistanstX, dffmain2assistanstY);
+
+ if (abs(dffmain2assistanstX) <= findParam.dMatchingPixelStandard && abs(dffmain2assistanstY) <= findParam.dMatchingPixelStandard && findResult.dMatchValue != 0.0)
+ {
+ m_AlignResult.nFindAlign[nCameraIdx] = 1;
+ m_AlignResult.dFindPixelX[nCameraIdx] = int(findResult.dPosX + 0.5);
+ m_AlignResult.dFindPixelY[nCameraIdx] = int(findResult.dPosY + 0.5);
+ m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+ m_pACC2P->IACC2P_SetAccumaulate(m_pACC2P->IACC2P_GetAccumaulate() + 1);
+ g_pLog->DisplayMessage(_T("Main, Assistant Templete Find Same Point! Align Success! Accumaulate = %d"), m_pACC2P->IACC2P_GetAccumaulate());
+ }
+
+ else
+ {
+ g_pLog->DisplayMessage(_T("Main Assistant Templete Don`t Find Same Point! Align Fail!"));
+ m_AlignResult.nFindAlign[nCameraIdx] = 0;
+ m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+ }
+
+ if (m_pACC2P->IACC2P_GetAccumaulate() > findParam.dMatchingAlarmCondition)
+ {
+ m_AlignResult.nFindAlign[nCameraIdx] = 0;
+ m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+ m_pACC2P->IACC2P_SetAccumaulate(0);
+ g_pLog->DisplayMessage(_T("Low Matching, But Align Same Point, Count is more Than MatchingAlarmCondition , Accumaulate = %d Reset"), m_pACC2P->IACC2P_GetAccumaulate());
+ }
+ }
}
+ /*< LYW 20211013 - #3671 ADD End >*/
+
+ /*< LYW 20211013 - #3671 Delete Start >*/
+// else
+// {
+// m_AlignResult.nFindAlign[nCameraIdx] = 0;
+// m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+// }
+ /*< LYW 20211013 - #3671 Delete End >*/
// save threshold image
strPath.Format(_T("%s\\Cam%02d_AlignTH_%04d%02d%02d%02d%02d%02d.jpg"), m_strSaveImageBasePath, nCameraIdx,
--
Gitblit v1.9.3