From 63439977901d54a01924ed76290931aeddbce66c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 05 7월 2022 18:16:55 +0900
Subject: [PATCH] Ongoing80 #4220 CF AOI Review 알람 추가
---
ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
index 451b51e..f7dfac1 100644
--- a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
+++ b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
@@ -427,8 +427,10 @@
int nRow = 1;
int nCol = 1;
CString strData;
+ /*< LYW 20211111 - #3766 ADD Start >*/
+ BOOL b_checkHardAlarm = FALSE;
+ /*< LYW 20211111 - #3766 ADD End >*/
-
nModuleidx = m_ctrlComboModule.GetCurSel();
for (int nCamidx = 0; nCamidx < m_nCameraCount; nCamidx++)
@@ -449,6 +451,7 @@
if (abs(pOffSet.dXoffSetValue) * 1000 >= m_dHardStandard)
{
m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow, RGB(255, 0, 0));
+ b_checkHardAlarm = TRUE;
}
else if (abs(pOffSet.dXoffSetValue) * 1000 >= m_dWarnStandard)
{
@@ -466,6 +469,7 @@
if (abs(pOffSet.dYoffSetValue) * 1000 >= m_dHardStandard)
{
m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow + 1, RGB(255, 0, 0));
+ b_checkHardAlarm = TRUE;
}
else if (abs(pOffSet.dYoffSetValue) * 1000 >= m_dWarnStandard)
{
@@ -484,7 +488,10 @@
}
}
-
+ if (b_checkHardAlarm == TRUE)
+ {
+ AfxMessageBox(_T("湲곗� 珥덇낵�맂 Offset 媛믪씠 議댁옱 �빀�땲�떎."), MB_OK | MB_ICONINFORMATION);
+ }
//UpdateData(FALSE);
//Invalidate(TRUE);
}
@@ -1084,6 +1091,15 @@
bReturn = macroFile.Write(strFilePath);
+ /*< LYW 20220525 - #4161 ADD Start >*/
+ CString strRTMSBackUpFilePath;
+ strRTMSBackUpFilePath.Format(_T("%s\\%s"), _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT, REVIEW_OFFSET_CONFIGFILE_NAME);
+
+ if (bReturn)
+ {
+ CopyFile(REVIEW_OFFSET_CONFIGFILE_FULL_PATHNAME, strRTMSBackUpFilePath, FALSE);
+ }
+ /*< LYW 20220525 - #4161 ADD End >*/
// #3563 LYW_ CF AOI Review Offset �뙆�씪誘명꽣 ���옣�떆 �셿猷� �뙘�뾽 異붽� ADD START
CString strMessage;
@@ -1179,3 +1195,32 @@
Invalidate(FALSE);
}
/*< LYW 20211025 - #3684 ADD End >*/
+
+
+BOOL DlgReviewOffSetTool::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+ // TODO: �뿬湲곗뿉 �듅�닔�솕�맂 肄붾뱶瑜� 異붽� 諛�/�삉�뒗 湲곕낯 �겢�옒�뒪瑜� �샇異쒗빀�땲�떎.
+ if (m_ctrlGridReviewOffSetInfo.GetSafeHwnd() && wParam == (WPARAM)m_ctrlGridReviewOffSetInfo.GetDlgCtrlID())
+ {
+ //*pResult = 1;
+ GV_DISPINFO *pDispInfo = (GV_DISPINFO*)lParam;
+ if (NM_DBLCLK == pDispInfo->hdr.code)
+ {
+ //int nCol = pDispInfo->item.col;
+ if (pDispInfo->item.row)
+ {
+ int nRow = (pDispInfo->item.row) - 1;
+ int CamIdx = nRow / m_nScanCount;
+ int scanIdx = nRow % m_nScanCount;
+
+ if (m_pDDL2P)
+ {
+ m_pDDL2P->IDRO2P_SetOffsetPram(CamIdx, scanIdx, TRUE);
+ }
+
+ }
+ }
+ }
+
+ return CDialogEx::OnNotify(wParam, lParam, pResult);
+}
--
Gitblit v1.9.3