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/ReviewInterface.cpp | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 7e3e007..6f42812 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -127,6 +127,10 @@
m_bFirstReviewLeft = 0;
m_bFirstReviewRight = 0;
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ m_daccumulate = 0;
+ /*< LYW 20211014 - #3671 ADD End >*/
+
// cs init
InitializeCriticalSection(&m_csReviewResult);
InitializeCriticalSection(&m_csReviewSignal);
@@ -3115,6 +3119,16 @@
return AlignLight_GetLightLevel(nCameraIndex, nValue);
}
+int CReviewInterface::IACC2P_GetAccumaulate()
+{
+ return m_daccumulate;
+}
+
+void CReviewInterface::IACC2P_SetAccumaulate(int dValue)
+{
+ m_daccumulate = dValue;
+}
+
BOOL CReviewInterface::IRCC2P_GetCurrentFrame(int nModuleIndex, int nCameraIndex, int nFrameWidth, int nFrameHeight, int nFrameChannels, CCHImageData* pImageData)
{
if (m_pVirtualGlassMap==NULL) return FALSE;
@@ -5772,6 +5786,12 @@
pGlassResult->m_AlignRecipe.dMatchingRate = pRsRcpAlignInfo->m_dMatchingRate;
pGlassResult->m_AlignRecipe.strFirstImageFile = pRsRcpAlignInfo->m_strFirstImageFile;
pGlassResult->m_AlignRecipe.strSecondImageFile = pRsRcpAlignInfo->m_strSecondImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ pGlassResult->m_AlignRecipe.strFirstAssistantImageFile = pRsRcpAlignInfo->m_strFirstAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strSecondAssistantImageFile = pRsRcpAlignInfo->m_strSecondAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strMatchingPixelStandard = pRsRcpAlignInfo->m_strMatchingPixelStandard;
+ pGlassResult->m_AlignRecipe.strMatchingAlarmCondition = pRsRcpAlignInfo->m_strMatchingAlarmCondition;
+ /*< LYW 20211012 - #3671 ADD End >*/
pGlassResult->m_AlignRecipe.strTotalPitchImageFile = pRsRcpAlignInfo->m_strTotalPitchImageFile;
// edge find param
@@ -6525,10 +6545,6 @@
{
if (m_pSequenceProcessor==NULL) return;
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
- m_pSequenceProcessor->SetSimulationMode(TRUE);
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
-
if (nCommand == -1) // DBClick Date
{
@@ -6537,6 +6553,7 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
+ return;
/*
if (m_pSignalControl)
{
@@ -6556,6 +6573,14 @@
return;
}
+ else
+ {
+ //#3584 210923 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_pSequenceProcessor->SetSimulationMode(TRUE);
+ g_pLog->DisplayMessage(_T("Set User Command = %d"),nCommand);
+ //#3584 210923 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
+ }
+
m_pSequenceProcessor->RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, nCommand);
}
--
Gitblit v1.9.3