From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
ReviewSystem/ReviewSystem/ReviewInterface.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h
index 94ed860..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"
@@ -111,7 +112,8 @@
public IDiagnosisProcessor2Parent,
public IDialogReviewOffSet2Parent,
public IDialogReviewHistory2Parent,
- public IDialogHardwareSettingMode2Parent
+ public IDialogHardwareSettingMode2Parent,
+ public IDialogMotorOffSet2Parent
{
public:
CReviewInterface(void);
@@ -299,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);
@@ -536,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