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/DlgDeffectHistroy.cpp | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgDeffectHistroy.cpp b/ReviewSystem/ReviewSystem/DlgDeffectHistroy.cpp
index 7704ff5..17200a9 100644
--- a/ReviewSystem/ReviewSystem/DlgDeffectHistroy.cpp
+++ b/ReviewSystem/ReviewSystem/DlgDeffectHistroy.cpp
@@ -575,23 +575,34 @@
void CDlgDeffectHistroy::OnDblclkListHistoryDefect(NMHDR *pNMHDR, LRESULT *pResult)
{
- LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
- // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
-
- int nPos = m_ctrlListDefectHistory.GetSelectionMark();
- if (nPos >= 0)
+
+ /*< LYW 20211005 - #3662 ADD Start >*/
+ try
{
- CString strText;
- strText = m_ctrlListDefectHistory.GetItemText(nPos, 0);
- int nDefectIdx = _ttoi(strText);
- if (nDefectIdx < 0)
- return;
+ LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
+ // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
- //History tool �뿉 �씤�뜳�뒪 踰덊샇 �꽆湲곌린
- m_pDDL2P->UpdateSelectDefectInfoMap2(nDefectIdx);
+ int nPos = m_ctrlListDefectHistory.GetSelectionMark();
+ if (nPos >= 0)
+ {
+ CString strText;
+ strText = m_ctrlListDefectHistory.GetItemText(nPos, 0);
+ int nDefectIdx = _ttoi(strText);
+ if (nDefectIdx < 0)
+ return;
+
+ //History tool �뿉 �씤�뜳�뒪 踰덊샇 �꽆湲곌린
+ m_pDDL2P->UpdateSelectDefectInfoMap2(nDefectIdx);
+ }
+
+ *pResult = 0;
}
+ catch (...)
+ {
+ return;
+ }
+ /*< LYW 20211005 - #3662 ADD End >*/
- *pResult = 0;
}
void CDlgDeffectHistroy::OnSize(UINT nType, int cx, int cy)
--
Gitblit v1.9.3