修改提交头文件
This commit is contained in:
parent
1e15c4f8e1
commit
86500a56d8
|
|
@ -1,11 +1,14 @@
|
|||
#ifndef DATAHELPER_H
|
||||
#define DATAHELPER_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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user