From 6e0a9dd083fae3138418444eb783e99509bb522b Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 09 7월 2021 12:02:49 +0900
Subject: [PATCH] Merge branch 'feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용' into feature/#3495_CF_AOI_Review(QD,_Blue)_GlassLoading_시_다운_현상_조치
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 8751217..8e83b9e 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -788,6 +788,20 @@
if (( nTotalCount += pGlassResult->GetTotalSReviewResultCount()) > 0)
{
m_pSP2P->ISP2P_DisplayMessage(_T("[Sequence Processor] Review Plan Start!"));
+ //LYW DCOLL 임시조치
+ CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
+ if (pDitRawClient->isConnect() == TRUE)
+ {
+
+ _grmDefectData* pSharedDefect = pDitRawClient->GetDefectData(0);//pReviewResult->nDefectidx2
+ _grmDefectReviewData * pSharedDefectReview = &pSharedDefect->m_ReviewDefect;
+
+ //size_t CharactersConverted;
+ //wcstombs_s(&CharactersConverted, pSharedDefectReview->m_strRevImageName, pReviewResult->strImgFileName, _TRUNCATE);
+
+ strcpy(pSharedDefectReview->m_strRevImageName, "");
+ }
+ //LYW DCOLL 임시조치
::Sleep(nWaitTime);
m_pSP2P->ISP2P_GetReviewProcessor()->ResetGantryDone();
bExcute = ReviewStartProcessing(pGlassResult, nPlanIdx);
@@ -1047,9 +1061,15 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] Send Loading Success Signal!"));
strFileName.Format(_T("%s_%s"), strGlassIDTemp, strGlassStepIdTemp);
+<<<<<<< HEAD
+ //업데이트시
+ bFileFind = FindRawBinFile(strFileName);
+ //bFileFind = TRUE;
+=======
//占쏙옙占쏙옙占쏙옙트占쏙옙
//bFileFind = FindRawBinFile(strFileName);
bFileFind = TRUE;
+>>>>>>> feature/#3486_CF_AOI_Review_Review_History_�봽濡쒓렇�옩_�뀒�뒪�듃_諛�_�쟻�슜
pDitRawClient->SetReviewStart();
Sleep(1000);
@@ -1244,7 +1264,6 @@
if(pAlignCameraControl->AlignCameraDisconnectCheck() == FALSE)
{
SendResultToSignalControl(PCControlSendData_AlignResult_CPJT, SIGNAL_SEND_RESULT_FAIL);
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail! Align Cam Disconnect"));
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Algin Camera Disconnect!!!!"));
}
}
@@ -3132,7 +3151,7 @@
strReadData = pTransferData->strRerferData;
break;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
+ // m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
}
}
@@ -4590,7 +4609,6 @@
//WSI 占승울옙 占쏙옙트占쏙옙 占쏙옙占쏙옙占싱듸옙
pMotorControl->GantrySetTwoGantrySyncModeSend(1);
-
// WSI result count
for (int nModuleIdx = 0; nModuleIdx < Module_GetModuleStatusCount(); nModuleIdx++)
{
@@ -4636,7 +4654,6 @@
return 0;
}
}
-
// get result index
int nStartIdx = pWsiResult->GetStartSReviewResultIndex();
@@ -6094,7 +6111,6 @@
pReviewScheduler->GetPathSchedulerParam()->SetSelectModuleType(type);
nSchedulingCount = pReviewScheduler->PathScheduling(vecPathData, vecStartPathData);
-
if (nSchedulingCount>0)
{
--
Gitblit v1.9.3