From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 월, 26 12월 2022 15:04:42 +0900
Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 1 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
index 94a0566..38f2a0c 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
@@ -19,6 +19,24 @@
#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")
+/*< LYW 20220525 - #4158 ADD Start >*/
+#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig")
+/*< LYW 20220525 - #4158 ADD End >*/
+#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
{
@@ -32,12 +50,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 +157,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 +265,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();
@@ -232,8 +295,41 @@
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();
+ OffSetInfo GetOffSetInfo(int nMoudleidx, int nCamIndex, int ScanIndex, int nXposIndex);
+
+ int m_nCameraCount;
+ int m_nScanCount;
+ int m_XposCount;
+ double m_dWarnStandard;
+ double m_dHardStandard;
+ 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 +342,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 +381,14 @@
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 >*/
+ CButton m_CheckInsViewCenterLine;
+ afx_msg void OnBnClickedCheckInsViewCenterLine();
};
--
Gitblit v1.9.3