From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 11 11월 2021 17:57:01 +0900
Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치

---
 ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp |   76 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
index 7092656..451b51e 100644
--- a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
+++ b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.cpp
@@ -25,6 +25,8 @@
 	, m_editGlassOffSetmodeScanIndex(0)
 	, m_editGlassOffSetmodeXpos(0)
 	, m_editGlassOffSetmodeYpos(0)
+	, m_dWarnStandard(0)
+	, m_dHardStandard(0)
 {
 	m_EditChangeTargetXpos = 0;
 	m_EditChangeTargetYpos = 0;
@@ -72,6 +74,8 @@
 	DDX_Text(pDX, IDC_EDIT_SCAN_INDEX, m_editGlassOffSetmodeScanIndex);
 	DDX_Text(pDX, IDC_EDIT_MOTOR_XPOS, m_editGlassOffSetmodeXpos);
 	DDX_Text(pDX, IDC_EDIT_MOTOR_YPOS, m_editGlassOffSetmodeYpos);
+	DDX_Text(pDX, IDC_EDIT_WARN_STANDARD, m_dWarnStandard);
+	DDX_Text(pDX, IDC_EDIT_HARD_STANDARD, m_dHardStandard);
 }
 
 
@@ -441,8 +445,37 @@
 
 				strData.Format(_T("%.03lf"), pOffSet.dXoffSetValue);
 				m_ctrlGridReviewOffSetInfo.SetItemText(nCol, nRow,strData);
+				/*< LYW 20211111 - #3766 ADD Start >*/
+				if (abs(pOffSet.dXoffSetValue) * 1000 >= m_dHardStandard)
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow, RGB(255, 0, 0));
+				}
+				else if (abs(pOffSet.dXoffSetValue) * 1000 >= m_dWarnStandard)
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow, RGB(255, 255, 0));
+				}
+				else
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow, RGB(255, 255, 210));
+				}
+				/*< LYW 20211111 - #3766 ADD End >*/
+
 				strData.Format(_T("%.03lf"), pOffSet.dYoffSetValue);
 				m_ctrlGridReviewOffSetInfo.SetItemText( nCol, nRow + 1, strData);
+				/*< LYW 20211111 - #3766 ADD Start >*/
+				if (abs(pOffSet.dYoffSetValue) * 1000 >= m_dHardStandard)
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow + 1, RGB(255, 0, 0));
+				}
+				else if (abs(pOffSet.dYoffSetValue) * 1000 >= m_dWarnStandard)
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow + 1, RGB(255, 255, 0));
+				}
+				else
+				{
+					m_ctrlGridReviewOffSetInfo.SetItemBkColour(nCol, nRow + 1, RGB(255, 255, 210));
+				}
+				/*< LYW 20211111 - #3766 ADD End >*/
 				nRow += 2;
 			}
 			nRow = 1;
@@ -870,12 +903,17 @@
 		pDlgOffsetTool->InitProcess();
 		pDlgOffsetTool->EnableBT();
 	}
-	else
+	else if(pDlgOffsetTool->nThreadType == 1)
 	{
 		pDlgOffsetTool->DissableBT();
 		pDlgOffsetTool->SaveConfigFile();
 		pDlgOffsetTool->EnableBT();
-
+	}
+	else
+	{
+		pDlgOffsetTool->DissableBT();
+		pDlgOffsetTool->OffsetLoad();
+		pDlgOffsetTool->EnableBT();
 	}
 	return 0;
 }
@@ -915,6 +953,10 @@
 	macroFile.GetItem(_T("CAMERA_COUNT"),m_nCameraCount , 0);
 	macroFile.GetItem(_T("SCAN_COUNT"), m_nScanCount, 0);
 	macroFile.GetItem(_T("XPOS_COUNT"), m_XposCount, 0);
+	/*< LYW 20211111 - #3766 ADD Start >*/
+	macroFile.GetItem(_T("WARN_STANDARD"), m_dWarnStandard, 0);
+	macroFile.GetItem(_T("HARD_STANDARD"), m_dHardStandard, 0);
+	/*< LYW 20211111 - #3766 ADD End >*/
 	CString strItem = _T("");
 	double dXoffset=0;
 	double dYoffset=0;
@@ -993,6 +1035,14 @@
 	strItem.Format(_T("XPOS_COUNT"));
 	macroFile.SetItem(strItem, m_XposCount);
 
+	/*< LYW 20211111 - #3766 ADD Start >*/
+	strItem.Format(_T("WARN_STANDARD"));
+	macroFile.SetItem(strItem, m_dWarnStandard);
+
+	strItem.Format(_T("HARD_STANDARD"));
+	macroFile.SetItem(strItem, m_dHardStandard);
+	/*< LYW 20211111 - #3766 ADD End >*/
+
 	
 	CString strData;
 	double dData= 0;
@@ -1044,6 +1094,11 @@
 		g_pLog->DisplayMessage(_T("Save Offset Success!!"));
 	}
 	// #3563 LYW_ CF AOI Review Offset �뙆�씪誘명꽣 ���옣�떆 �셿猷� �뙘�뾽 異붽� ADD END
+	/*< LYW 20211111 - #3766 ADD Start >*/
+	UpdateGridcontrol();
+	UpdateData(TRUE);
+	Invalidate(FALSE);
+	/*< LYW 20211111 - #3766 ADD End >*/
 
 	return bReturn;
 }
@@ -1067,6 +1122,14 @@
 
 LRESULT DlgReviewOffSetTool::OnUserFunc(WPARAM wParam, LPARAM lParam)
 {
+	int nmsg = (int)wParam;
+	if (nmsg == 0)
+	{
+		nThreadType = 2;
+		m_ctrlProcessBar.SetPos(0);
+		m_pThread = AfxBeginThread(ThradProcess, this);
+		return 0;
+	}
 	UpdateData(FALSE);
 	Invalidate(TRUE);
 	return 0;
@@ -1103,11 +1166,16 @@
 /*< LYW 20211025 - #3684 ADD Start >*/
 void DlgReviewOffSetTool::OnBnClickedOffsetLoad()
 {
-
 	// TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
+	nThreadType = 2;
+	m_ctrlProcessBar.SetPos(0);
+	m_pThread = AfxBeginThread(ThradProcess, this);
+}
+void DlgReviewOffSetTool::OffsetLoad()
+{
 	ReadConfigFile();
 	UpdateGridcontrol();
 	UpdateData(TRUE);
 	Invalidate(FALSE);
 }
-/*< LYW 20211025 - #3684 ADD End >*/
\ No newline at end of file
+/*< LYW 20211025 - #3684 ADD End >*/

--
Gitblit v1.9.3