From a6552335164ce062567b76aa7d097fd046129474 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 23 7월 2021 10:07:55 +0900
Subject: [PATCH] Ongoing90 #3517 CF AOI Review 자가진단 기능 개선
---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 06fae9b..30d317a 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -1278,19 +1278,17 @@
}
}
- 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);
}
}
}
@@ -1311,13 +1309,16 @@
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);
}
- else
+ else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
+
}
}
@@ -1424,9 +1425,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)
--
Gitblit v1.9.3