From ffe71aadfdcb4a9ea2ac4d8d320983d42ef3cad5 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 14 9월 2021 15:19:39 +0900
Subject: [PATCH] 버그 수정
---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 178 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 146 insertions(+), 32 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 74cbfd8..d622bf0 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -5,6 +5,7 @@
#include "CameraControlReview.h"
#include "CHImageControls/CHImageProcess.h"
#include "CHMotorControls/MotorControl.h"
+#include "CHSignalControls/SignalControl.h"
#include "CHEdgeTriangle/EdgeTriangle.h"
#include "CHEdgeTriangle/RecipeManager.h"
@@ -359,7 +360,6 @@
}
LeaveCriticalSection(&m_csUserCriticalSection);
-.
m_pRP2P->IRP2P_UpdateReviewResult(nModuleIndex, pGlassResult);
return;
@@ -1224,15 +1224,33 @@
if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
else if(pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
}
}
@@ -1256,15 +1274,34 @@
if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
+
}
else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
}
@@ -1371,15 +1408,33 @@
if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
@@ -1424,15 +1479,33 @@
if (pReviewResult->nModuleIdx == 0 && m_pRP2P->IRP2P_GetFirstReviewLeft())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview00ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
else if (pReviewResult->nModuleIdx == 1 && m_pRP2P->IRP2P_GetFirstReviewRight())
{
+ const CSignalControlInfo* pSignalInfo = m_pRP2P->IRP2P_GetReviewSignalinfo();
+ int nDefocusValueMin = pSignalInfo->GetDefocusValueMin();
+ int nDefocusValueMax = pSignalInfo->GetDefocusValueMax();
+
m_pRP2P->IRP2P_GetCurrentGlassResult()->nReview01ImageContrast = dFocusValue;
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
+
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
+ {
+ m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
+ }
}
}
@@ -3732,49 +3805,90 @@
BYTE *pImageBufferByte = (BYTE*)(pImageBuffer);
if (pImageBuffer==NULL) return 0.;
+ //#3524_210902_LYW_MOD START
int nWidth = nImageWidth;
+ //int nWidthStep = nImageWidth;
int nHeight = nImageHeight;
- int nCalWidth = nWidth/2;
- int nCalHeight = nHeight/2;
+ // int nCalWidth = nWidth/2;
+ // int nCalHeight = nHeight/2;
+ //
+ // int nStartX = nWidth/2 - nCalWidth/2;
+ // int nStartY = nHeight/2 - nCalHeight/2;
- int nStartX = nWidth/2 - nCalWidth/2;
- int nStartY = nHeight/2 - nCalHeight/2;
+ int nCalWidth = nWidth;
+ int nCalHeight = nHeight;
- //
- double Focusvalue = 0;
- double SumValue = 0;
- double TempValue = 0;
- double m_nResultFocusValue = 0;
+ int nStartX = 0;
+ int nStartY = 0;
- for (int y = 0; y < nHeight - 1; y++)
+ int nStep = 3;
+
+ double dXValue = 0., dYValue = 0., dCurr = 0., dSum = 0., dFocus = 0.;
+ for (int nH = nStartY; nH < nStartY + nCalHeight - nStep; nH++)
{
- for (int x = 0; x < nWidth - 1; x++)
+ for (int nW = nStartX; nW < nStartX + nCalWidth - nStep; nW++)
{
- TempValue = (double)(pImageBufferByte[y*nWidth + x] - pImageBufferByte[y*nWidth + x + 1]);
- SumValue = TempValue * TempValue;
- TempValue = (double)(pImageBufferByte[y*nWidth + x] - pImageBufferByte[(y + 1)*nWidth + x]);
- SumValue += TempValue * TempValue;
-
- Focusvalue += sqrt(SumValue);
- //Focusvalue += SumValue;
- }
- }
-
- m_nResultFocusValue = int(Focusvalue / (double)(nWidth*nHeight));
-
- double dXValue=0., dYValue=0., dCurr=0., dSum=0., dFocus=0.;
- for(int nH=nStartY ; nH<nStartY+nCalHeight-1 ; nH++)
- {
- for(int nW=nStartX ; nW<nStartX+nCalWidth-1 ; nW++)
- {
- dXValue = float((pImageBufferByte[nH*nW + nW+1] - pImageBufferByte[nH*nW + nW])*(pImageBufferByte[nH*nW + nW+1] - pImageBufferByte[nH*nW + nW]));
- dYValue = float((pImageBufferByte[(nH+1)*nW + nW] - pImageBufferByte[nH*nW + nW])*(pImageBufferByte[(nH+1)*nW + nW] - pImageBufferByte[nH*nW + nW]));
+ dXValue = float((pImageBufferByte[nH*nWidth + nW + nStep] - pImageBufferByte[nH*nWidth + nW])*(pImageBufferByte[nH*nWidth + nW + nStep] - pImageBufferByte[nH*nWidth + nW]));
+ dYValue = float((pImageBufferByte[(nH + nStep)*nWidth + nW] - pImageBufferByte[nH*nWidth + nW])*(pImageBufferByte[(nH + nStep)*nWidth + nW] - pImageBufferByte[nH*nWidth + nW]));
dCurr = sqrt(dXValue + dYValue);
+ //break;
+
dSum += dCurr;
}
}
- dFocus = dSum/double(nCalWidth*nCalHeight);
+ 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
+// int nWidth = nImageWidth;
+// int nHeight = nImageHeight;
+// int nCalWidth = nWidth/2;
+// int nCalHeight = nHeight/2;
+//
+// int nStartX = nWidth/2 - nCalWidth/2;
+// int nStartY = nHeight/2 - nCalHeight/2;
+//
+// //
+// double Focusvalue = 0;
+// double SumValue = 0;
+// double TempValue = 0;
+// double m_nResultFocusValue = 0;
+//
+// for (int y = 0; y < nHeight - 1; y++)
+// {
+// for (int x = 0; x < nWidth - 1; x++)
+// {
+// TempValue = (double)(pImageBufferByte[y*nWidth + x] - pImageBufferByte[y*nWidth + x + 1]);
+// SumValue = TempValue * TempValue;
+// TempValue = (double)(pImageBufferByte[y*nWidth + x] - pImageBufferByte[(y + 1)*nWidth + x]);
+// SumValue += TempValue * TempValue;
+//
+// Focusvalue += sqrt(SumValue);
+// //Focusvalue += SumValue;
+// }
+// }
+//
+// m_nResultFocusValue = int(Focusvalue / (double)(nWidth*nHeight));
+//
+// double dXValue=0., dYValue=0., dCurr=0., dSum=0., dFocus=0.;
+// for(int nH=nStartY ; nH<nStartY+nCalHeight-1 ; nH++)
+// {
+// for(int nW=nStartX ; nW<nStartX+nCalWidth-1 ; nW++)
+// {
+// dXValue = float((pImageBufferByte[nH*nW + nW+1] - pImageBufferByte[nH*nW + nW])*(pImageBufferByte[nH*nW + nW+1] - pImageBufferByte[nH*nW + nW]));
+// dYValue = float((pImageBufferByte[(nH+1)*nW + nW] - pImageBufferByte[nH*nW + nW])*(pImageBufferByte[(nH+1)*nW + nW] - pImageBufferByte[nH*nW + nW]));
+// dCurr = sqrt(dXValue + dYValue);
+// dSum += dCurr;
+// }
+// }
+// dFocus = dSum/double(nCalWidth*nCalHeight);
+//
+// return dFocus;
}
--
Gitblit v1.9.3