From bd13fa3f9396f1f681759f4623c55d5f91d74a9c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 29 7월 2021 11:42:19 +0900
Subject: [PATCH] Ongoing90 #3524 CF AOI Review 디포커스 알람 추가 및 FDC 보고 방식 개선

---
 ReviewSystem/ReviewSystem/ReviewInterface.cpp |  112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index ee3f5e5..a933e74 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -124,6 +124,9 @@
 	m_bIsOffSetOn = 0;
 	m_bIsSimulation = 0;
 
+	m_bFirstReviewLeft = 0;
+	m_bFirstReviewRight = 0;
+
 	// cs init
 	InitializeCriticalSection(&m_csReviewResult);
 	InitializeCriticalSection(&m_csReviewSignal);
@@ -2874,24 +2877,36 @@
 
 			double dAccdata = measureResut.dAccuracy;
 			double dRbtdata = measureResut.dRepeatability;
+			double dDiagnosisHeight[10];
+
+			for (int i = 0; i < 10; i++)
+			{
+				dDiagnosisHeight[i] = measureResut.dDiagnosisHeight[i];
+			}
+
 			if (nModuleIndex == 0)
 			{
 				m_pDiagnosisManager->GetDiagnosisResult_Wsi(0)->SetACC(dAccdata);
 				m_pDiagnosisManager->GetDiagnosisResult_Wsi(0)->SetRTB(dRbtdata);
+				for (int i = 0; i < 10; i++)
+				{
+					m_pDiagnosisManager->GetDiagnosisResult_Wsi(0)->SetDiagnosisHeight(dDiagnosisHeight[i], i);
+				}
 				m_vecWSIControl[0]->SendWsiAfmSafePosMove();
 			}
 			else if (nModuleIndex == 1)
 			{
 				m_pDiagnosisManager->GetDiagnosisResult_Wsi(1)->SetACC(dAccdata);
 				m_pDiagnosisManager->GetDiagnosisResult_Wsi(1)->SetRTB(dRbtdata);
+				for (int i = 0; i < 10; i++)
+				{
+					m_pDiagnosisManager->GetDiagnosisResult_Wsi(1)->SetDiagnosisHeight(dDiagnosisHeight[i], i);
+				}
 				m_vecWSIControl[1]->SendWsiAfmSafePosMove();
 			}
 		
 
 			m_pDlgDiagnosis->m_pDlgWsi->UpdateWSIResult(nModuleIndex,dAccdata, dAccdata, dRbtdata, dRbtdata);
-			
-			
-			
 
 			m_pDlgDiagnosis->m_pDiagnosisManager->setWSIVLSIEnd(true);
 		}
@@ -3305,6 +3320,12 @@
 	return m_pDoc->System_GetSystemInfo();
 }
 
