From 6d5796902a980f189f470a4e8ea7084548c52f49 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 월, 26 6월 2023 17:43:48 +0900
Subject: [PATCH] Ongoing80 #4528 CF AOI Review Motor Offset 기능 추가 1. Motor Offset 설정 Dlg 추가. 2. Offset 파라미터 추가. 3. Motor Offset 기능 적용
---
ReviewSystem/ReviewSystem/SequenceProcessor.cpp | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor.cpp
index 3f38f28..ddeb1d9 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.cpp
@@ -83,7 +83,10 @@
m_nAlive = 0;
m_nWsiTotalCount = 0;
-
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_bSimulationMode = FALSE;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
+ m_bReviewComplete = FALSE;
InitializeCriticalSection(&m_csProcessStatus);
}
@@ -1882,9 +1885,11 @@
if(pWsiControl == NULL) continue ;
CRcpAFMRecipeInfo *pRcpWsiAFMInfo = pRsRcpReviewInfo->GetRcpWsiAFMRecipeInfo(nWsiControlIdx);
- if(pRcpWsiAFMInfo == NULL) continue ;
+// if(pRcpWsiAFMInfo == NULL) continue ;
+//
+// int nRealMagIndex = GetRealMagnification(nWsiControlIdx, pRcpWsiAFMInfo->m_nZoomIndex);
- int nRealMagIndex = GetRealMagnification(nWsiControlIdx, pRcpWsiAFMInfo->m_nZoomIndex);
+ int nRealMagIndex = 0;
//pWsiControl->SetWsiReady(*pGlassResult->GetJobID(),_T("LGDemo"),2, 0); //TEST0716
@@ -1961,7 +1966,7 @@
//{
- // WSI result count
+ // WSI result count //TEST
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
{
CWsiControl* pWsiControl = m_pSP2P->ISP2P_GetWSIControl(nModuleIdx);
@@ -2003,6 +2008,8 @@
// set offset
ApplyMotorOffset(pWsi->nModuleIdx, -1, MotorOffsetCamera + MotorOffsetWSI+MotorOffset_Glass, dDefectPosX, dDefectPosY);
+
+ m_pSP2P->CalcMotorOffSetValue(pWsi->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
// motor calibrate
CalibrateMotorPos(pWsi->nModuleIdx, dDefectPosX, dDefectPosY);
@@ -2057,14 +2064,15 @@
int nTotalWsiCount = 0;
- for(int nWsiControlIdx = 0; nWsiControlIdx < nWsiControlCount; nWsiControlIdx++)
- {
- CWsiControl* pWsiControl = m_pSP2P->ISP2P_GetWSIControl(nWsiControlIdx);
- if(pWsiControl == NULL) continue ;
+// for(int nWsiControlIdx = 0; nWsiControlIdx < nWsiControlCount; nWsiControlIdx++)
+// {
- // WSI result count
+ // WSI result count //TEST
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
{
+ CWsiControl* pWsiControl = m_pSP2P->ISP2P_GetWSIControl(nModuleIdx);
+ if (pWsiControl == NULL) continue;
+
CReviewResult* pWsiUserResult = pGlassResult->GetWsiUserResult(nModuleIdx);
if(pWsiUserResult == NULL) continue ;
const SCoordInfo* pCoordInfo = Module_GetCoordInfo(nModuleIdx);
@@ -2117,10 +2125,10 @@
// [2016:11:18]-[WEZASW] : �쟾�떖 �빆紐� �닔�젙 => nModuleIndex, nDefectCount, nDefectIndex ( n+0), nUMOriginX ( n+1), nUMOriginY ( n+2)
bWSIStart = pWsiControl->SetWsiStart(nDefectCount, vectorPosX, vectorPosY, 1);
-
+
nTotalWsiCount+=nDefectCount;
}
- }
+ //}
return bWSIStart;
}
--
Gitblit v1.9.3