From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
ReviewSystem/ReviewSystem/DisplayMessage.h | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DisplayMessage.h b/ReviewSystem/ReviewSystem/DisplayMessage.h
index 4c5800c..70533f9 100644
--- a/ReviewSystem/ReviewSystem/DisplayMessage.h
+++ b/ReviewSystem/ReviewSystem/DisplayMessage.h
@@ -11,10 +11,16 @@
virtual void DM2P_DisplayMessage(const TCHAR* lpstrFormat, ...) = 0;
};
-DWORD RunThreadDisplayLog(LPVOID param);
class CDisplayMessage : public Singleton<CDisplayMessage>
{
+ /*< SWK 20221226 - #4403 ADD Start >*/
+ typedef struct _Log_Data
+ {
+ SYSTEMTIME currentTime;
+ CString strLog;
+ }LogData, *pLogData;
+ /*< SWK 20221226 - #4403 ADD End >*/
public:
CDisplayMessage(const CString& strPath);
virtual ~CDisplayMessage(void);
@@ -22,13 +28,19 @@
public:
void SetDM2P(IDisplayMessage2Parent* pDM2P) { m_pDM2P = pDM2P; }
void SetPath(const CString& strPath);
- BOOL MakeLogFile();
- BOOL WriteToFile(const CString& strMessage);
void DisplayMessage(const CString& strMessage);
void DisplayMessage(const TCHAR* lpstrFormat, ...);
- void ThreadDisplayMessage(const CString & strMessage);
+ //< SWK 20221226 - #4403 MOD >
+// void ThreadDisplayMessage(const CString & strMessage);
+ void ThreadDisplayMessage(const LogData& logdata);
+protected:
+ BOOL MakeLogFile();
+ //< SWK 20221226 - #4403 MOD >
+// BOOL WriteToFile(const CString& strMessage);
+ BOOL WriteToFile(const SYSTEMTIME& time, const CString& strMessage);
-public:
+ static DWORD RunThreadDisplayLog(LPVOID param);
+private:
CTime m_TimeLogFile;
CFile* m_pFileLog;
CString m_strLogPath;
--
Gitblit v1.9.3