From ffe71aadfdcb4a9ea2ac4d8d320983d42ef3cad5 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 14 9월 2021 15:19:39 +0900
Subject: [PATCH] 버그 수정
---
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 13 +++++++++----
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 5 +++++
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 7e3e007..af66be2 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -6525,10 +6525,6 @@
{
if (m_pSequenceProcessor==NULL) return;
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
- m_pSequenceProcessor->SetSimulationMode(TRUE);
- //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
-
if (nCommand == -1) // DBClick Date
{
@@ -6537,6 +6533,7 @@
m_pDlgDiagnosis->ShowWindow(SW_SHOW);
+ return;
/*
if (m_pSignalControl)
{
@@ -6556,6 +6553,14 @@
return;
}
+ else
+ {
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ m_pSequenceProcessor->SetSimulationMode(TRUE);
+ g_pLog->DisplayMessage(_T("SetUserCommand = %d"), nCommand);
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
+ }
+
m_pSequenceProcessor->RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, nCommand);
}
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 7753de9..d622bf0 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -3838,6 +3838,11 @@
}
dFocus = dSum / double(nCalWidth*nCalHeight);
+ //FDC 보고 MAX 수치 10
+ if (dFocus >= 10.0) dFocus = 10.0;
+ //FDC 보고 정수만 사용 가능 하나 2.8 수치까지 디포커스로 볼 수 없어 보정치 추가
+ else dFocus += 0.2;
+
return dFocus;
//#3524_210902_LYW_MOD END
//Origin
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 1690034..a795da2 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -8619,6 +8619,7 @@
case PCControlRecv_AutoMode_CPJT: // auto mode on
{
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Auto Mode"));
+ SetSimulationMode(FALSE);
bResult = SetProcessMode(ProcessAutoMode_CPJT);
if (bResult==FALSE) m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Auto Mode Error!"));
}
--
Gitblit v1.9.3