From 572aebd50409d2f11183d6ebbb9d12fe9041e7a5 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 17 8월 2021 18:47:48 +0900
Subject: [PATCH] Ongoing100 #3561 CF AOI Review Align 카메라 끊김 현상 조치
---
ReviewSystem/ReviewSystem/ReviewSystem.rc | 7 ++-
ReviewSystem/ReviewSystem/SequenceProcessor.h | 5 +-
ReviewSystem/ReviewSystem/resource.h | 1
ReviewSystem/ReviewSystem/DlgControl.h | 1
ReviewSystem/ReviewSystem/DlgControl.cpp | 28 +++++++++++++
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 21 ++++++++--
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 2 +
7 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index de5f5ca..de39519 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -303,7 +303,7 @@
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//if (11000 <= GetTickCount() - stTime)
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
- if (1000 <= GetTickCount() - stTime)
+ if (1500 <= GetTickCount() - stTime)
{
break;
}
@@ -313,7 +313,7 @@
m_pDP2P->IDP2P_SetAFMTracking(nSelModuleIndex, TRUE);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//Sleep(1000);
- Sleep(500);
+ Sleep(1000);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
CString strimagename;
@@ -888,8 +888,21 @@
for (int nIdx = 0; nIdx < nPanelCount; nIdx++)
{
- const SPositionData* pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
- const SPositionData* pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ //LYW 210811
+ const SPositionData* pSettingPos;
+ const SPositionData* pDataPos;
+
+ if (nSelModuleIndex == 1)
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx + 3);
+ }
+ else
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ }
+ //LYW 210811
if (pSettingPos == NULL || pDataPos == NULL) continue;
dMotorPosX[nIdx] = pSettingPos->dPosX;
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
diff --git a/ReviewSystem/ReviewSystem/DlgControl.h b/ReviewSystem/ReviewSystem/DlgControl.h
index 2b26c82..8f136ea 100644
--- a/ReviewSystem/ReviewSystem/DlgControl.h
+++ b/ReviewSystem/ReviewSystem/DlgControl.h
@@ -209,4 +209,5 @@
afx_msg void OnBnClickedBtReviewPopup();
afx_msg void OnBnClickedCheckUseSimulation();
afx_msg void OnDblclkStaticMagnification();
+ afx_msg void OnBnClickedButtonAligncamGrab();
};
diff --git a/ReviewSystem/ReviewSystem/ReviewSystem.rc b/ReviewSystem/ReviewSystem/ReviewSystem.rc
index a565daf..767a254 100644
--- a/ReviewSystem/ReviewSystem/ReviewSystem.rc
+++ b/ReviewSystem/ReviewSystem/ReviewSystem.rc
@@ -483,9 +483,9 @@
PUSHBUTTON "Key Jog 시작",IDC_KEY_JOD_MOVE,207,167,45,17,NOT WS_VISIBLE | NOT WS_TABSTOP
PUSHBUTTON "test2",IDC_BUTTON_TEST2,273,167,34,17,NOT WS_VISIBLE
CTEXT "Key Jog시작",IDC_KEY_JOG_MOVE,392,160,31,24
- PUSHBUTTON "Reduce",IDC_CHECK_UI_REDUCE,436,77,51,17
- PUSHBUTTON "Left",IDC_BUTTON_UI_LEFT,436,96,50,17
- PUSHBUTTON "Right",IDC_BUTTON_UI_RIGHT1,436,116,50,17
+ PUSHBUTTON "Reduce",IDC_CHECK_UI_REDUCE,436,73,51,17
+ PUSHBUTTON "Left",IDC_BUTTON_UI_LEFT,436,92,50,17
+ PUSHBUTTON "Right",IDC_BUTTON_UI_RIGHT1,436,112,50,17
CONTROL "Track",IDC_CHECK_AFM_TRACK,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,369,77,29,57
LTEXT "GlassCenter X/Y(mm)",IDC_STATIC,10,105,74,8
PUSHBUTTON "Go",IDC_BUTTON_GLASSCENTER_GO_XY,196,101,27,17
@@ -494,6 +494,7 @@
CONTROL "OffSet ON",IDC_SELECT_OFFSET_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,418,61,63,10
PUSHBUTTON "ReviewPopUp",IDC_BT_REVIEW_POPUP,433,18,54,17
CONTROL "Use Simulation",IDC_CHECK_USE_SIMULATION,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,418,41,66,10
+ PUSHBUTTON "Align Grab",IDC_BUTTON_ALIGNCAM_GRAB,436,130,50,16
END
IDD_DLG_MODULE_INFO DIALOGEX 0, 0, 532, 187
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor.h b/ReviewSystem/ReviewSystem/SequenceProcessor.h
index e6456e6..afe2621 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor.h
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor.h
@@ -620,6 +620,8 @@
// Review, WSI Stop Siganl
BOOL SetMotionStop();
+ // Align Camera Control command
+ BOOL AlignCamera_CameraControl(int nControlCmd);
protected:
// common
@@ -631,9 +633,6 @@
// PCControl Control command
BOOL Signal_SendSignal(int nSignalIndex);
BOOL PCControl_ReadTransferData(STransferData* pTransferData);
-
- // Align Camera Control command
- BOOL AlignCamera_CameraControl(int nControlCmd);
// Review Camera Control Command
void ReviewCamera_CameraControl(int nControlCmd);
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 44d4659..8a5933b 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -547,6 +547,8 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!"));
}
+ AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
+
SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
diff --git a/ReviewSystem/ReviewSystem/resource.h b/ReviewSystem/ReviewSystem/resource.h
index 4309eef..7659a7c 100644
--- a/ReviewSystem/ReviewSystem/resource.h
+++ b/ReviewSystem/ReviewSystem/resource.h
@@ -111,6 +111,7 @@
#define IDC_BUTTON_LEFT 1008
#define IDC_BUTTON_APPLT_OFFSET 1008
#define IDC_BUTTON_PROGRAMEXIT 1008
+#define IDC_BUTTON_ALIGNCAM_GRAB 1008
#define IDC_SPIN2 1009
#define IDC_CHECK_REVIEW_PATH2 1009
#define IDC_CHECK_AUTO_SELECT_CAMERA 1009
--
Gitblit v1.9.3