From 75c1317438374ab8555e85b491b36113b5aeb9c7 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 21 4월 2022 13:52:35 +0900
Subject: [PATCH] Ongoing90 #4086 CF AOI Review FDC SW Version 추가 요청
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
index 420f3fb..0b02efd 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
@@ -29,6 +29,10 @@
#define REVIEW_OFFSET_CONFIGFILE_FULL_PATHNAME _T("D:\\DIT_Review\\ReviewServerConfig\\ReviewOffSet.cfg")
#define REVIEW_OFFSET_BACKUP_FORDER_NAME _T("OffsetBackup")
#define REVIEW_OFFSET_BACKUP_FORDER_PATH _T("D:\\DIT_Review\\ReviewServerConfig\\OffsetBackup\\")
+
+/*< LYW 20211111 - #3766 ADD Start >*/
+#define COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM 1800
+/*< LYW 20211111 - #3766 ADD End >*/
/*< LYW 20211025 - #3684 ADD End >*/
struct _DefectList
@@ -63,12 +67,19 @@
typedef std::vector<VecOffSetScanData> VecOffSetCameraInfo;
/*< LYW 20211025 - #3684 ADD End >*/
+/*< LYW 20211029 - #3684 ADD Start >*/
+DWORD RunThreadReviewHistory(LPVOID param);
+/*< LYW 20211029 - #3684 ADD End >*/
+
// CReveiwHistoryDlg ���솕 �긽�옄
class CReveiwHistoryDlg : public CDialogEx
{
// �깮�꽦�엯�땲�떎.
public:
CReveiwHistoryDlg(CWnd* pParent = nullptr); // �몴以� �깮�꽦�옄�엯�땲�떎.
+ /*< LYW 20211029 - #3684 ADD Start >*/
+ ~CReveiwHistoryDlg(void);
+ /*< LYW 20211029 - #3684 ADD End >*/
// ���솕 �긽�옄 �뜲�씠�꽣�엯�땲�떎.
#ifdef AFX_DESIGN_TIME
@@ -149,6 +160,14 @@
int m_dCurDefectIdx;
int m_dCurDefectID;
/*< LYW 20211018 - #3684 ADD End >*/
+
+ /*< LYW 20211028 - #3684 ADD Start >*/
+ CTime m_LastSaveOffsetTime;
+ CTime m_CurrentResultFileTime;
+ /*< LYW 20211028 - #3684 ADD End >*/
+ /*< LYW 20211029 - #3684 ADD Start >*/
+ DWORD m_ThreadId;
+ /*< LYW 20211029 - #3684 ADD End >*/
// tracker
BOOL m_bDrawTracker;
@@ -243,6 +262,7 @@
afx_msg void OnBnClickedButtonMapviewFit();
afx_msg void OnDestroy();
afx_msg LRESULT OnMapDefectSelected(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDisplayWarning(WPARAM wParam, LPARAM lParam);
afx_msg LRESULT OnMapDefectMouseOver(WPARAM wParam, LPARAM lParam);
afx_msg LRESULT OnListDefectSelected(WPARAM wParam, LPARAM lParam);
/*< LYW 20211018 - #3684 ADD Start >*/
@@ -272,12 +292,18 @@
void OpenFileHeader(CString strPath, CString strFullPath);
void BinFileOpen(int nCount);
void OnCbnSelchangeComboRawtype();
+ /*< LYW 20211111 - #3766 ADD Start >*/
+ void DrawInsViewCenterLine(CPaintDC *pDC);
+ /*< LYW 20211111 - #3766 ADD End >*/
/*< LYW 20211025 - #3684 ADD Start >*/
afx_msg void OnBnClickedButtonOffsetApply();
afx_msg void OnBnClickedButtonOffsetSave();
BOOL LoadOffset(CString strFilePath);
BOOL SaveOffset();
+ /*< LYW 20211111 - #3766 ADD Start >*/
+ BOOL SendMsg2ReviewSystem();
+ /*< LYW 20211111 - #3766 ADD End >*/
BOOL ApplyOffset(int nModuleidx, int nCamIndex, int ScanIndex, double dXOffsetValue, double dYOffsetValue);
BOOL SetInputOffSet(int nModuleidx, int nCamIndex, int ScanIndex, int nXposIndex, double dXOffsetValue, double dYOffsetValue, double dXposMin, double dXposMax, BOOL bCheckSave = 0);
void InitDataInfo();
@@ -286,6 +312,8 @@
int m_nCameraCount;
int m_nScanCount;
int m_XposCount;
+ double m_dWarnStandard;
+ double m_dHardStandard;
int m_nCurModelIdx;
/*< LYW 20211025 - #3684 ADD End >*/
@@ -311,6 +339,11 @@
//LYW 20210825 #3486 ADD START
void ImageRotate(CImage& SrcImage, CImage& DstImage, double degree = 180.0);
//LYW 20210825 #3486 ADD END
+
+ /*< LYW 20211028 - #3684 ADD Start >*/
+ void UpdateLastSaveOffsetTime(CString FileName);
+ CTime GetCurrentResultFileTime(CString FileName);
+ /*< LYW 20211028 - #3684 ADD End >*/
BOOL GetCheckFileLoad(int nCount);
@@ -350,4 +383,9 @@
double m_dEditOffsetX;
double m_dEditOffsetY;
CString m_strGantryIdx;
+ /*< LYW 20211028 - #index ADD Start >*/
+ CString m_TextLastSaveOffsetTime;
+ /*< LYW 20211028 - #index ADD End >*/
+ CButton m_CheckInsViewCenterLine;
+ afx_msg void OnBnClickedCheckInsViewCenterLine();
};
--
Gitblit v1.9.3