From 572aebd50409d2f11183d6ebbb9d12fe9041e7a5 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 17 8월 2021 18:47:48 +0900
Subject: [PATCH] Ongoing100 #3561 CF AOI Review Align 카메라 끊김 현상 조치
---
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 115 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 48 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index e518d50..de39519 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -77,7 +77,7 @@
ProcessFlatness();
Sleep(1000);
- if (ProcessDiagnosisJudge() == FALSE) {
+ if (ProcessDiagnosisJudge(nProcessMode) == FALSE) {
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
@@ -97,7 +97,7 @@
ProcessWsi();
Sleep(1000);
- if (ProcessDiagnosisJudge() == FALSE) {
+ if (ProcessDiagnosisJudge(nProcessMode) == FALSE) {
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
@@ -111,7 +111,7 @@
m_pManager->m_bProcessAll = false;
ProcessSquareness();
Sleep(1000);
- if (ProcessDiagnosisJudge() == FALSE) {
+ if (ProcessDiagnosisJudge(nProcessMode) == FALSE) {
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
@@ -121,7 +121,7 @@
m_pManager->m_bProcessAll = false;
ProcessFlatness();
Sleep(1000);
- if (ProcessDiagnosisJudge() == FALSE) {
+ if (ProcessDiagnosisJudge(nProcessMode) == FALSE) {
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
@@ -171,7 +171,7 @@
//Sleep(2000);
Sleep(1000);
- if (ProcessDiagnosisJudge() == FALSE) {
+ if (ProcessDiagnosisJudge(DiagnosisMode_All) == FALSE) {
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
@@ -303,7 +303,7 @@
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//if (11000 <= GetTickCount() - stTime)
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
- if (1000 <= GetTickCount() - stTime)
+ if (1500 <= GetTickCount() - stTime)
{
break;
}
@@ -313,7 +313,7 @@
m_pDP2P->IDP2P_SetAFMTracking(nSelModuleIndex, TRUE);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//Sleep(1000);
- Sleep(500);
+ Sleep(1000);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
CString strimagename;
@@ -479,7 +479,7 @@
{
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//if (10000 <= GetTickCount() - stTime)
- if (1000 <= GetTickCount() - stTime)
+ if (11000 <= GetTickCount() - stTime)
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
{
break;
@@ -601,33 +601,33 @@
Sleep(500);
}
- if (nIdx == 0)
- {
- pResultPoint[nIdx].dPosX = 657.425
- ;
- pResultPoint[nIdx].dPosY = 540.14
- ;
- }
- else if (nIdx == 1)
- {
- pResultPoint[nIdx].dPosX = 657.425
- ;
- pResultPoint[nIdx].dPosY = 2278.636
- ;
- }
- else if (nIdx == 2)
- {
- pResultPoint[nIdx].dPosX = 2096.944
- ;
- pResultPoint[nIdx].dPosY = 540.141
- ;
- }
- else if (nIdx == 3)
- {
- pResultPoint[nIdx].dPosX = 2096.944
- ;
- pResultPoint[nIdx].dPosY = 2278.636;
- }
+// if (nIdx == 0)
+// {
+// pResultPoint[nIdx].dPosX = 657.425
+// ;
+// pResultPoint[nIdx].dPosY = 540.14
+// ;
+// }
+// else if (nIdx == 1)
+// {
+// pResultPoint[nIdx].dPosX = 657.425
+// ;
+// pResultPoint[nIdx].dPosY = 2278.636
+// ;
+// }
+// else if (nIdx == 2)
+// {
+// pResultPoint[nIdx].dPosX = 2096.944
+// ;
+// pResultPoint[nIdx].dPosY = 540.141
+// ;
+// }
+// else if (nIdx == 3)
+// {
+// pResultPoint[nIdx].dPosX = 2096.944
+// ;
+// pResultPoint[nIdx].dPosY = 2278.636;
+// }
//1. 紐⑦꽣瑜� �씠�룞
@@ -735,7 +735,7 @@
return TRUE;
}
-int CDiagnosisProcessor::ProcessDiagnosisJudge()
+int CDiagnosisProcessor::ProcessDiagnosisJudge(int nMode)
{
for (int i = 0; i < 2; i++)
{
@@ -760,22 +760,28 @@
}
CString strMessage = _T("");
-
- double dDate = (90 - pProcessResult->GetGantryDegree());
- if (abs(dDate) >= abs(pSettingInfo->GetJudgeData_Degree())) // 0412 kyh 吏곴컖�룄�뿉�꽌 �굹�삩 Dgree 媛믪씠 �꽕�젙�븳 Judge 媛믩낫�떎 �겕嫄곕굹 媛숈쓣寃쎌슦
+ if (nMode == DiagnosisMode_All || nMode == DiagnosisMode_Review || nMode == DiagnosisMode_Squareness)
{
+ double dDate = (90 - pProcessResult->GetGantryDegree());
+ if (abs(dDate) >= abs(pSettingInfo->GetJudgeData_Degree())) // 0412 kyh 吏곴컖�룄�뿉�꽌 �굹�삩 Dgree 媛믪씠 �꽕�젙�븳 Judge 媛믩낫�떎 �겕嫄곕굹 媛숈쓣寃쎌슦
+ {
- m_pDP2P->IDP2P_DiagnosisSendJudgeAlarm(); // �븣�엺 諛쒖깮
- strMessage.Format(_T("[Judge Data] [Gantry %d]Diagnosis Error ! GantryDegree[%lf] Judge[%lf]"), i, dDate, pSettingInfo->GetJudgeData_Degree());
- m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
+ m_pDP2P->IDP2P_DiagnosisSendJudgeAlarm(); // �븣�엺 諛쒖깮
+ strMessage.Format(_T("[Judge Data] [Gantry %d]Diagnosis Error ! GantryDegree[%lf] Judge[%lf]"), i, dDate, pSettingInfo->GetJudgeData_Degree());
+ m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
+ }
}
- if (pProcessWSIResult->getWSI_RTB() >= pSettingInfo->GetJudgeData_3Sigma() || pProcessWSIResult->getWSI_RTB() <= 0) // 0412 kyh WSI �몴以��렪李� 鍮꾧탳
+ if (nMode == DiagnosisMode_All || nMode == DiagnosisMode_Wsi)
{
- m_pDP2P->IDP2P_DiagnosisSendJudgeAlarm(); // �븣�엺 諛쒖깮
- strMessage.Format(_T("[Judge Data] [WSI %d]Diagnosis Error ! WSI RTB[%lf] Judge[%lf]"), i, pProcessWSIResult->getWSI_RTB(), pSettingInfo->GetJudgeData_3Sigma());
- m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
+ if (pProcessWSIResult->getWSI_RTB() >= pSettingInfo->GetJudgeData_3Sigma() || pProcessWSIResult->getWSI_RTB() <= 0) // 0412 kyh WSI �몴以��렪李� 鍮꾧탳
+ {
+ m_pDP2P->IDP2P_DiagnosisSendJudgeAlarm(); // �븣�엺 諛쒖깮
+ strMessage.Format(_T("[Judge Data] [WSI %d]Diagnosis Error ! WSI RTB[%lf] Judge[%lf]"), i, pProcessWSIResult->getWSI_RTB(), pSettingInfo->GetJudgeData_3Sigma());
+ m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
+ }
}
+
}
//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
@@ -882,8 +888,21 @@
for (int nIdx = 0; nIdx < nPanelCount; nIdx++)
{
- const SPositionData* pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
- const SPositionData* pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ //LYW 210811
+ const SPositionData* pSettingPos;
+ const SPositionData* pDataPos;
+
+ if (nSelModuleIndex == 1)
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx + 3);
+ }
+ else
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ }
+ //LYW 210811
if (pSettingPos == NULL || pDataPos == NULL) continue;
dMotorPosX[nIdx] = pSettingPos->dPosX;
--
Gitblit v1.9.3