From 6d5796902a980f189f470a4e8ea7084548c52f49 Mon Sep 17 00:00:00 2001 From: KEJ <kimeungju@diteam.co.kr> Date: 월, 26 6월 2023 17:43:48 +0900 Subject: [PATCH] Ongoing80 #4528 CF AOI Review Motor Offset 기능 추가 1. Motor Offset 설정 Dlg 추가. 2. Offset 파라미터 추가. 3. Motor Offset 기능 적용 --- ReviewSystem/ReviewSystem/ReviewInterface.h | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h index e0423fc..f79ac20 100644 --- a/ReviewSystem/ReviewSystem/ReviewInterface.h +++ b/ReviewSystem/ReviewSystem/ReviewInterface.h @@ -47,6 +47,7 @@ #include "DlgReviewPopUp.h" #include "DlgReviewHistoryTool.h" #include "DlgHardwareSettingMode.h" +#include "DlgMotorOffSetTool.h" //< KEJ 20230621 - #4528 ADD > #include "CHTotalPitchMeasure/TotalPitchMeasure.h" #include "CHResultFileManager/StringRaw.h" @@ -57,6 +58,8 @@ #include "DlgDefocusList.h" #include "M_AutoDiagnosisManager/DiagnosisManager.h" #include "DlgSelfDiagnosis.h" + +#include "FTPUploadParam.h" typedef std::vector<CMotorCalibrator> VectorMotorCalibrator; typedef std::vector<CMotorCalibrator>::iterator VectorMotorCalibratorIt; @@ -109,7 +112,8 @@ public IDiagnosisProcessor2Parent, public IDialogReviewOffSet2Parent, public IDialogReviewHistory2Parent, - public IDialogHardwareSettingMode2Parent + public IDialogHardwareSettingMode2Parent, + public IDialogMotorOffSet2Parent { public: CReviewInterface(void); @@ -138,6 +142,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 @@ -296,7 +301,10 @@ virtual BOOL IDRO2P_GetMotorPos(int nModule,double &dXpos, double &dYpos); // GetOffSetValue virtual BOOL GetOffSetValue(int nModule, int nCam, int nScan, double dGlassXPos, double &dXpos, double &dYpos); - + /* < KEJ 20230621 - #4528 ADD Start > */ + virtual BOOL IDMO2P_GetMotorPos(int nModule, double &dXpos, double &dYpos); + virtual BOOL CalcMotorOffSetValue(int nModule, double &dXpos, double &dYpos); + /* < KEJ 20230621 - #4528 ADD End > */ 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); @@ -533,6 +541,7 @@ virtual void IDL2P_OpenHWSettingTool(); virtual BOOL IDL2P_IsManualProcessMode(); /*< LYW 20211112 - #3708 ADD End >*/ + virtual void IDL2P_OpenMotorOffSetTool(); //< KEJ 20230621 - #4528 ADD > // dialog HardwareSettingMode 2 Parent // review camera -- Gitblit v1.9.3