From 0c66940a8e2cf64c9890519901f433b3668216b6 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 수, 26 6월 2024 15:13:18 +0900
Subject: [PATCH] Ongoing80 #4942 CF AOI Review Bin File Loading 실패 개선 1. GlassRawMessenger 동기화 2. BIN파일 FindFile 제거(RawMessenger, Review 공통) 3. Unloading 시 BIN파일 제거
---
DitGlassRawMessenger/Extern/DitGlassRawClient.cpp | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp b/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp
index e6a5eb9..f1faed3 100644
--- a/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp
+++ b/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp
@@ -6,16 +6,11 @@
{
m_hMapBasicInfo = NULL;
m_hMapGlassData = NULL;
- m_pDitGlassClient =NULL;
+
m_pGlassRawInfo = NULL;
m_pGlassRawData = NULL;
m_nLastCommandIdx = -1;
-
- m_pGlassData = NULL;
- m_pBlockData = NULL;
- m_pCellData = NULL;
- m_pDefectData = NULL;
}
CDitGlassRawClient::~CDitGlassRawClient(void)
@@ -105,7 +100,9 @@
m_pCellData = (_grmCellData*)&m_pGlassRawData[m_pGlassRawInfo->m_nCellDataPoint];
m_pDefectData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nDefectDataPoint];
m_pStackData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nStackDataPoint];
+ /*< KJG 20211024 - #3487 ADD Start >*/
m_pRawMergeData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nRawMergeDataPoint];
+ /*< KJG 20211024 - #3487 ADD End >*/
return TRUE;
}
@@ -155,6 +152,30 @@
return TRUE;
}
+/* < KJG 20240620 - #4942 ADD Start >*/
+void CDitGlassRawClient::ResetClientResultStep()
+{
+ if (isConnect() == FALSE) return;
+
+ if (m_pGlassRawInfo)
+ {
+ m_pGlassRawInfo->m_ClientResultStep = APS_RES_None;
+ }
+}
+
+emClientResult CDitGlassRawClient::GetClientResultStep()
+{
+ if (isConnect() == FALSE) return APS_RES_None;
+
+ if (m_pGlassRawInfo)
+ {
+ return m_pGlassRawInfo->m_ClientResultStep;
+ }
+
+ return APS_RES_None;
+}
+/* < KJG 20240620 - #4942 ADD End >*/
+
emAOIProcStep CDitGlassRawClient::GetProcessStep()
{
if(isConnect() == FALSE) return APS_None;
@@ -172,7 +193,9 @@
if(isConnect() == FALSE) return FALSE;
m_pGlassRawInfo->m_ClientProcStep = APS_GlassLoading;
m_pGlassData->m_bStackRead = FALSE;
+ /*< KJG 20211024 - #3487 ADD Start >*/
m_pGlassData->m_bRawMergeRead = FALSE;
+ /*< KJG 20211024 - #3487 ADD End >*/
return SetCommand(grcSequenceGlassLoading);
}
@@ -204,16 +227,6 @@
return SetCommand(grcSequenceCustomReviewDataRead);
}
-CDitGlassRawClient* CDitGlassRawClient::GetInstance()
-{
- if(m_pDitGlassClient == NULL)
- {
- m_pDitGlassClient = new CDitGlassRawClient;
- }
-
- return m_pDitGlassClient;
-}
-
void CDitGlassRawClient::RemoveReviewDefects()
{
int nDefectNum = m_pGlassData->m_nDefectNum;
@@ -238,5 +251,3 @@
m_pGlassData->m_nDefectNum = nDefectNum-nDefectDeleteNum;
}
-
-CDitGlassRawClient* CDitGlassRawClient::m_pDitGlassClient;
\ No newline at end of file
--
Gitblit v1.9.3