From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop

---
 DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.h b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.h
index cda09f0..491c465 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.h
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawServer.h
@@ -18,7 +18,9 @@
 	_grmCellData*	GetCellData(int nIndex){return &m_pCellData[nIndex];};
 	_grmDefectData*	GetDefectData(int nIndex){return &m_pDefectData[nIndex];};
 	_grmDefectData*	GetStackData(int nIndex) { return &m_pStackData[nIndex]; };
-
+	/*< KJG 20211024 - #3487 ADD Start >*/
+	_grmDefectData*	GetRawMergeData(int nIndex) { return &m_pRawMergeData[nIndex]; };
+	/*< KJG 20211024 - #3487 ADD End >*/
 	_grmDitGlassRawInfo* GetGlassRawInfo(){return m_pGlassRawInfo;};
 
 protected:
@@ -31,7 +33,9 @@
 	_grmCellData*   m_pCellData;
 	_grmDefectData* m_pDefectData;
 	_grmDefectData* m_pStackData;
-
+	/*< KJG 20211024 - #3487 ADD Start >*/
+	_grmDefectData* m_pRawMergeData;
+	/*< KJG 20211024 - #3487 ADD End >*/
 
 protected:
 	HANDLE		m_hMapBasicInfo;

--
Gitblit v1.9.3