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 | 19 ++++++++++++++++++- ReviewSystem/ReviewSystem/DitGlassRawClient.h | 5 ++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp b/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp index f1faed3..939fd26 100644 --- a/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp +++ b/ReviewSystem/ReviewSystem/DitGlassRawClient.cpp @@ -6,11 +6,16 @@ { 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) @@ -227,6 +232,16 @@ 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; @@ -251,3 +266,5 @@ m_pGlassData->m_nDefectNum = nDefectNum-nDefectDeleteNum; } + +CDitGlassRawClient* CDitGlassRawClient::m_pDitGlassClient; \ No newline at end of file diff --git a/ReviewSystem/ReviewSystem/DitGlassRawClient.h b/ReviewSystem/ReviewSystem/DitGlassRawClient.h index c66f391..0cb0144 100644 --- a/ReviewSystem/ReviewSystem/DitGlassRawClient.h +++ b/ReviewSystem/ReviewSystem/DitGlassRawClient.h @@ -1,6 +1,7 @@ #pragma once #include "DitGlassRawStruct.h" +#include <afxmt.h> class CDitGlassRawClient { @@ -9,6 +10,8 @@ ~CDitGlassRawClient(void); public: + static CDitGlassRawClient* GetInstance(); //cmark + BOOL ConnectServer(); BOOL isConnect(){return m_hMapBasicInfo == NULL || m_hMapGlassData == NULL ? FALSE : TRUE;}; @@ -51,7 +54,7 @@ BOOL ConnectGlassRawInfo(); BOOL ConnectGlassRawData(); BOOL SetCommand(emGlassRawCommand nCmd); - + static CDitGlassRawClient* m_pDitGlassClient; //cmark protected: _grmGlassData* m_pGlassData; _grmBlockData* m_pBlockData; -- Gitblit v1.9.3