From f77e8008cac062596058fca2aeddda62b80bedbf Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 14 7월 2023 17:03:10 +0900
Subject: [PATCH] Merge branch 'feature/#4517_CF_AOI_Review_결과_파일_찾기_실패_개선' into develop
---
DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawMessengerDlg.h | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawMessengerDlg.h b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawMessengerDlg.h
index 56b6972..7465412 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawMessengerDlg.h
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/DitGlassRawMessengerDlg.h
@@ -21,6 +21,10 @@
#define UM_GLASSRAW_CLIENTMESSAGE WM_USER+0x1231
#define UM_TRAYICON_MSG WM_USER + 0x1230
+ /* <LJC 20211122 : #3820 ADD Start> */
+#define COPYDATA_RAW_DOWNLOAD_ACK 11
+ /* <LJC 20211122 : #3820 ADD End> */
+
// CDitGlassRawMessengerDlg 대화 상자
class CDitGlassRawMessengerDlg : public CDialog
{
@@ -54,6 +58,11 @@
char m_strStackEquipID[32];
char m_strStackParam1[32];
char m_strStackParam2[32];
+
+ /*< KJG 20211024 - #3487 ADD Start >*/
+ int m_bUseRawMerge;
+ char m_strRawMergeLocalPath[256];
+ /*< KJG 20211024 - #3487 ADD End >*/
}m_ConfigOption;
void WriteConfigFile();
@@ -69,6 +78,10 @@
public:
static void threadMain(void* arg);
int m_nThreadMainFlag;
+
+ /* <LJC 20211122 : #3820 ADD Start> */
+ int m_nMaxMergeList=0;
+ /* <LJC 20211122 : #3820 ADD End> */
public:
CString m_strGlassID;
@@ -132,4 +145,8 @@
afx_msg void OnBnClickedBtnStackapply();
afx_msg void OnBnClickedTestCmd();
afx_msg void OnBnClickedBtnFtpManualupload();
+
+ /* <LJC 20211122 : #3820 ADD Start> */
+ afx_msg BOOL OnCopyData(CWnd* pWnd, COPYDATASTRUCT* pCopyDataStruct);
+ /* <LJC 20211122 : #3820 ADD End> */
};
--
Gitblit v1.9.3