From 9c13bc5af33d28bb217995597f88fe863db42442 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 01 4월 2022 10:59:55 +0900
Subject: [PATCH] AOI RawMessnger 동기화
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
index 792a476..955dff9 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
@@ -89,6 +89,7 @@
HANDLE hThread = CreateThread(NULL, 0, RunThreadReviewHistory, this, 0, &dwThreadId);
m_ThreadId = dwThreadId;
/*< LYW 20211029 - #3684 ADD End >*/
+ m_CheckInsViewCenterLine.SetCheck(FALSE);
for (int i = 0; i < 105; i++)
{
@@ -126,6 +127,7 @@
DDX_Text(pDX, IDC_EDIT_OFFSET_Y, m_dEditOffsetY);
DDX_Text(pDX, IDC_EDIT_DFFSET_GANTRY_IDX, m_strGantryIdx);
DDX_Text(pDX, IDC_STATIC_LAST_SAVE_OFFSET_TIME, m_TextLastSaveOffsetTime);
+ DDX_Control(pDX, IDC_CHECK_INS_VIEW_CENTER_LINE, m_CheckInsViewCenterLine);
}
BEGIN_MESSAGE_MAP(CReveiwHistoryDlg, CDialogEx)
@@ -155,6 +157,7 @@
ON_WM_KEYDOWN()
ON_BN_CLICKED(IDC_BUTTON_OFFSET_APPLY, &CReveiwHistoryDlg::OnBnClickedButtonOffsetApply)
ON_BN_CLICKED(IDC_BUTTON_OFFSET_SAVE, &CReveiwHistoryDlg::OnBnClickedButtonOffsetSave)
+ ON_BN_CLICKED(IDC_CHECK_INS_VIEW_CENTER_LINE, &CReveiwHistoryDlg::OnBnClickedCheckInsViewCenterLine)
END_MESSAGE_MAP()
// CReveiwHistoryDlg 硫붿떆吏� 泥섎━湲�
@@ -342,6 +345,10 @@
{
dc.SetStretchBltMode(COLORONCOLOR);
m_AlignSecend.Draw(dc, m_Align_rect2);
+ }
+ if (m_CheckInsViewCenterLine.GetCheck() == TRUE)
+ {
+ DrawInsViewCenterLine(&dc);
}
CDialogEx::OnPaint();
}
@@ -921,7 +928,11 @@
//ImageShow(pDefectInfo->m_nDefectID);
if (!m_bDefectAll)
{
- ImageShow(pDispInfo->item.row - 1);
+ /*< LYW 20211221 - #5000 ADD Start >*/
+ ImageShow(pDefectInfo->m_nDefectID);
+ /*< LYW 20211221 - #5000 ADD End >*/
+ //origin
+ //ImageShow(pDispInfo->item.row - 1);
}
else
{
@@ -931,12 +942,15 @@
//�젙�젹 �닚�꽌瑜� �궗�슜�옄媛� �썝�븯�뒗 �닚�쑝濡� �븯�옄
if (!m_bDefectAll)
{
- m_sldImg.SetPos(pDispInfo->item.row - 1);
-
- int nPos = m_sldImg.GetPos();
- CString strPos;
- strPos.Format(_T("%d"), nPos);
- m_ctrCount.SetWindowText(strPos);
+ /*< LYW 20211221 - #5000 Delete Start >*/
+
+// m_sldImg.SetPos(pDispInfo->item.row - 1);
+//
+// int nPos = m_sldImg.GetPos();
+// CString strPos;
+// strPos.Format(_T("%d"), nPos);
+// m_ctrCount.SetWindowText(strPos);
+ /*< LYW 20211221 - #5000 Delete End >*/
}
}
}
@@ -1225,7 +1239,11 @@
{
if (m_Formation.m_vecImage[i].m_nDefectID == nSelectDefect)
{
- ImageShow(i);
+ /*< LYW 20211221 - #5000 ADD Start >*/
+ ImageShow(nSelectDefect);
+ /*< LYW 20211221 - #5000 ADD End >*/
+ //origin
+ //ImageShow(i);
break;
}
}
@@ -1832,6 +1850,25 @@
}
+void CReveiwHistoryDlg::DrawInsViewCenterLine(CPaintDC * pDC)
+{
+ if (m_picture_rect2.Width() == 0 || m_picture_rect2.Height() == 0) return;
+
+ CRect rtDraw = m_picture_rect2;
+
+ CPen pen, *pPen = NULL;
+ pen.CreatePen(PS_DOT, 1, RGB(255, 0, 0));
+ pDC->SelectObject(&pen);
+
+ //pDC->SelectStockObject(WHITE_PEN);
+
+ // center line
+ pDC->MoveTo((rtDraw.Width() / 2) + rtDraw.left, 0 + rtDraw.top);
+ pDC->LineTo((rtDraw.Width() / 2) + rtDraw.left, rtDraw.Height() + rtDraw.top);
+ pDC->MoveTo(0 + rtDraw.left, (rtDraw.Height() / 2) + rtDraw.top);
+ pDC->LineTo(rtDraw.Width() + rtDraw.left, (rtDraw.Height() / 2) + rtDraw.top);
+}
+
void CReveiwHistoryDlg::OnBnClickedBtnFindBin()
{
// TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
@@ -2124,8 +2161,16 @@
if (!m_bDefectAll)
{
- nIndex = nDefectID;
- break;
+ /*< LYW 20211221 - #5000 ADD Start >*/
+ if (pImage->m_nDefectID == nDefectID)
+ {
+ nIndex = i;
+ break;
+ }
+ /*< LYW 20211221 - #5000 ADD End >*/
+ //Origin
+// nIndex = nDefectID;
+// break;
}
else
{
@@ -2371,8 +2416,11 @@
_akReviewList* pImageInfo = &m_Formation.m_vecImage[nPos];
m_FormationMap.setSelectDefect(pImageInfo->m_nDefectID);
- //ImageShow(pImageInfo->m_nDefectID/*nPos*/);
- ImageShow(nPos);
+ /*< LYW 20211221 - #5000 ADD Start >*/
+ ImageShow(pImageInfo->m_nDefectID/*nPos*/);
+ /*< LYW 20211221 - #5000 ADD End >*/
+ //Origin
+ //ImageShow(nPos);
setDefectShow(pImageInfo->m_nDefectID, 1);
}
}
@@ -4031,6 +4079,7 @@
{
// TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
SaveOffset();
+ SendMsg2ReviewSystem();
}
BOOL CReveiwHistoryDlg::LoadOffset(CString strFilePath)
@@ -4046,6 +4095,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;
@@ -4126,6 +4179,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;
@@ -4177,6 +4238,25 @@
else AfxMessageBox(_T("OFFSET SAVE FAIL"), MB_OK | MB_ICONHAND);
return bReturn;
+}
+
+BOOL CReveiwHistoryDlg::SendMsg2ReviewSystem()
+{
+ HWND hWnd = ::FindWindow(NULL, _T("ReviewSystem"));
+
+ if (hWnd)
+ {
+ COPYDATASTRUCT cds;
+ cds.dwData = COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM;
+ cds.cbData = 0;
+ cds.lpData = 0;
+
+ ::SendMessage(hWnd, WM_COPYDATA, 0, (LPARAM)(LPVOID)&cds);
+
+ return TRUE;
+ }
+
+ return FALSE;
}
BOOL CReveiwHistoryDlg::ApplyOffset(int nModuleidx, int nCamIndex, int ScanIndex, double dXOffsetValue, double dYOffsetValue)
@@ -4391,4 +4471,11 @@
}
return 0;
}
-/*< LYW 20211029 - #3684 ADD End >*/
\ No newline at end of file
+/*< LYW 20211029 - #3684 ADD End >*/
+
+void CReveiwHistoryDlg::OnBnClickedCheckInsViewCenterLine()
+{
+ // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎.
+ Invalidate(TRUE);
+
+}
--
Gitblit v1.9.3