From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
index 420f3fb..38f2a0c 100644
--- a/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
+++ b/ReviewHistory/ReveiwHistory/ReveiwHistoryDlg.h
@@ -27,8 +27,15 @@
#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
@@ -63,12 +70,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 +163,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 +265,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 +295,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 +315,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 +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);
@@ -350,4 +386,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