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.cpp | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index c1b86eb..396ee3f 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -732,6 +732,7 @@
bRetFTPUploader = TRUE;
}
}
+ Sleep(1);
//Dit Glass Raw Messenger S/W Version
if (bRetGRM == FALSE)
{
@@ -741,6 +742,7 @@
bRetGRM = TRUE;
}
}
+ Sleep(1);
//Dit Shared Memory Sync Client S/W Version Start
if (bRetSync == FALSE)
{
@@ -3758,6 +3760,23 @@
pReviewOffSetTool->GetOffSetInfo(nModule, nCam, nScan, dGlassXPos,dXpos, dYpos);
return TRUE;
}
+/* < KEJ 20230621 - #4528 ADD Start > */
+BOOL CReviewInterface::IDMO2P_GetMotorPos(int nModule, double &dXpos, double &dYpos)
+{
+ dXpos = m_vecModuleStatus[nModule].GetMotorPosition()->dMotorPosX;
+ dYpos = m_vecModuleStatus[nModule].GetMotorPosition()->dMotorPosY;
+ return TRUE;
+
+}
+
+BOOL CReviewInterface::CalcMotorOffSetValue(int nModule, double &dXpos, double &dYpos)
+{
+ CDlgMotorOffSetTool* pMotorOffSetTool = m_pView->GetMotorOffSetToolHandle();
+
+ pMotorOffSetTool->CalOffsetInfo(nModule, dXpos, dYpos);
+ return TRUE;
+}
+/* < KEJ 20230621 - #4528 ADD End > */
BOOL CReviewInterface::IDRO2P_SetGlassMode(BOOL bMode, int nCamidx, int nScanidx, double nXpos, double nYpos)
{
@@ -9058,7 +9077,12 @@
{
m_pView->ShowHWSettingMode();
}
-
+/* < KEJ 20230621 - #4528 ADD Start > */
+void CReviewInterface::IDL2P_OpenMotorOffSetTool()
+{
+ m_pView->ShowMotorOffSetTool();
+}
+/* < KEJ 20230621 - #4528 ADD End > */
BOOL CReviewInterface::IDL2P_IsManualProcessMode()
{
return IsManualProcessMode();
--
Gitblit v1.9.3