From 9c13bc5af33d28bb217995597f88fe863db42442 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 금, 01 4월 2022 10:59:55 +0900 Subject: [PATCH] AOI RawMessnger 동기화 --- DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h index a43c626..766afaf 100644 --- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h +++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h @@ -36,7 +36,11 @@ virtual BOOL SequenceFtpUpload(char* pRawFileName); virtual void NotifyUpdateOptionInfo(){/*m_StackResult.readOptionFile();*/}; - + /* <LJC 20211122 : #3820 ADD Start> */ + virtual void DownLoadMergeFile(CgrmGlassRawData* pData); + virtual void SearchFIle(CgrmGlassRawData* pData); + /* <LJC 20211122 : #3820 ADD End> */ +\ protected: @@ -55,7 +59,10 @@ CString GetRawFilePath() { return m_strRawFilePath; } void makeDataHeader(CString& strLine, _grmGlassData* pGlassData); - void makeDataGlass(CString& strLine, _grmGlassData* pGlassData); + /*< KJG 20211229 - #3846 MOD Start >*/ + //void makeDataGlass(CString& strLine, _grmGlassData* pGlassData); + void makeDataGlass(CString& strLine, CgrmGlassRawData* pData, _grmGlassData* pGlassData); + /*< KJG 20211229 - #3846 MOD End >*/ void makeDataCell(CString& strLine, CgrmGlassRawData* pData, _grmCellData* pCellData); BOOL makeDataDefect(CString& strLine, CgrmGlassRawData* pData, _grmDefectData* pDefectData); @@ -80,8 +87,10 @@ BOOL m_bReviewEndCheck; // InspectEnd 시에 Raw_im 폴더에 SubFile 생성 안하기 위해 사용 [ 21-03-18 KJG ] CTime m_tmReviewStart; CTime m_tmReviewEnd; - + /* <LJC 20211122 : #3820 ADD Start> */ + int m_nRawMergeIdx=0; int m_nWriteRawDefectIdx; + /* <LJC 20211122 : #3820 ADD End> */ }; struct stCellData -- Gitblit v1.9.3