From 8798c83bde2644499bed540c2d10da7f3af0022c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 05 11월 2021 09:05:23 +0900
Subject: [PATCH] # 마지막 오프셋 저장일 , 불러온 리뷰 데이터 저장일 비교 조건 변경
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 1 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
index 94a0566..7f87bc7 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
@@ -19,6 +19,17 @@
#define MAX_COUNT 100
+/*< LYW 20211025 - #3684 ADD Start >*/
+enum OFFSETCOUNT {
+ CAM_MAX_COUNT = 20, XPOS_MAX_COUNT = 10, SCAN_MAX_COUNT = 10, PROGRESS_BAR_MAX = 2000
+};
+
+#define REVIEW_OFFSET_CONFIGFILE_PATH _T("D:\\DIT_Review\\ReviewServerConfig\\") //210805
+#define REVIEW_OFFSET_CONFIGFILE_NAME _T("ReviewOffSet.cfg")
+#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 20211025 - #3684 ADD End >*/
struct _DefectList
{
@@ -32,12 +43,39 @@
CString m_strJudge;
};
+/*< LYW 20211025 - #3684 ADD Start >*/
+struct OffSetInfo
+{
+ int nXposIndex;
+ int nScanIndex;
+ int nCamIndex;
+ double dXposMax;
+ double dXposMin;
+ double dYposMax;
+ double dYposMin;
+ double dXoffSetValue;
+ double dYoffSetValue;
+ BOOL bCheckSave;
+
+};
+typedef std::vector<OffSetInfo> VecOffSetData;
+typedef std::vector<VecOffSetData> VecOffSetScanData;
+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
@@ -112,6 +150,20 @@
CProgressCtrl m_ctlProgress;
CakGridCtrl m_ctrlGridGlassList;
+
+ /*< LYW 20211018 - #3684 ADD Start >*/
+ //CurrentDefect, Offset 怨꾩궛 �궗�슜
+ 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;
@@ -206,8 +258,12 @@
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 >*/
+ afx_msg LRESULT OnImageClick(WPARAM wParam, LPARAM lParam);
+ /*< LYW 20211018 - #3684 ADD End >*/
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnOptionPathsetting();
@@ -233,7 +289,32 @@
void BinFileOpen(int nCount);
void OnCbnSelchangeComboRawtype();
-
+ /*< LYW 20211025 - #3684 ADD Start >*/
+ afx_msg void OnBnClickedButtonOffsetApply();
+ afx_msg void OnBnClickedButtonOffsetSave();
+ BOOL LoadOffset(CString strFilePath);
+ BOOL SaveOffset();
+ 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();
+ OffSetInfo GetOffSetInfo(int nMoudleidx, int nCamIndex, int ScanIndex, int nXposIndex);
+
+ int m_nCameraCount;
+ int m_nScanCount;
+ int m_XposCount;
+ int m_nCurModelIdx;
+
+ /*< LYW 20211025 - #3684 ADD End >*/
+
+ //Xpos �쐞移섎퀎 �떎�젣 Offset Data 瑜� 媛�吏�怨� �엳�뒗 Vector
+ VecOffSetData m_vecOffSetData;
+ //Scan Index瑜� �넻�븳 OffSet Data 瑜� 愿�由ы븯湲곗쐞�븳 Vector
+ VecOffSetScanData m_vecOffSetScanData;
+ //CamIndex瑜� �넻�븳 愿�由щ�� �쐞�븳 Vector module 0
+ VecOffSetCameraInfo m_vecOffSetCameraInfo;
+ //CamIndex瑜� �넻�븳 愿�由щ�� �쐞�븳 Vector module 1
+ VecOffSetCameraInfo m_vecOffSetCameraInfo2;
+
void ShowProgressBar();
void setDefectShow(int nDefectID, BOOL bEnsureVisible);
void ImageShow(int nDefectID);
@@ -246,6 +327,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);
@@ -280,4 +366,12 @@
int GetCellCount() { return m_nCellCount; }
afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+ int m_nEditCamIdx;
+ int m_nEditScanIdx;
+ double m_dEditOffsetX;
+ double m_dEditOffsetY;
+ CString m_strGantryIdx;
+ /*< LYW 20211028 - #index ADD Start >*/
+ CString m_TextLastSaveOffsetTime;
+ /*< LYW 20211028 - #index ADD End >*/
};
--
Gitblit v1.9.3