From ce2731b82636ca893693575810e7ed5ee8cc5e2e Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 목, 27 6월 2024 19:15:03 +0900
Subject: [PATCH] Ongoing80 #4942 CF AOI Review Bin File Loading 실패 개선 1. 누락코드 추가
---
ReviewSystem/ReviewSystem/DitGlassRawClient.cpp | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp b/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp
index 7a3c5e6..939fd26 100644
--- a/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp
+++ b/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp
@@ -2,7 +2,7 @@
#include "DitGlassRawClient.h"
CDitGlassRawClient::CDitGlassRawClient(void)
- : m_mxCommandProcess(FALSE, MUTEX_RAWMESSENGER)
+: m_mxCommandProcess(FALSE, MUTEX_RAWMESSENGER)
{
m_hMapBasicInfo = NULL;
m_hMapGlassData = NULL;
@@ -77,7 +77,7 @@
}
BOOL CDitGlassRawClient::ConnectGlassRawData()
-{
+{
SIZE_T nGlassRawSharedSize = m_pGlassRawInfo->m_nGlassRawDataSize;
if(m_hMapGlassData == NULL)
@@ -105,6 +105,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;
}
@@ -122,6 +125,11 @@
BOOL CDitGlassRawClient::ReadAOIRawBinFile()
{
return SetCommand(grcReadBin);
+}
+
+BOOL CDitGlassRawClient::WriteReviewRawBinFile()
+{
+ return SetCommand(grcReviewWriteBIn);
}
BOOL CDitGlassRawClient::SetCommand( emGlassRawCommand nCmd )
@@ -149,6 +157,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;
@@ -166,6 +198,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);
}
@@ -185,7 +220,7 @@
BOOL CDitGlassRawClient::SetReviewEnd()
{
- if(isConnect() == FALSE) return FALSE;
+ if(isConnect() == FALSE) return FALSE;
m_pGlassRawInfo->m_ClientProcStep = APS_ReviewEnd;
return SetCommand(grcSequenceReviewEnd);
}
--
Gitblit v1.9.3