From 36353af02a1c42ba4d68de5a81c63837396a9500 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 16 6월 2021 17:27:21 +0900
Subject: [PATCH] Merge branch 'feature/#3428_CF_AOI_Review_Recipe_Editor_리뷰_우선순위_조건_타입_변경기능_적용_및_검증' into feature/#3440_CF_AOI_Review_QD,_CS_Align_Cam_Reverse_X_제어_기능_추가
---
ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h b/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
index d5e8440..30c085d 100644
--- a/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
+++ b/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
@@ -50,7 +50,7 @@
int GetPriorityDefectMaxSize() const { return m_nDefectumMaxSize; }
BOOL GetPriorityDefectSizeOption() const { return m_bUseSizeOption; }
int GetPriorityGradeData() const { return m_nDefectGradeData; }
- int GetPriorityDefectCode() const { return m_nPriorityDefectCode; }//20210608 TRDF 占쏙옙占쏙옙占쏙옙
+ CString GetPriorityDefectCode() const { return m_strPriorityDefectCode; }//20210608 TRDF 占쏙옙占쏙옙占쏙옙
// setter
void SetInfo(const CRcpPriorityInfo& rhs);
@@ -64,7 +64,7 @@
void SetPriorityDefectMaxSize(int nSize) { m_nDefectumMaxSize = nSize; }
void SetPriorityDefectSizeOption(bool bUse) { m_bUseSizeOption = bUse; }
void SetPriorityGradeData(int nData) {m_nDefectGradeData = nData; }
- void SetPriorityDefectCode(int nData) {m_nPriorityDefectCode = nData;} //20210608
+ void SetPriorityDefectCode(CString StrData) { m_strPriorityDefectCode = StrData;} //20210608
protected:
int m_nPriorityOpticData; // 占쎌선占쏙옙占쏙옙 optic 占쏙옙占쏙옙占쏙옙
int m_nPriorityGrayData; // 占쎌선占쏙옙占쏙옙 gray 占쏙옙占쏙옙占쏙옙
@@ -73,7 +73,7 @@
int m_nPriorityDefectType;
int m_nPriorityDefectTypeNum;
int m_nDefectGradeData;
- int m_nPriorityDefectCode; // 占쎌선占쏙옙占쏙옙 占싯삼옙 DefectCode 占쏙옙占쏙옙占쏙옙//20210608
+ CString m_strPriorityDefectCode; // 占쎌선占쏙옙占쏙옙 占싯삼옙 DefectCode 占쏙옙占쏙옙占쏙옙//20210608
BOOL m_bUseSizeOption;
int m_nDefectumMinSize;
--
Gitblit v1.9.3