From 4114d380bd594385fa6f10bb36a9eef4d19e8db1 Mon Sep 17 00:00:00 2001 From: kojingeun <diteam.co.kr> Date: 월, 05 6월 2023 23:33:58 +0900 Subject: [PATCH] Ongoing50 #4517 CF AOI Review 결과 파일 찾기 실패 개선 1. Find Bin File 찾는 Library 변경 - CRT _findfirsti64 / _findnexti64 -> C++17 Filesystem directory_iterator - 파일 탐색 시간 20k Files(80GB) 1sec 소요 --- ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp index d622bf0..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,11 +3846,8 @@ } dFocus = dSum / double(nCalWidth*nCalHeight); - //FDC 보고 MAX 수치 10 if (dFocus >= 10.0) dFocus = 10.0; - //FDC 보고 정수만 사용 가능 하나 2.8 수치까지 디포커스로 볼 수 없어 보정치 추가 - else dFocus += 0.2; - + return dFocus; //#3524_210902_LYW_MOD END //Origin -- Gitblit v1.9.3