From 20734d0fdaefe16a67511bdf8fe6e295c02f27dc Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 월, 19 6월 2023 16:25:31 +0900
Subject: [PATCH] Ongoing60 #4517 CF AOI Review 결과 파일 찾기 실패 개선 1. Find Bin File 무조건 실패하는 버그 개선
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
index 3c34066..f9dc30c 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.cpp
@@ -928,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
{
@@ -938,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 >*/
}
}
}
@@ -1232,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;
}
}
@@ -2150,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
{
@@ -2397,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);
}
}
@@ -4206,6 +4228,16 @@
bReturn = macroFile.Write(strFilePath);
+ /*< LYW 20220525 - #4158 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 - #4158 ADD End >*/
+
if (bReturn)
{
/*< LYW 20211028 - #3684 ADD Start >*/
--
Gitblit v1.9.3