From e5fa774d622d6852fe8e1f033045aed221649108 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 15 10월 2021 13:24:54 +0900
Subject: [PATCH] Ongoing80 #3662 CF AOI Review 전설비 알람 발생 조치
---
DitGlassRawMessenger/Extern/DitGlassRawClient.cpp | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp b/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp
index c37e6e5..e6a5eb9 100644
--- a/DitGlassRawMessenger/Extern/DitGlassRawClient.cpp
+++ b/DitGlassRawMessenger/Extern/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)
@@ -100,6 +105,7 @@
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];
+ m_pRawMergeData = (_grmDefectData*)&m_pGlassRawData[m_pGlassRawInfo->m_nRawMergeDataPoint];
return TRUE;
}
@@ -132,14 +138,14 @@
int nCmdId = (m_pGlassRawInfo->m_nCommandIdxWrite+1) % COMMAND_MAXCOUNT;
- if(m_pGlassRawInfo->m_nCommandIdxRead == nCmdId)//占쏙옙占쏙옙 占쏙옙占쌕는곤옙占쏙옙 占쏙옙큘占쏙옙 占쏙옙占쌜곤옙 占싼뱄옙占쏙옙 占쏙옙占쌀다는곤옙!! [占쏙옙占쏙옙占쏙옙 2018/11/12]
+ if(m_pGlassRawInfo->m_nCommandIdxRead == nCmdId)//둘이 같다는것은 서큘러 버퍼가 한바퀴 돌았다는것!! [김태현 2018/11/12]
{
- m_pGlassRawInfo->m_nCommandIdxRead++;//占쏙옙占쏙옙 占쏙옙占쏙옙占쏙옙 占쏙옙占� 占싹놂옙占쏙옙 占쏙옙占쏙옙占싼댐옙. [占쏙옙占쏙옙占쏙옙 2018/11/12]
+ m_pGlassRawInfo->m_nCommandIdxRead++;//가장 오래된 명령 하나를 삭제한다. [김태현 2018/11/12]
}
m_pGlassRawInfo->m_nCommandBuffer[nCmdId].nCommand = (short)nCmd;
m_pGlassRawInfo->m_nCommandBuffer[nCmdId].strParam;
- m_pGlassRawInfo->m_nCommandBuffer[nCmdId].nResult = -1; //-1占쏙옙占쏙옙占쏙옙, 0占쏙옙占쏙옙, 1占쏙옙占쏙옙 [占쏙옙占쏙옙占쏙옙 2018/11/13]
+ m_pGlassRawInfo->m_nCommandBuffer[nCmdId].nResult = -1; //-1수행전, 0실패, 1성공 [김태현 2018/11/13]
m_nLastCommandIdx = m_pGlassRawInfo->m_nCommandIdxWrite = nCmdId;
@@ -166,6 +172,7 @@
if(isConnect() == FALSE) return FALSE;
m_pGlassRawInfo->m_ClientProcStep = APS_GlassLoading;
m_pGlassData->m_bStackRead = FALSE;
+ m_pGlassData->m_bRawMergeRead = FALSE;
return SetCommand(grcSequenceGlassLoading);
}
@@ -197,10 +204,20 @@
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;
- int nRightDefectNum = 0;//占쏙옙占쏙옙占쏙옙 占쏙옙占쏙옙占십울옙 占쏙옙치占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙
+ int nRightDefectNum = 0;//기준점 오른쪽에 위치한 결함 갯수
int nDefectDeleteNum = 0;
for(int i=nDefectNum-1; i>=0; i--)
{
@@ -221,3 +238,5 @@
m_pGlassData->m_nDefectNum = nDefectNum-nDefectDeleteNum;
}
+
+CDitGlassRawClient* CDitGlassRawClient::m_pDitGlassClient;
\ No newline at end of file
--
Gitblit v1.9.3