From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 목, 11 11월 2021 17:57:01 +0900 Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치 --- ReviewSystem/ReviewSystem/stdafx.h | 70 +++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 11 deletions(-) diff --git a/ReviewSystem/ReviewSystem/stdafx.h b/ReviewSystem/ReviewSystem/stdafx.h index e674365..3aec9fe 100644 --- a/ReviewSystem/ReviewSystem/stdafx.h +++ b/ReviewSystem/ReviewSystem/stdafx.h @@ -38,6 +38,9 @@ #include "CHReviewResult/GlassResult.h" #include "CHReviewSetting/MotorParameter.h" +#include <DbgHelp.h> +#pragma comment ( lib, "DbgHelp" ) + #include <WinNetWk.h> //#pragma comment(lib,"Mpr.lib") @@ -74,17 +77,34 @@ #define ID_TIMER_SEND_SIGNAL_ALIVE (WM_USER + 107) -#define _REVIEW_SERVER_BASE_PATH_ _T("C:\\DIT_Review") -#define _REVIEW_SERVER_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog") -#define _REVIEW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe") -#define _REVIEW_REF_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reference") -#define _REVIEW_SERVER_CONFIG_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig") -#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg") +#define _REVIEW_SERVER_BASE_PATH_ _T("D:\\DIT_Review") //210805 +#define _REVIEW_SERVER_LOG_PATH_ _T("D:\\DIT_Review\\ReviewServerLog") +#define _REVIEW_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe") +#define _REVIEW_REF_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe\\Reference") +#define _REVIEW_SERVER_CONFIG_PATH_ _T("D:\\DIT_Review\\ReviewServerConfig") +#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("D:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg") #define _SYSTEM_SETTING_TITLE_ _T("ReviewSystemSetting") #define _RECIPE_EDITOR_TITLE_ _T("ReviewRecipeEditor") -#define _REVIEW_LOGIN_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog\\LoginLog") -#define _REVIEW_REFLOW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reflow") -#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage") +#define _REVIEW_LOGIN_LOG_PATH_ _T("D:\\DIT_Review\\ReviewServerLog\\LoginLog") +#define _REVIEW_REFLOW_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe\\Reflow") +#define ALIGN_TEMPLATE_PATH _T("D:\\DIT_Review\\Recipe\\AlignImage") +#define _REVIEW_RECIPE_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\Recipe") +#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig") + +//#define _REVIEW_SERVER_BASE_PATH_ _T("C:\\DIT_Review") +//#define _REVIEW_SERVER_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog") +//#define _REVIEW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe") +//#define _REVIEW_REF_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reference") +//#define _REVIEW_SERVER_CONFIG_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig") +//#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg") +//#define _SYSTEM_SETTING_TITLE_ _T("ReviewSystemSetting") +//#define _RECIPE_EDITOR_TITLE_ _T("ReviewRecipeEditor") +//#define _REVIEW_LOGIN_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog\\LoginLog") +//#define _REVIEW_REFLOW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reflow") +//#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage") +//#define _REVIEW_RECIPE_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\Recipe") +//#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig") + #define TOTAL_WINDOW_SIZE_X 1920 #define TOTAL_WINDOW_SIZE_Y 1040 @@ -181,7 +201,9 @@ #define COPYDATA_SYSTEMSETTING2REVIEWSYSTEM 1500 #define COPYDATA_RECIPEEDITOR2REVIEWSYSTEM 1600 - +/*< LYW 20211111 - #3766 ADD Start >*/ +#define COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM 1800 +/*< LYW 20211111 - #3766 ADD End >*/ // [2017:1:13]-[WEZASW] : �떎以� 紐⑤땲�꽣�뿉�꽌�쓽 ReviewSystem Display enum MonitorPosition {MonitorPos_CENTER=0, MonitorPos_TOP, MonitorPos_BOTTOM, MonitorPos_LEFT, MonitorPos_RIGHT, MonitorPos_Count}; @@ -400,4 +422,30 @@ char strMessageString[MAX_PATH]; }; -BOOL KillProcess(CString ProcessName);BOOL getStateProcess(CString ProcessName); \ No newline at end of file +BOOL KillProcess(CString ProcessName);BOOL getStateProcess(CString ProcessName); + +// �꽑�뼵 +static LONG CALLBACK TopLevelExceptionFilterCallBack(EXCEPTION_POINTERS* exceptionInfo); + +LONG CALLBACK TopLevelExceptionFilterCallBack(EXCEPTION_POINTERS * exceptionInfo) +{ + MINIDUMP_EXCEPTION_INFORMATION dmpInfo = { 0 }; + dmpInfo.ThreadId = ::GetCurrentThreadId(); // Threae ID + dmpInfo.ExceptionPointers = exceptionInfo; // Exception Info + dmpInfo.ClientPointers = FALSE; + CTime time; + CString strStamp; + + SYSTEMTIME currentTime; + ::GetLocalTime(¤tTime); + time = CTime::GetCurrentTime(); + strStamp.Format(_T("Dump\\%02d_%02d_%02d_%02d_%02d_%02d.dmp"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond()); + + HANDLE hFile = CreateFile(strStamp, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + // �뜡�봽 �깮�꽦 + BOOL bWrite = ::MiniDumpWriteDump(::GetCurrentProcess(), ::GetCurrentProcessId(), hFile, MiniDumpNormal, &dmpInfo, NULL, NULL); + + return 0L; + +} \ No newline at end of file -- Gitblit v1.9.3