From c112cf54a238afa473e7eb0ea6298e06f4957658 Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 24 11월 2023 14:44:30 +0900
Subject: [PATCH] Merge branch 'feature/#4539_CF_AOI_Review_Log_미출력_현상_개선' into develop
---
ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp b/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
index d2b73b9..8159f88 100644
--- a/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
+++ b/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
@@ -769,14 +769,14 @@
{
CRcpPriorityInfo* pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpPriorityInfo(nPriorityIdx);
if(pRcpPriorityInfo == NULL) continue;
-
+ CString strData = _T("");
int nData = 0;
/*strItem.Format(_T("RCP_REVIEW_PRIORITY_OPTIC_DATA_%02d"), nPriorityIdx); //210608
macroFile.GetItem(strItem, nData);
pRcpPriorityInfo->SetPriorityOpticData(nData);*/
strItem.Format(_T("RCP_REVIEW_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx); //210608
- macroFile.GetItem(strItem, nData);
- pRcpPriorityInfo->SetPriorityDefectCode(nData);
+ macroFile.GetItem(strItem, strData);
+ pRcpPriorityInfo->SetPriorityDefectCode(strData);
strItem.Format(_T("RCP_REVIEW_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
@@ -867,14 +867,14 @@
{
CRcpPriorityInfo* pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpWsiPriorityInfo(nPriorityIdx);
if(pRcpPriorityInfo == NULL) continue;
-
+ CString strData = _T("");
int nData = 0;
/*strItem.Format(_T("RCP_WSI_PRIORITY_DEFECT_TYPE_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
pRcpPriorityInfo->SetPriorityOpticData(nData);*/
strItem.Format(_T("RCP_WSI_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx); //210608
- macroFile.GetItem(strItem, nData);
- pRcpPriorityInfo->SetPriorityDefectCode(nData);
+ macroFile.GetItem(strItem, strData);
+ pRcpPriorityInfo->SetPriorityDefectCode(strData);
strItem.Format(_T("RCP_WSI_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
@@ -1120,9 +1120,11 @@
macroFile.GetItem(strItem, nData);
pScheduleInfo->SetMaxPointCount(nData);
- strItem.Format(_T("RCP_REVIEW_SINGLE_GANRTY_PATH"));
- macroFile.GetItem(strItem, nData);
- pScheduleInfo->SetSingleGantryPath(nData);
+ /*< LYW 20220610 - #4185 Delete Start >*/
+// strItem.Format(_T("RCP_REVIEW_SINGLE_GANRTY_PATH"));
+// macroFile.GetItem(strItem, nData);
+// pScheduleInfo->SetSingleGantryPath(nData);
+ /*< LYW 20220610 - #4185 Delete End >*/
strItem.Format(_T("RCP_REVIEW_MAX_WSI_POINT_COUNT"));
--
Gitblit v1.9.3