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 | 37 +++++++++++++++++++++++++++++++++++++
ReviewSystem/CHReviewResult/GlassResult.cpp | 12 ++++++++----
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/CHReviewResult/GlassResult.cpp b/ReviewSystem/CHReviewResult/GlassResult.cpp
index 465d32f..5317162 100644
--- a/ReviewSystem/CHReviewResult/GlassResult.cpp
+++ b/ReviewSystem/CHReviewResult/GlassResult.cpp
@@ -160,8 +160,10 @@
m_vecWsiMultiShotScheduleResult.clear();
//FDC보고용 Review Contrast
- nReview00ImageContrast = 0;
- nReview01ImageContrast = 0;
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD Start
+ nReview00ImageContrast = 50;
+ nReview01ImageContrast = 50;
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD End
// defect result
for (MapDefectResultIt it = m_mapDefectResult.begin(); it != m_mapDefectResult.end(); it++)
@@ -309,8 +311,10 @@
m_vecWsiMultiShotScheduleResult.clear();
//FDC보고용 Review Contrast
- nReview00ImageContrast = -1;
- nReview01ImageContrast = -1;
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD Start
+ nReview00ImageContrast = 50;
+ nReview01ImageContrast = 50;
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD End
//// defect result
//for (MapDefectResultIt it = m_mapDefectResult.begin(); it != m_mapDefectResult.end(); it++)
//{
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 30d317a..0cfb0d2 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -1292,6 +1292,7 @@
}
}
}
+ //#3524_210723_LYW_CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선 MOD Start
else
{
double dFocusValue = 0.;
@@ -1313,14 +1314,17 @@
{
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 보고 방식 개선 MOD End
@@ -1461,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