From ea996431950e6ecff451bd40d1228f51d077475c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 28 4월 2022 09:22:18 +0900
Subject: [PATCH] Ongoing100 #4086 CF AOI Review FDC SW Version 추가 요청
---
ReviewSystem/ReviewSystem/ReviewInterface.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h
index b2249db..e0423fc 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);
@@ -147,6 +149,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);
@@ -293,6 +298,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
@@ -384,6 +390,13 @@
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 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
virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount); // new glass result
@@ -516,6 +529,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
@@ -640,7 +676,16 @@
// setter internal
double GetFreeSpaceOfDrive() const;
- void SetProgramVersion();
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ 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();
void SetDefaultValue();
@@ -827,6 +872,15 @@
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;
+ long m_nFDCWSISWVersion00;
+ long m_nFDCWSISWVersion01;
+ /*< LYW 20220415 - #4086 ADD End >*/
// multi variable
VectorModuleStatus m_vecModuleStatus; // Review Module Status Vector
--
Gitblit v1.9.3