From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 11 11월 2021 17:57:01 +0900
Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치
---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 6c9c75f..086a65f 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -1228,7 +1228,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview00ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
@@ -1243,7 +1244,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview01ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
@@ -1278,7 +1280,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview00ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
@@ -1294,7 +1297,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview01ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
@@ -1412,7 +1416,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview00ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
@@ -1427,7 +1432,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview01ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
@@ -1483,7 +1489,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview00ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
@@ -1498,7 +1505,8 @@
int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
- m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ //m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
+ m_pRP2P->IRP2P_SetReview01ImageContrast(round(dFocusValue));
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
@@ -3838,8 +3846,7 @@
}
dFocus = dSum / double(nCalWidth*nCalHeight);
- if (dFocus >= 9.8) dFocus = 10.0;
- else dFocus += 0.2;
+ if (dFocus >= 10.0) dFocus = 10.0;
return dFocus;
//#3524_210902_LYW_MOD END
--
Gitblit v1.9.3