+const CSignalControlInfo* CReviewInterface::IRP2P_GetReviewSignalinfo()
+{
+	if (m_pDoc == NULL) return NULL;
+	return m_pDoc->System_GetSignalInfo();
+}
+
 CGlassResult* CReviewInterface::IRP2P_GetCurrentGlassResult()
 {
 	if (m_pDoc==NULL) return NULL;
@@ -3313,14 +3334,23 @@
 
 void CReviewInterface::IRP2P_DisplayMessage(const TCHAR* lpstrFormat, ...)
 {
-	va_list list;
-	TCHAR strText[2000] = {0};
+	try
+	{
+		va_list list;
+		TCHAR strText[2000] = { 0 };
 
-	va_start(list, lpstrFormat);
-	_vstprintf_s(strText, lpstrFormat, list);
-	va_end(list);
+		va_start(list, lpstrFormat);
+		_vstprintf_s(strText, lpstrFormat, list);
+		va_end(list);
 
-	g_pLog->DisplayMessage(strText);
+		g_pLog->DisplayMessage(strText);
+	}
+
+	catch (...)
+	{
+		return ;
+	}
+
 }
 
 CResultServerControl* CReviewInterface::IRP2P_GetResultServerControl()
@@ -3356,6 +3386,26 @@
 CRecipeManager* CReviewInterface::IRP2P_GetEdgeRecipeManager()
 {
 	return m_pEdgeRecipeManager;
+}
+
+BOOL CReviewInterface::IRP2P_GetFirstReviewLeft()
+{
+	return m_bFirstReviewLeft;
+}
+
+BOOL CReviewInterface::IRP2P_GetFirstReviewRight()
+{
+	return m_bFirstReviewRight;
+}
+
+void CReviewInterface::IRP2P_SetFirstReviewLeft(BOOL b_Check)
+{
+	m_bFirstReviewLeft = b_Check;
+}
+
+void CReviewInterface::IRP2P_SetFirstReviewRight(BOOL b_Check)
+{
+	m_bFirstReviewRight = b_Check;
 }
 
 
@@ -3497,6 +3547,16 @@
 
 	return m_pMotorControl->IsGantryMotionEnd(nModuleIdx);
 
+}
+
+BOOL CReviewInterface::IDP2P_CheckManualMode()
+{
+	if (IsManualProcessMode() == TRUE)
+	{
+		return TRUE;
+	}
+	
+	return FALSE;
 }
 
 int CReviewInterface::IDP2P_GetSelectedModuleIndex()
@@ -3679,6 +3739,7 @@
 	//return pAFMControl->MoveToHomePosition(nHomePosition);
 }
 
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD START
 BOOL CReviewInterface::IDP2P_DiagnosisSendJudgeAlarm() // 0412 �옄媛�吏꾨떒 JudgeAlarm 異붽�
 {
 
@@ -3686,6 +3747,7 @@
 
 	//return pAFMControl->MoveToHomePosition(nHomePosition);
 }
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
 
 BOOL CReviewInterface::IDP2P_SetDlgFlatness(int nIndex)
 {
@@ -3765,12 +3827,15 @@
 	if (m_SequenceProcessor == NULL) return;
 	m_SequenceProcessor->SetWsiType(9);
 
-	if (!m_SequenceProcessor->WSIAllReadySignal(1))
+	if (nModuleIdx == 0)
 	{
-		g_pLog->DisplayMessage(_T("[WSI] Send Ready Signal to All WIS Fail"));
+		if (!m_SequenceProcessor->WSIAllReadySignal(1))
+		{
+			g_pLog->DisplayMessage(_T("[WSI] Send Ready Signal to All WIS Fail"));
+			return;
+		}
 	}
-	else
-	{
+
 		SetCurrentWsiMode(WsiMeasureType_VLSI);
 
 		CWsiControl* pWsiControl = ISP2P_GetWSIControl(nModuleIdx);
@@ -3784,7 +3849,6 @@
 
 		pWsiControl->SetWsiStart(1, vectorPosX, vectorPosY, 0);
 
-	}
 }
 
 void CReviewInterface::IDP2P_WsiMotorMotionEnd(int nModuleIdx, double dPosX, double dPosY)
@@ -8346,6 +8410,26 @@
 	return m_pDlgHistoryTool;
 }
 
+BOOL CReviewInterface::ISP2P_GetFirstReviewLeft()
+{
+	return m_bFirstReviewLeft;
+}
+
+BOOL CReviewInterface::ISP2P_GetFirstReviewRight()
+{
+	return m_bFirstReviewRight;
+}
+
+void CReviewInterface::ISP2P_SetFirstReviewLeft(BOOL b_Check)
+{
+	m_bFirstReviewLeft = b_Check;
+}
+
+void CReviewInterface::ISP2P_SetFirstReviewRight(BOOL b_Check)
+{
+	m_bFirstReviewRight = b_Check;
+}
+
 void CReviewInterface::ILCC2P_DisplayMessage( int nIndex, const TCHAR* lpstrFormat, ... )
 {
 

--
Gitblit v1.9.3