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_전설비_알람_발생_조치
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
index 0b307fc..3c34066 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
@@ -231,13 +231,6 @@
InitGridDefectLIst(&m_gridDefectInfo, IDC_STATIC_GRID_DEFECT);
InitGridGlassLIst(&m_gridGlassInfo, IDC_STATIC_GRID_GLASS_INFO);
- /*< LYW 20211025 - #3684 ADD Start >*/
- CString strPath = _T("");
- InitDataInfo();
- strPath.Format(_T("%s%s"), REVIEW_OFFSET_CONFIGFILE_PATH, REVIEW_OFFSET_CONFIGFILE_NAME);
- LoadOffset(strPath);
- /*< LYW 20211025 - #3684 ADD End >*/
-
OnViewReviewdefect();
m_chkReviewDefect.SetCheck(TRUE);
@@ -263,6 +256,11 @@
m_ctlProgress.SetRange(0, 100);
m_ctlProgress.ShowWindow(FALSE);
+
+ /*< LYW 20211025 - #3684 ADD Start >*/
+ InitDataInfo();
+ PostThreadMessage(m_ThreadId, UM_THREAD_LOADING_OFFSET, 0, 0);
+ /*< LYW 20211025 - #3684 ADD End >*/
return TRUE; // �룷而ㅼ뒪瑜� 而⑦듃濡ㅼ뿉 �꽕�젙�븯吏� �븡�쑝硫� TRUE瑜� 諛섑솚�빀�땲�떎.
}
@@ -2711,8 +2709,10 @@
int center_y = (SrcImage.GetHeight() / 2); // �쉶�쟾 以묒떖�젏
double seta = 3.14 / (180.0 / degree); // �씪�뵒�븞
- double CosSeta = cos(seta);
- double SinSeta = sin(seta);
+ double CosSeta = -1;
+ double SinSeta = 0;
+// double CosSeta = cos(seta);
+// double SinSeta = sin(seta);
for (int y = 0; y < Height; y++)
{
@@ -4425,6 +4425,7 @@
DWORD RunThreadReviewHistory(LPVOID param)
{
MSG msg;
+ CString strPath = _T("");
CReveiwHistoryDlg* pDlg = (CReveiwHistoryDlg*)param;
while (GetMessage(&msg, NULL, 0, 0))
{
@@ -4437,6 +4438,11 @@
pDlg->PostMessage(UM_WARNING_OFFSET);
break;
+ case UM_THREAD_LOADING_OFFSET:
+ strPath.Format(_T("%s%s"), REVIEW_OFFSET_CONFIGFILE_PATH, REVIEW_OFFSET_CONFIGFILE_NAME);
+ pDlg->LoadOffset(strPath);
+ break;
+
default:
break;
}
--
Gitblit v1.9.3