From 754fa0614469b76fcd789a4f50f9bee59aa09e9b Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 09 6월 2021 09:31:25 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/#3417_CF_AOI_Review_전설비_Log_Process개선
---
ReviewSystem/ReviewSystem/ReviewInterface.h | 3 +++
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 2 ++
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 4 ++--
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 2 --
DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp | 12 +++++++++++-
5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
index 4430a8c..f165cb9 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
@@ -207,6 +207,8 @@
strcpy(pData->GetGlassData()->m_strPath, LOCAL_AOIRAWBIN_PATH);
+ pData->GetGlassData()->m_tmReviewLoading = m_tmReviewStart;
+
return TRUE;
}
@@ -216,6 +218,7 @@
m_bReviewEndCheck = TRUE;
m_tmReviewEnd = m_tmReviewStart = CTime::GetCurrentTime();
m_tmFileCreateTime = CTime::GetCurrentTime();
+ pData->GetGlassData()->m_tmReviewEnd = m_tmReviewEnd;
//�뿬湲곗뿉�꽌 �씪�씤蹂꾨줈 �뙆�씪紐�, �샊�� Path �쐞移� 寃곗젙�븯硫대맖. AOIServer �샊�� ReviewServer�뿉�꽌 �븞�빐�룄�맖 [源��깭�쁽2019/9/4]
pData->GetGlassData()->m_strFileName;
@@ -767,10 +770,17 @@
{
SPRINTRAW(16, "*");
}
- else
+ else if(strlen(pGlassData->m_strRecipeName) <= 16)
{
SPRINTRAW(16, "%s", pGlassData->m_strRecipeName);
}
+ else if (strlen(pGlassData->m_strRecipeName) > 16)
+ {
+ CString temp = pGlassData->m_strRecipeName; // �젅�떆�뵾 17�옄由� �꽆�뼱媛�硫� DCOLL 諛쒖깮�쑝濡� �삁�쇅泥섎━ [ 21-06-02 KJG ]
+ temp = temp.Left(16);
+ SPRINTRAW(16, "%s", temp.GetBuffer(0));
+ }
+
// 52 12 SHRINK // Server or Frame Shrink �룞�옉 �뿬遺�
if (strlen(pGlassData->m_strShrinked) == 0)
{
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index a70648c..ad4b0c8 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -116,7 +116,7 @@
Sleep(2000);
- //0412 kyh �옄媛�吏꾨떒 Judge�뙋�젙
+ //#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD START
for (int i = 0; i < 2; i++)
{
int nSelModuleIndex = i;
@@ -141,7 +141,6 @@
CString strMessage = _T("");
- //0412 kyh Judge 媛믪뿉 �뵲瑜� �븣�엺 諛쒖깮
double dDate = (90 - pProcessResult->GetGantryDegree());
if (abs(dDate) >= abs(pSettingInfo->GetJudgeData_Degree())) // 0412 kyh 吏곴컖�룄�뿉�꽌 �굹�삩 Dgree 媛믪씠 �꽕�젙�븳 Judge 媛믩낫�떎 �겕嫄곕굹 媛숈쓣寃쎌슦
{
@@ -158,6 +157,7 @@
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
}
+ //#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
//而댄뵆由욱듃 �떊�샇 蹂대궡湲�
m_pDP2P->IDP2P_DiagnosisSendCompleteSig();
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index ee3f5e5..da0c3dd 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -3679,6 +3679,7 @@
//return pAFMControl->MoveToHomePosition(nHomePosition);
}
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD START
BOOL CReviewInterface::IDP2P_DiagnosisSendJudgeAlarm() // 0412 �옄媛�吏꾨떒 JudgeAlarm 異붽�
{
@@ -3686,6 +3687,7 @@
//return pAFMControl->MoveToHomePosition(nHomePosition);
}
+//#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
BOOL CReviewInterface::IDP2P_SetDlgFlatness(int nIndex)
{
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h
index 25b57ac..95243e2 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.h
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.h
@@ -218,7 +218,10 @@
virtual BOOL IDP2P_GetAFMZPosition(int nModuleIdx, double& dValue);
virtual BOOL IDP2P_AFMHomePosition(int nModuleIndex);
virtual BOOL IDP2P_DiagnosisSendCompleteSig();
+
+ //#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD START
virtual BOOL IDP2P_DiagnosisSendJudgeAlarm(); //0412 �옄媛�吏꾨떒 肄붾뱶異붽�
+ //#3407 KYH �옄媛�吏꾨떒 Judge �뙋�젙 諛� �븣�엺 諛쒖깮 湲곕뒫 ADD END
// wsi
virtual void IDP2P_SetWsiManualMeasure(int nModuleIdx,double dPosX, double dPosY);
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 75e5dcf..61ee2e5 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -7987,8 +7987,6 @@
pSignalControl->WritePacketData(_T("16128"), sizeof(nWSI1_PC_HDD_CHECK), (short*)&nWSI1_PC_HDD_CHECK);
pSignalControl->WritePacketData(_T("16132"), sizeof(nWSI2_PC_HDD_CHECK), (short*)&nWSI2_PC_HDD_CHECK);
-
-
pSignalControl->WritePacketData(_T("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
--
Gitblit v1.9.3