From 86500a56d8675ca52d6ebd0000d9d5781baaa8aa Mon Sep 17 00:00:00 2001
From: zhaolei <353719554@qq.com>
Date: Thu, 5 Mar 2026 10:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=A4=B4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataMgr/include/DataHelper.h   | 14 +++++++++-----
 DataMgr/include/DataManagger.h |  3 +--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/DataMgr/include/DataHelper.h b/DataMgr/include/DataHelper.h
index 3a4203e..e03bb9f 100644
--- a/DataMgr/include/DataHelper.h
+++ b/DataMgr/include/DataHelper.h
@@ -1,11 +1,14 @@
 #ifndef DATAHELPER_H
 #define DATAHELPER_H
 
-#include <Windows.h>
+#ifdef WIN32
+    #include <Windows.h>
+#endif // WIN32
+
 #include <QObject>
 #include <QTextStream>
 #include "MemRdWt.h"
-#include "datamanagerdefs.h"
+#include "DataManagerDefs.h"
 #pragma execution_character_set("utf-8")
 //#define  DefTabNum 10//9 whp change 2020.5.25
 //for 曲线计算
@@ -47,6 +50,7 @@ public:
 	static bool m_IsGc;
 	static QStringList GetAllWellName();
 	static QStringList GetAllWellRoundName(QString WellName,QStringList& WellRoundFileNameList);
+    static QMap<QString, QList<QString> > m_qmapWellFiles;
 };
 class Function
 {
@@ -84,8 +88,8 @@ public:
 	int isdelim(char c);
 	int iswhite(char c);
 	//int ComputeCurve(CString csExpress,float sdeps,float edeps,BOOL IsCurrentOpen);
-	BOOL GetKey();
-	BOOL CheckKey();
+//	BOOL GetKey();
+//	BOOL CheckKey();
 	int GetCodeLen(int Code);
 	//add whp
 	QString csName[MaxArg],csOutName;
@@ -108,4 +112,4 @@ public:
 	static void ReSampling(float *mr,int Row,int Col,float *aDep,float *tDep,int tnp);
 	static void ReSampling(short *mr,int Row,int Col,float *aDep,float *tDep,int tnp);
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/DataMgr/include/DataManagger.h b/DataMgr/include/DataManagger.h
index 07ddc69..81238c9 100644
--- a/DataMgr/include/DataManagger.h
+++ b/DataMgr/include/DataManagger.h
@@ -17,7 +17,7 @@ public:
 	~CDataManagger(); 
 	int GetDefTabNum();
 	DEFAULTTABLE *GetDefauleTable();
-    void SetWellFiles(QMap<QString, QList<QString> > &mapWellFiles){m_qmapWellFiles=mapWellFiles;}
+    void SetWellFiles(QMap<QString, QList<QString> > &mapWellFiles);
 //whp change 2020.3.9 for 统一离散数据入口
 	//交互导入数据表
 	 //void execInDefTable(int curitemType,const QString& showWellName,const QString& wellFileName);
@@ -102,6 +102,5 @@ private:
 	QString m_fileName;
 	QStringList m_CurveNameList;
     // QList<CObjWellLog*> m_ObjList;
-    QMap<QString, QList<QString> > m_qmapWellFiles;
 };