From 2bd50ead7f0b92fb9ed5b477b63dea8fbcf8217e Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 19 7월 2021 10:40:50 +0900
Subject: [PATCH] Ongoing60 #3517 CF AOI Review 자가진단 기능 개선

---
 ReviewSystem/ReviewSystem/ReviewInterface.cpp |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 8fcf05d..313cec6 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -1,6 +1,7 @@
 癤�#include "StdAfx.h"
 #include <math.h>
 #include "crtdbg.h"
+#include <experimental/filesystem>
 
 #include "ReviewInterface.h"
 #include "MainFrm.h"
@@ -143,6 +144,13 @@
 	CreateDirectory(_REVIEW_SERVER_BASE_PATH_, NULL);
 	CreateDirectory(_REVIEW_SERVER_LOG_PATH_, NULL);
 	CreateDirectory(_REVIEW_SERVER_CONFIG_PATH_, NULL);
+	//LYW_#3344_CF AOI Review Config File 諛깆뾽 湲곕뒫 媛쒖꽑 ADD START
+	//�떆�옉�븷�븣 �떎 吏��슦怨� �떎�떆 蹂듭궗媛� �븘�슂�븷吏�
+	//std::experimental::filesystem::remove_all(_REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT);
+	//std::experimental::filesystem::remove_all(_REVIEW_RECIPE_BACKUP_PATH_CPJT);
+	ISP2P_CopyFolder(_REVIEW_SERVER_CONFIG_PATH_, _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT);
+	ISP2P_CopyFolder(_REVIEW_RECIPE_PATH_, _REVIEW_RECIPE_BACKUP_PATH_CPJT);
+	//LYW_#3344_CF AOI Review Config File 諛깆뾽 湲곕뒫 媛쒖꽑 ADD END
 	SetProgramVersion();
 
 	// init review data
@@ -2866,24 +2874,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,14 +3325,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()
@@ -3489,6 +3518,16 @@
 
 	return m_pMotorControl->IsGantryMotionEnd(nModuleIdx);
 
+}
+
+BOOL CReviewInterface::IDP2P_CheckManualMode()
+{
+	if (IsManualProcessMode() == TRUE)
+	{
+		return TRUE;
+	}
+	
+	return FALSE;
 }
 
 int CReviewInterface::IDP2P_GetSelectedModuleIndex()
@@ -3671,6 +3710,7 @@
 	//return pAFMControl->MoveToHomePosition(nHomePosition);
 }
 
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD START
 BOOL CReviewInterface::IDP2P_DiagnosisSendJudgeAlarm() // 0412 �옄媛�吏꾨떒 JudgeAlarm 異붽�
 {
 
@@ -3678,6 +3718,7 @@
 
 	//return pAFMControl->MoveToHomePosition(nHomePosition);
 }
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
 
 BOOL CReviewInterface::IDP2P_SetDlgFlatness(int nIndex)
 {

--
Gitblit v1.9.3