From aef69faaca3401fa1224884e686bce36b0c88acb Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 26 10월 2021 16:57:35 +0900
Subject: [PATCH] Ongoing80 #3684 CF AOI Review 전설비 Review History Defect이미지 클릭시 Offset 자동 계산 기능 추가
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
index 94a0566..420f3fb 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
{
@@ -31,6 +42,26 @@
int m_nAllCount;
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 >*/
// CReveiwHistoryDlg ���솕 �긽�옄
class CReveiwHistoryDlg : public CDialogEx
@@ -112,6 +143,12 @@
CProgressCtrl m_ctlProgress;
CakGridCtrl m_ctrlGridGlassList;
+
+ /*< LYW 20211018 - #3684 ADD Start >*/
+ //CurrentDefect, Offset 怨꾩궛 �궗�슜
+ int m_dCurDefectIdx;
+ int m_dCurDefectID;
+ /*< LYW 20211018 - #3684 ADD End >*/
// tracker
BOOL m_bDrawTracker;
@@ -208,6 +245,9 @@
afx_msg LRESULT OnMapDefectSelected(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 +273,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);
@@ -280,4 +345,9 @@
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;
};
--
Gitblit v1.9.3