From 63439977901d54a01924ed76290931aeddbce66c Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 화, 05 7월 2022 18:16:55 +0900 Subject: [PATCH] Ongoing80 #4220 CF AOI Review 알람 추가 --- ReviewSystem/ReviewSystem/ReviewInterface.h | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h index f4b3124..94ed860 100644 --- a/ReviewSystem/ReviewSystem/ReviewInterface.h +++ b/ReviewSystem/ReviewSystem/ReviewInterface.h @@ -58,6 +58,8 @@ #include "M_AutoDiagnosisManager/DiagnosisManager.h" #include "DlgSelfDiagnosis.h" +#include "FTPUploadParam.h" + typedef std::vector<CMotorCalibrator> VectorMotorCalibrator; typedef std::vector<CMotorCalibrator>::iterator VectorMotorCalibratorIt; typedef std::vector<CMotorCalibrator>::const_iterator constVectorMotorCalibratorIt; @@ -138,6 +140,7 @@ virtual void IMC2P_GantrySoftWareTrigger(int nIndex, int nGantryIdx, int nTrigger); virtual void IMC2P_WsiGantrySoftWareTrigger(int nIndex, int nGantryIdx, int nTrigger); virtual void IMC2P_UpdateWsiMotionEnd(int nIndex, int nGantryIdx); + virtual void IMC2P_SendMotorAliveErrorAlram(); virtual BOOL IMC2P_GetUseWsi(); // WSI Controller 2 parent @@ -149,6 +152,9 @@ virtual void IWC2P_SetWSIAliveCheck(); virtual BOOL IWC2P_GetMeasureInfo(int nModuleIndex, int nPointIndex, short& nLoc, short& nOptic, short& nGray, CString& strCellID); virtual int IWC2P_GetCurrentStatus(int nModuleIndex, CString& strGlassID, CString& strRecipeID, int& nType); + /*< LYW 20220421 - #4086 ADD Start >*/ + virtual void IWC2P_SetWSIVersion(int nModuleIndex, int nVersion); + /*< LYW 20220421 - #4086 ADD End >*/ virtual void IWC2P_SetConnectedStatus(int nModuleIndex, int nConnectStatus); virtual void IWC2P_RecvMeasureMessage(int nModuleIndex, int nMessageType, int nMessageResult); virtual void IWC2P_SetMeasureResult(int nModuleIndex, const SWsiResult& measureResut); @@ -388,10 +394,11 @@ 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(); + virtual int ISP2P_GetReviewSWVersion(); + virtual int ISP2P_GetSyncSWVersion(); + virtual int ISP2P_GetGRMSWVersion(); + virtual int ISP2P_GetFTPUploaderSWVersion(); + virtual int ISP2P_GetWSISWVersion(int nModuleIndex); /*< LYW 20220415 - #4086 ADD End >*/ // History result @@ -673,7 +680,14 @@ // setter internal double GetFreeSpaceOfDrive() const; /*< LYW 20220415 - #4086 ADD Start >*/ - static void threadSetProgramVersion(void* pArg); + static void threadSet3rdPartyProgramVersion(void* pArg); + void SetReviewProgramVersion(); + /*< LYW 20220426 - #4086 ADD Start >*/ + void Start3rdPartyProgram(); + int StartWindowIDProgram(CString WindowID, CString ProgramPath); + void Terminate3rdPartyProgram(); + void TerminateWindowIDProgram(CString WindowID); + /*< LYW 20220426 - #4086 ADD End >*/ /*< LYW 20220415 - #4086 ADD End >*/ void ApplySystemSettingValue(); @@ -867,6 +881,8 @@ long m_nFDCFTPUploaderSWVersion; long m_nFDCSyncSWVersion; long m_nFDCReviewSWVersion; + long m_nFDCWSISWVersion00; + long m_nFDCWSISWVersion01; /*< LYW 20220415 - #4086 ADD End >*/ // multi variable -- Gitblit v1.9.3