From 6c48319c60c4eb6ad4ff3631f5caa6b297d2e787 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 18 8월 2021 09:06:18 +0900
Subject: [PATCH] Merge branch 'feature/#3561_CF_AOI_Review_Align_카메라_끊김_현상_조치' into feature/#3562_CF_AOI_Review_실행_프로그램_경로_변경
---
ReviewSystem/ReviewSystem/DlgControl.cpp | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgControl.cpp b/ReviewSystem/ReviewSystem/DlgControl.cpp
index 597a4d5..f3b1718 100644
--- a/ReviewSystem/ReviewSystem/DlgControl.cpp
+++ b/ReviewSystem/ReviewSystem/DlgControl.cpp
@@ -30,6 +30,7 @@
m_nMoveAxis = MoveAxis_Center;
m_nGlassGridViewIndex = 0;
pDlgContol = NULL;
+ m_bAlignCamGrab = FALSE;
}
#define ENABLE_RADIO_TIMER
@@ -111,6 +112,7 @@
ON_BN_CLICKED(IDC_BT_REVIEW_POPUP, &CDlgControl::OnBnClickedBtReviewPopup)
ON_BN_CLICKED(IDC_CHECK_USE_SIMULATION, &CDlgControl::OnBnClickedCheckUseSimulation)
ON_STN_DBLCLK(IDC_STATIC_MAGNIFICATION, &CDlgControl::OnDblclkStaticMagnification)
+ ON_BN_CLICKED(IDC_BUTTON_ALIGNCAM_GRAB, &CDlgControl::OnBnClickedButtonAligncamGrab)
END_MESSAGE_MAP()
@@ -184,6 +186,10 @@
m_ctrlButtonColorCtrl.addControl(IDC_BT_REVIEW_POPUP, this);
m_ctrlButtonColorCtrl.addControl(IDC_CHECK_USE_SIMULATION, this);
+ //#3561 CF AOI Review Align 移대찓�씪 �걡源� �쁽�긽 議곗튂 ADD START
+ m_ctrlButtonColorCtrl.addControl(IDC_BUTTON_ALIGNCAM_GRAB, this);
+ //#3561 CF AOI Review Align 移대찓�씪 �걡源� �쁽�긽 議곗튂 ADD END
+
@@ -1450,4 +1456,24 @@
{
(GetDlgItem(IDC_CHECK_USE_SIMULATION))->ShowWindow(SW_SHOW);
}
-}
\ No newline at end of file
+}
+
+//#3561 CF AOI Review Align 移대찓�씪 �걡源� �쁽�긽 議곗튂 ADD START
+void CDlgControl::OnBnClickedButtonAligncamGrab()
+{
+ CSequenceProcessor* pSequenceProcessor = m_pDC2P->IRP2P_GetSequenceProcessor();
+ if (pSequenceProcessor == NULL) return;
+ if (m_bAlignCamGrab == FALSE)
+ {
+ pSequenceProcessor->AlignCamera_CameraControl(CameraControlLive);
+ m_bAlignCamGrab = TRUE;
+ }
+ else
+ {
+ pSequenceProcessor->AlignCamera_CameraControl(CameraControlStop);
+ m_bAlignCamGrab = FALSE;
+ }
+
+ // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
+}
+//#3561 CF AOI Review Align 移대찓�씪 �걡源� �쁽�긽 議곗튂 ADD END
\ No newline at end of file
--
Gitblit v1.9.3