From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/CHReviewResultParser/ParsingGlassResult_CPJT.cpp | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/CHReviewResultParser/ParsingGlassResult_CPJT.cpp b/ReviewSystem/CHReviewResultParser/ParsingGlassResult_CPJT.cpp
index 605df49..dd1ad6f 100644
--- a/ReviewSystem/CHReviewResultParser/ParsingGlassResult_CPJT.cpp
+++ b/ReviewSystem/CHReviewResultParser/ParsingGlassResult_CPJT.cpp
@@ -1145,6 +1145,8 @@
break;
case Judge_PR: sStr.Format("PR");
break;
+ case Judge_ND: sStr.Format("ND");
+ break;
case Judge_PT: sStr.Format("PT");
break;
case Judge_Review: sStr.Format("RV");
@@ -1414,7 +1416,10 @@
//g_pLog->DisplayMessage(_T("AOIImageName : \n"), pSharedDefect->m_strAoiImageName);
pDefectResult->strInspectImgFileName = pSharedDefect->m_strAoiImageName;
- pDefectResult->nDefectWBType = int(pSharedDefect->m_DefectBDType);
+ /*< LYW 20211220 - #0000 ADD Start >*/
+ //踰꾧렇 �닔�젙
+ pDefectResult->nDefectWBType = int(pSharedDefect->m_DefectType);
+ /*< LYW 20211220 - #0000 ADD End >*/
if(pDefectResult->nDefectWBType == 1 || pDefectResult->nDefectWBType == 3 || pDefectResult->nDefectWBType ==5) pDefectResult->nDefectWBType =2;
else pDefectResult->nDefectWBType = 1;
@@ -1453,14 +1458,15 @@
//占쏙옙티 占쏜델븝옙 Review/WSI 占쏙옙占싶몌옙占쏙옙 占쏙옙占쏙옙 占쏙옙占쏙옙
pDefectResult->nMultiModel = pSharedDefect->m_nModelIdx;
- if (pSharedDefect->m_DefectBDType == 1)
+ /*< LYW 20211220 - #$0000 MOD Start >*/
+ if (pDefectResult->nDefectWBType == 1)
{
//Dark
pDefectResult->nOpticType = 2;
pDefectResult->nGrayType = 1;
pDefectResult->strOpticType = _T("DARK");
}
- else if (pSharedDefect->m_DefectBDType == 0)
+ else if (pDefectResult->nDefectWBType == 2)
{
//White
pDefectResult->nOpticType = 1;
@@ -1474,6 +1480,29 @@
pDefectResult->nGrayType = 1;
pDefectResult->strOpticType = _T("BOTH");
}
+ /*< LYW 20211220 - #0000 MOD End >*/
+ /*< Origin Code >*/
+// if (pSharedDefect->m_DefectBDType == 1)
+// {
+// //Dark
+// pDefectResult->nOpticType = 2;
+// pDefectResult->nGrayType = 1;
+// pDefectResult->strOpticType = _T("DARK");
+// }
+// else if (pSharedDefect->m_DefectBDType == 0)
+// {
+// //White
+// pDefectResult->nOpticType = 1;
+// pDefectResult->nGrayType = 2;
+// pDefectResult->strOpticType = _T("WHITE");
+// }
+// else
+// {
+// //both
+// pDefectResult->nOpticType = 3;
+// pDefectResult->nGrayType = 1;
+// pDefectResult->strOpticType = _T("BOTH");
+// }
@@ -1548,7 +1577,7 @@
CString strCellID(pDitRawClient->GetCellData(pSharedDefect->m_nCellIdx)->m_strCellName);
pDefectResult->strCellID = strCellID;
- pDefectResult->nGrayType = 1; // Imsi
+ //pDefectResult->nGrayType = 1; // Imsi
pDefectResult->nOpticType = 1;
pDefectResult->nTotalDefectCount = nTotalDefectIdx;
pDefectResult->ProcessID = pDitRawClient->GetGlassData()->m_strOperID;
--
Gitblit v1.9.3