From 8ede40e3f7cfe1772ef7db2b1d74e905639cf343 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 금, 15 4월 2022 16:40:43 +0900 Subject: [PATCH] Ongoing90 #4086 CF AOI Review FDC SW Version 추가 요청 --- ReviewSystem/ReviewSystem/ReviewInterface.h | 63 ++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h index d6ad7e4..f4b3124 100644 --- a/ReviewSystem/ReviewSystem/ReviewInterface.h +++ b/ReviewSystem/ReviewSystem/ReviewInterface.h @@ -46,6 +46,7 @@ #include "DlgCommand.h" #include "DlgReviewPopUp.h" #include "DlgReviewHistoryTool.h" +#include "DlgHardwareSettingMode.h" #include "CHTotalPitchMeasure/TotalPitchMeasure.h" #include "CHResultFileManager/StringRaw.h" @@ -107,7 +108,8 @@ public IDialogReviewPopUP2Parent, public IDiagnosisProcessor2Parent, public IDialogReviewOffSet2Parent, - public IDialogReviewHistory2Parent + public IDialogReviewHistory2Parent, + public IDialogHardwareSettingMode2Parent { public: CReviewInterface(void); @@ -265,9 +267,19 @@ 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); @@ -283,6 +295,7 @@ virtual BOOL GetOffSetValue(int nModule, int nCam, int nScan, double dGlassXPos, double &dXpos, double &dYpos); virtual BOOL IDRO2P_SetGlassMode(BOOL bMode, int nCamidx, int nScanidx, double nXpos, double nYpos); + virtual BOOL IDRO2P_SetOffsetPram(int nCamIdx, int nScanIdx, BOOL bUse = 0); protected: // Sequence Processor @@ -366,6 +379,20 @@ virtual CGlassResult* ISP2P_GetGlassResult(int nIndex); // get glass result 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 >*/ + /*< LYW 20220415 - #4086 ADD Start >*/ + virtual BOOL ISP2P_GetReviewSWVersion(); + virtual BOOL ISP2P_GetSyncSWVersion(); + virtual BOOL ISP2P_GetGRMSWVersion(); + virtual BOOL ISP2P_GetFTPUploaderSWVersion(); + /*< LYW 20220415 - #4086 ADD End >*/ // History result virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount); // new glass result @@ -498,6 +525,29 @@ virtual void IDL2P_DisplayMessage(const TCHAR* lpstrFormat, ...); virtual void IDL2P_OpenOffSetTool(); virtual void IDL2P_OpenHistoryTool(); + /*< LYW 20211112 - #3708 ADD Start >*/ + virtual void IDL2P_OpenHWSettingTool(); + virtual BOOL IDL2P_IsManualProcessMode(); + /*< LYW 20211112 - #3708 ADD End >*/ + + // dialog HardwareSettingMode 2 Parent + // review camera + virtual int IDHM2P_InitReviewCamera(); + virtual void IDHM2P_DeinitReviewCamera(); + virtual int IDHM2P_ConnectReviewCamera(); + virtual void IDHM2P_DisconnectReviewCamera(); + virtual void IDHM2P_ClearCameraControlObserverVector(); + + // AFM Control + virtual int IDHM2P_InitAFMControl(); + virtual void IDHM2P_DeinitAFMControl(); + + // align camera + virtual int IDHM2P_InitAlignCamera(); + virtual void IDHM2P_DeinitAlignCamera(); + + // is manual Mode? + virtual BOOL IDHM2P_IsManualProcessMode(); protected: // Motor Control command @@ -622,7 +672,9 @@ // setter internal double GetFreeSpaceOfDrive() const; - void SetProgramVersion(); + /*< LYW 20220415 - #4086 ADD Start >*/ + static void threadSetProgramVersion(void* pArg); + /*< LYW 20220415 - #4086 ADD End >*/ void ApplySystemSettingValue(); void SetDefaultValue(); @@ -809,6 +861,13 @@ CString m_strProgramVersion; // program version CProcessTimer m_ProcessTimer; // process timer SThetaMotorInfo m_sThetaMotorInfo; // theta motor info + + /*< LYW 20220415 - #4086 ADD Start >*/ + long m_nFDCGRMSWVersion; + long m_nFDCFTPUploaderSWVersion; + long m_nFDCSyncSWVersion; + long m_nFDCReviewSWVersion; + /*< LYW 20220415 - #4086 ADD End >*/ // multi variable VectorModuleStatus m_vecModuleStatus; // Review Module Status Vector -- Gitblit v1.9.3