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/ReviewInterface.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h index 0d9175a..b2249db 100644 --- a/ReviewSystem/ReviewSystem/ReviewInterface.h +++ b/ReviewSystem/ReviewSystem/ReviewInterface.h @@ -195,6 +195,10 @@ virtual void IACC2P_CameraControl(int nValue); virtual BOOL IACC2P_SetLightLevel(int nCameraIndex, int nValue); virtual BOOL IACC2P_GetLightLevel(int nCameraIndex, int& nValue); + /*< LYW 20211014 - #3671 ADD Start >*/ + virtual int IACC2P_GetAccumaulate(); + virtual void IACC2P_SetAccumaulate(int dValue); + /*< LYW 20211014 - #3671 ADD End >*/ // review camera control 2 parent virtual BOOL IRCC2P_GetCurrentFrame(int nModuleIndex, int nCameraIndex, int nFrameWidth, int nFrameHeight, int nFrameChannels, CCHImageData *pImageData); @@ -249,6 +253,7 @@ virtual void IRP2P_UpdateCameraControl(int nModuleIdx, const SCameraControl *pCameraControl, const SCameraInfo* pCameraInfo); virtual const CRsRcpReviewInfo* IRP2P_Recipe_GetRsRcpReviewInfo(); virtual const CSystemInfo* IRP2P_GetReviewSysteminfo(); + virtual const CSignalControlInfo* IRP2P_GetReviewSignalinfo(); virtual CGlassResult* IRP2P_GetCurrentGlassResult(); virtual void IRP2P_DisplayMessage(const TCHAR* lpstrFormat, ...); virtual CResultServerControl* IRP2P_GetResultServerControl(); @@ -256,6 +261,24 @@ virtual void IRP2P_CompletePlanIndex(int nReviewStatus, int nPlanIndex); virtual void IRP2P_UpdateReviewProcessStatus(int nReviewStatus, int nPlanIndex=0); virtual CRecipeManager* IRP2P_GetEdgeRecipeManager(); + virtual BOOL IRP2P_GetFirstReviewLeft(); + virtual BOOL IRP2P_GetFirstReviewRight(); + virtual void IRP2P_SetFirstReviewLeft(BOOL b_Check); + virtual void IRP2P_SetFirstReviewRight(BOOL b_Check); + /*< LYW 20211109 - #3662 ADD Start >*/ + virtual BOOL IRP2P_GetReview00ImageContrast(); + virtual BOOL IRP2P_GetReview01ImageContrast(); + virtual void IRP2P_SetReview00ImageContrast(int n_Value); + virtual void IRP2P_SetReview01ImageContrast(int n_Value); + /*< LYW 20211109 - #3662 ADD End >*/ + + BOOL m_bFirstReviewLeft; + BOOL m_bFirstReviewRight; + /*< LYW 20211109 - #3662 ADD Start >*/ + int m_nReview00ImageContrast; + int m_nReview01ImageContrast; + /*< LYW 20211109 - #3662 ADD End >*/ + int m_daccumulate; virtual BOOL IRP2P_SaveDefectMap(const CString& strPath); @@ -288,6 +311,10 @@ virtual const CNetworkInfo* ISP2P_System_GetNetworkInfo(); virtual void ISP2P_SetCurrentWsiMode(int nMode); + + //#3561 210908 LYW ADD Start + virtual void ISP2P_InitAlignCamera(); + //#3561 210908 LYW ADD End virtual CTotalPitchMeasure* ISP2P_GetTotalPitchMeasure(); @@ -350,6 +377,14 @@ virtual CGlassResult* ISP2P_GetCurrentGlassResult(); // get current glass result virtual STransferData* ISP2P_GetCurrentTransferData(); // get current transfer data + //Review Contrast + /*< LYW 20211109 - #3662 ADD Start >*/ + virtual BOOL ISP2P_GetReview00ImageContrast(); + virtual BOOL ISP2P_GetReview01ImageContrast(); + virtual void ISP2P_SetReview00ImageContrast(int n_Value); + virtual void ISP2P_SetReview01ImageContrast(int n_Value); + /*< LYW 20211109 - #3662 ADD End >*/ + // History result virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount); // new glass result virtual CGlassResult* ISP2P_GetHistoryResult(int nIndex); // get glass result @@ -398,6 +433,12 @@ virtual CDlgSelfDiagnosis* ISP2P_GetDlgDiagnosis(); virtual CDlgReviewHistoryTool* ISP2P_GetDlgHistory(); + + virtual BOOL ISP2P_GetFirstReviewLeft(); + virtual BOOL ISP2P_GetFirstReviewRight(); + virtual void ISP2P_SetFirstReviewLeft(BOOL b_Check); + virtual void ISP2P_SetFirstReviewRight(BOOL b_Check); + public: virtual BOOL ISP2P_Motor_CameraGo(int nModuleIndex, double dPosX, double dPosY, int nMoveAxis, BOOL bAutoSelectCamera=FALSE, BOOL bGoEnd=FALSE); -- Gitblit v1.9.3