From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 11 11월 2021 17:57:01 +0900
Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치
---
ReviewSystem/ReviewSystem/SequenceProcessor.h | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.h b/ReviewSystem/ReviewSystem/SequenceProcessor.h
index 902ed1b..c045944 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.h
@@ -370,6 +370,9 @@
virtual void ISP2P_SetCurrentWsiMode(int nMode) = 0;
+ //#3561 210908 LYW ADD Start
+ virtual void ISP2P_InitAlignCamera() = 0;
+ //#3561 210908 LYW ADD End
// system info
virtual const CSystemInfo* ISP2P_System_GetSystemInfo() = 0;
@@ -426,6 +429,14 @@
virtual CGlassResult* ISP2P_GetGlassResult(int nIndex) = 0; // get glass result
virtual CGlassResult* ISP2P_GetCurrentGlassResult() = 0; // get current glass result
virtual STransferData* ISP2P_GetCurrentTransferData() = 0; // get current transfer data
+
+ //Review Contrast
+ /*< LYW 20211109 - #3662 ADD Start >*/
+ virtual BOOL ISP2P_GetReview00ImageContrast() = 0;
+ virtual BOOL ISP2P_GetReview01ImageContrast() = 0;
+ virtual void ISP2P_SetReview00ImageContrast(int n_Value) = 0;
+ virtual void ISP2P_SetReview01ImageContrast(int n_Value) = 0;
+ /*< LYW 20211109 - #3662 ADD End >*/
virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount) = 0; // new glass result
virtual CGlassResult* ISP2P_GetHistoryResult(int nIndex) = 0; // get glass result
@@ -587,10 +598,16 @@
void SetSP2P(ISequenceProcessor2Parent* pSP2P);
void SetLineMachineType(int nLineType, int nMachineType, CString strEqpID);
void SetDefaultValue();
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ void SetSimulationMode(BOOL bCheck) { m_bSimulationMode = bCheck; };
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
// getter
int GetProcessMode() const;
int GetProcessStatus() const;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ BOOL GetSimulationMode() { return m_bSimulationMode; };
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
static int GetDirectionX(int nGlassDirection, int nMotorDirection);
static int GetDirectionY(int nGlassDirection, int nMotorDirection);
@@ -614,6 +631,8 @@
// Review, WSI Stop Siganl
BOOL SetMotionStop();
+ // Align Camera Control command
+ BOOL AlignCamera_CameraControl(int nControlCmd);
protected:
// common
@@ -625,9 +644,6 @@
// PCControl Control command
BOOL Signal_SendSignal(int nSignalIndex);
BOOL PCControl_ReadTransferData(STransferData* pTransferData);
-
- // Align Camera Control command
- BOOL AlignCamera_CameraControl(int nControlCmd);
// Review Camera Control Command
void ReviewCamera_CameraControl(int nControlCmd);
@@ -780,4 +796,8 @@
CTime m_wsiStartTime;
int m_nWsiTotalCount;
+
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD START
+ BOOL m_bSimulationMode;
+ //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 ADD END
};
\ No newline at end of file
--
Gitblit v1.9.3