From 55615eba335d4cbc1f83330dc5078fe073034b7d Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 23 7월 2021 10:40:51 +0900
Subject: [PATCH] Ongoing60 #3524 CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선
---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 06fae9b..0cfb0d2 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -1278,22 +1278,21 @@
}
}
- if (pReviewResult->nModuleIdx == 0)
+ if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
- /* double dAverageGray = 0.0;
- if (CCHImageProcess::ImageAverage(pImageData, dAverageGray) == 1)
- {
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dAverageGray;
- }*/
- }
- else
+ m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+ }
+ else if(pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
-
+ m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
}
}
}
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD Start
else
{
double dFocusValue = 0.;
@@ -1311,15 +1310,21 @@
dFocusValue = CalcFocusValue(imageConvert.GetImageBuffer(), imageConvert.GetWidth(), imageConvert.GetHeight());
}
- if (pReviewResult->nModuleIdx == 0)
+ if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
}
- else
+ else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
}
}
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD End
@@ -1424,9 +1429,23 @@
if (imageConvert.GetImageExist())
{
dFocusValue = CalcFocusValue(imageConvert.GetImageBuffer(), imageConvert.GetWidth(), imageConvert.GetHeight());
+
+ if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
+ {
+ m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+ }
+ else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
+ {
+ m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ }
+
}
-
// count defocus
CGlassResult* pGlassResult = m_pRP2P->IRP2P_GetCurrentGlassResult();
if (pGlassResult)
@@ -1446,6 +1465,39 @@
}
}
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 ADD Start
+ else
+ {
+ double dFocusValue = 0.;
+ CCHImageData imageConvert;
+ if (pImageData->GetChannels() != 1)
+ {
+ CCHImageProcess::ImageConvert(pImageData, &imageConvert, ConvertTypeRGB2Gray);
+ }
+ else
+ {
+ pImageData->CopyImageTo(&imageConvert);
+ }
+ if (imageConvert.GetImageExist())
+ {
+ dFocusValue = CalcFocusValue(imageConvert.GetImageBuffer(), imageConvert.GetWidth(), imageConvert.GetHeight());
+ }
+
+ if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
+ {
+ m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+ }
+ else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
+ {
+ m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
+ m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ }
+ }
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 ADD End
return ReviewResult_Process_Complete;
}
--
Gitblit v1.9.3