From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 월, 26 12월 2022 15:04:42 +0900
Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경
---
ReviewSystem/ReviewSystem/CameraControlAlign.cpp | 181 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 9 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
index 39f2d4e..c9a8055 100644
--- a/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
+++ b/ReviewSystem/ReviewSystem/CameraControlAlign.cpp
@@ -5,7 +5,8 @@
#include "CHReviewSetting/SystemInfo.h"
#include "CHReviewRecipe/RsRcpAlignInfo.h"
-#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage\\")
+#define ALIGN_TEMPLATE_PATH _T("D:\\DIT_Review\\Recipe\\AlignImage\\")
+//#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage\\") //210805
using namespace CHImageControls;
@@ -18,6 +19,8 @@
m_pVectorAlignLightControl = NULL;
m_nViewMode = 0;
m_strSaveImageBasePath = _T("");
+ m_strSaveImageOKPath = _T("");
+ m_strSaveImageNGPath = _T("");
m_nAlignType = FALSE;
@@ -92,6 +95,7 @@
m_nAlignType = nAlignType;
}
+//#3357 KYH Align Image 珥덇린�솕 ADD START
void CCameraControlAlign::SetAlignClearImage()//210330 kyh Align �씠誘몄� 珥덇린�솕
{
//m_vecCameraImage[0]->GetImageData(View_Camera)->ClearImage(0);
@@ -106,6 +110,7 @@
m_vecCameraImage[i]->ClearImage(View_Matching);
}
}
+//#3357 KYH Align Image 珥덇린�솕 ADD END
void CCameraControlAlign::DisconnectCamera()
{
@@ -264,21 +269,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];
@@ -289,7 +310,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;
@@ -412,6 +444,16 @@
void CCameraControlAlign::SetSaveImageBasePath(CString strPath)
{
m_strSaveImageBasePath = strPath;
+}
+
+void CCameraControlAlign::SetSaveImageOKPath(CString strPath)
+{
+ m_strSaveImageOKPath = strPath;
+}
+
+void CCameraControlAlign::SetSaveImageNGPath(CString strPath)
+{
+ m_strSaveImageNGPath = strPath;
}
CCameraControl* CCameraControlAlign::GetCameraControl(int nCameraIndex)
@@ -558,7 +600,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;
@@ -571,6 +617,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;
@@ -594,10 +642,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
@@ -605,21 +669,92 @@
//SAlignFindResult findResult = pAlignFinder->FindAlign(pCameraImage->GetImageData(View_Matching), findParam, pCameraImage->GetImageData(View_Template));
+ //Main Align Matching
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
+ //Main Align Matching result process
if (findResult.nResultCode==AlignMatch_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);
m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
}
+ /*< LYW 20211013 - #3671 ADD Start >*/
+
else
{
- m_AlignResult.nFindAlign[nCameraIdx] = 0;
- m_AlignResult.dFindScore[nCameraIdx] = findResult.dMatchValue;
+ //Assistant Align Matching
+ 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);
+ //Assistant Align Matching result process
+ if (findAssistantResult.nResultCode == AlignMatch_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);
+ m_AlignResult.dFindScore[nCameraIdx] = findAssistantResult.dMatchValue;
+ }
+
+ else
+ {
+ //Main, Assistant Find Pos Compare
+ 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 && findAssistantResult.dMatchValue != 0.0)
+ {
+ //Main, Assistant Find Pos Compare Result Success Process
+ m_AlignResult.nFindAlign[nCameraIdx] = 1;
+ /*< LYW 20211015 - #3671 MOD Start >*/
+ m_AlignResult.dFindPixelX[nCameraIdx] = int((findResult.dPosX + findAssistantResult.dPosX) / 2 + 0.5);
+ m_AlignResult.dFindPixelY[nCameraIdx] = int((findResult.dPosY + findAssistantResult.dPosY) / 2 + 0.5);
+ /*< LYW 20211015 - #3671 MOD End >*/
+ /*< Origin Code >*/
+ //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
+ {
+ //Main, Assistant Find Pos Compare Result Fail Process
+ 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)
+ {
+ //Main, Assistant Find Pos Alarm Process
+ 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,
@@ -631,7 +766,8 @@
time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
pAlignFinder->SaveResultImage(strPath);
- Sleep(10);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(10);
if (nCameraIdx == 0)
{
m_AlignResult.strAlignFirest = strPath;
@@ -641,6 +777,33 @@
m_AlignResult.strAlignSecond = strPath;
}
+ if (m_AlignResult.nFindAlign[nCameraIdx] == 1)
+ {
+ CreateDirectory(m_strSaveImageOKPath, NULL);
+ // save threshold image
+ strPath.Format(_T("%s\\Cam%02d_Align_OK_TH_%04d%02d%02d%02d%02d%02d.jpg"), m_strSaveImageOKPath, nCameraIdx,
+ time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
+ pAlignFinder->SaveThresholdImage(strPath);
+
+ // save Result Image 20210208 �뼹�씪�씤 寃곌낵 ���옣
+ strPath.Format(_T("%s\\Cam%02d_AlignResultOK_%04d%02d%02d%02d%02d%02d.jpg"), m_strSaveImageOKPath, nCameraIdx,
+ time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
+ pAlignFinder->SaveResultImage(strPath);
+ }
+
+ else
+ {
+ CreateDirectory(m_strSaveImageNGPath, NULL);
+ // save threshold image
+ strPath.Format(_T("%s\\Cam%02d_Align_NG_TH_%04d%02d%02d%02d%02d%02d.jpg"), m_strSaveImageNGPath, nCameraIdx,
+ time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
+ pAlignFinder->SaveThresholdImage(strPath);
+
+ // save Result Image 20210208 �뼹�씪�씤 寃곌낵 ���옣
+ strPath.Format(_T("%s\\Cam%02d_AlignResultNG_%04d%02d%02d%02d%02d%02d.jpg"), m_strSaveImageNGPath, nCameraIdx,
+ time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
+ pAlignFinder->SaveResultImage(strPath);
+ }
// update matching image
pAlignFinder->GetBlobImage(pCameraImage->GetImageData(View_Matching));
--
Gitblit v1.9.3