From 754fa0614469b76fcd789a4f50f9bee59aa09e9b Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 수, 09 6월 2021 09:31:25 +0900 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/#3417_CF_AOI_Review_전설비_Log_Process개선 --- DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp index 4430a8c..f165cb9 100644 --- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp +++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp @@ -207,6 +207,8 @@ strcpy(pData->GetGlassData()->m_strPath, LOCAL_AOIRAWBIN_PATH); + pData->GetGlassData()->m_tmReviewLoading = m_tmReviewStart; + return TRUE; } @@ -216,6 +218,7 @@ m_bReviewEndCheck = TRUE; m_tmReviewEnd = m_tmReviewStart = CTime::GetCurrentTime(); m_tmFileCreateTime = CTime::GetCurrentTime(); + pData->GetGlassData()->m_tmReviewEnd = m_tmReviewEnd; //�뿬湲곗뿉�꽌 �씪�씤蹂꾨줈 �뙆�씪紐�, �샊�� Path �쐞移� 寃곗젙�븯硫대맖. AOIServer �샊�� ReviewServer�뿉�꽌 �븞�빐�룄�맖 [源��깭�쁽2019/9/4] pData->GetGlassData()->m_strFileName; @@ -767,10 +770,17 @@ { SPRINTRAW(16, "*"); } - else + else if(strlen(pGlassData->m_strRecipeName) <= 16) { SPRINTRAW(16, "%s", pGlassData->m_strRecipeName); } + else if (strlen(pGlassData->m_strRecipeName) > 16) + { + CString temp = pGlassData->m_strRecipeName; // �젅�떆�뵾 17�옄由� �꽆�뼱媛�硫� DCOLL 諛쒖깮�쑝濡� �삁�쇅泥섎━ [ 21-06-02 KJG ] + temp = temp.Left(16); + SPRINTRAW(16, "%s", temp.GetBuffer(0)); + } + // 52 12 SHRINK // Server or Frame Shrink �룞�옉 �뿬遺� if (strlen(pGlassData->m_strShrinked) == 0) { -- Gitblit v1.9.3