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 | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index da0c3dd..313cec6 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -2874,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);
}
@@ -3313,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()
@@ -3499,6 +3520,16 @@
}
+BOOL CReviewInterface::IDP2P_CheckManualMode()
+{
+ if (IsManualProcessMode() == TRUE)
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
int CReviewInterface::IDP2P_GetSelectedModuleIndex()
{
return Module_GetSelectedModuleIndex();
--
Gitblit v1.9.3