From c77236e1522caa3e2082dd7b5b32f6c30b125172 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 23 9월 2021 15:00:43 +0900
Subject: [PATCH] 1. 주석 양식 수정
---
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 96 insertions(+), 9 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 9c6774d..af66be2 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);
@@ -1269,7 +1272,7 @@
// process status observer
AddObserverUpdateProcessStatus(static_cast<IUpdateProcessStatus*>(m_pAlignCameraControl));
- m_pAlignCameraControl->Camera_Control(CameraControlLive);
+ /*m_pAlignCameraControl->Camera_Control(CameraControlLive);*/ // 210805 Align Camera Sequence 蹂�寃�
}
else
{
@@ -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;
@@ -3365,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;
}
@@ -3506,6 +3547,16 @@
return m_pMotorControl->IsGantryMotionEnd(nModuleIdx);
+}
+
+BOOL CReviewInterface::IDP2P_CheckManualMode()
+{
+ if (IsManualProcessMode() == TRUE)
+ {
+ return TRUE;
+ }
+
+ return FALSE;
}
int CReviewInterface::IDP2P_GetSelectedModuleIndex()
@@ -3776,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);
@@ -3795,7 +3849,6 @@
pWsiControl->SetWsiStart(1, vectorPosX, vectorPosY, 0);
- }
}
void CReviewInterface::IDP2P_WsiMotorMotionEnd(int nModuleIdx, double dPosX, double dPosY)
@@ -6480,6 +6533,7 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
+ return;
/*
if (m_pSignalControl)
{
@@ -6497,6 +6551,14 @@
{
g_pLog->DisplayMessage(_T("Machine Mode is not Manual or Review Mode!"));
return;
+ }
+
+ else
+ {
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_pSequenceProcessor->SetSimulationMode(TRUE);
+ g_pLog->DisplayMessage(_T("SetUserCommand = %d"), nCommand);
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
}
m_pSequenceProcessor->RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, nCommand);
@@ -8357,6 +8419,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, ... )
{
@@ -8857,6 +8939,11 @@
SetCurrentWsiMode(nMode);
}
+void CReviewInterface::ISP2P_InitAlignCamera()
+{
+ InitAlignCamera();
+}
+
int CReviewInterface::IWC2P_GetWsiType()
{
return GetCurrentWsiMode();
--
Gitblit v1.9.3