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/DitGlassRawMessenger/GlassRawCPJT.h | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
index 88b6901..766afaf 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
@@ -7,6 +7,7 @@
#include "MacroResultFile.h"
#include "CustomizeReview.h"
#include "InterfaceFTP.h"
+#include "RawResultReader.h"
class CGlassRawCPJT : public CGlassRawBase, public CInterfaceFTP
{
@@ -35,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:
@@ -54,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);
@@ -75,11 +83,14 @@
CMacroResultFile m_MuraResultFile; //무라용 결과파일 생성관리 [김태현 2018/12/5]
CStackResultCPJT m_StackResult;
+ CRawResultReader m_RawMergeResult;
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