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_RsAlignManager.cpp | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ReviewSystem/CHReviewRecipe/Rcp_RsAlignManager.cpp b/ReviewSystem/CHReviewRecipe/Rcp_RsAlignManager.cpp
index 21a5dc9..ae31dcd 100644
--- a/ReviewSystem/CHReviewRecipe/Rcp_RsAlignManager.cpp
+++ b/ReviewSystem/CHReviewRecipe/Rcp_RsAlignManager.cpp
@@ -34,6 +34,20 @@
strItem.Format(_T("RCP_ALIGN_SECOND_IMAGE_FILE"));
macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strSecondImageFile);
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ strItem.Format(_T("RCP_ALIGN_FIRST_ASSISTANT_IMAGE_FILE"));
+ macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strFirstAssistantImageFile);
+
+ strItem.Format(_T("RCP_ALIGN_SECOND_ASSISTANT_IMAGE_FILE"));
+ macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strSecondAssistantImageFile);
+
+ strItem.Format(_T("RCP_ALIGN_MATCHING_PIXEL_STANDARD"));
+ macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strMatchingPixelStandard);
+
+ strItem.Format(_T("RCP_ALIGN_MATCHING_ALARM_CONDITION"));
+ macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strMatchingAlarmCondition);
+ /*< LYW 20211012 - #3671 ADD End >*/
+
strItem.Format(_T("RCP_ALIGN_TOTAL_PITCH_IMAGE_FILE"));
macroFile.SetItem(strItem, m_rsRcpAlignInfo.m_strTotalPitchImageFile);
@@ -127,6 +141,20 @@
strItem.Format(_T("RCP_ALIGN_SECOND_IMAGE_FILE"));
macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strSecondImageFile, _T(""));
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ strItem.Format(_T("RCP_ALIGN_FIRST_ASSISTANT_IMAGE_FILE"));
+ macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strFirstAssistantImageFile, _T(""));
+
+ strItem.Format(_T("RCP_ALIGN_SECOND_ASSISTANT_IMAGE_FILE"));
+ macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strSecondAssistantImageFile, _T(""));
+
+ strItem.Format(_T("RCP_ALIGN_MATCHING_PIXEL_STANDARD"));
+ macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strMatchingPixelStandard, _T("0"));
+
+ strItem.Format(_T("RCP_ALIGN_MATCHING_ALARM_CONDITION"));
+ macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strMatchingAlarmCondition, _T("0"));
+ /*< LYW 20211012 - #3671 ADD End >*/
+
strItem.Format(_T("RCP_ALIGN_TOTAL_PITCH_IMAGE_FILE"));
macroFile.GetItem(strItem, m_rsRcpAlignInfo.m_strTotalPitchImageFile, _T(""));
--
Gitblit v1.9.3