jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提交头文件

Browse Source
This commit is contained in:
zhaolei 2026-03-05 10:25:48 +08:00
parent 1e15c4f8e1
commit 86500a56d8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DataMgr/include/DataHelper.h
View File

@ -1,11 +1,14 @@
#ifndef DATAHELPER_H #ifndef DATAHELPER_H
#define DATAHELPER_H #define DATAHELPER_H
#include <Windows.h> #ifdef WIN32
#include <Windows.h>
#endif // WIN32
#include <QObject> #include <QObject>
#include <QTextStream> #include <QTextStream>
#include "MemRdWt.h" #include "MemRdWt.h"
#include "datamanagerdefs.h" #include "DataManagerDefs.h"
#pragma execution_character_set("utf-8") #pragma execution_character_set("utf-8")
//#define DefTabNum 10//9 whp change 2020.5.25 //#define DefTabNum 10//9 whp change 2020.5.25
//for 曲线计算 //for 曲线计算
@ -47,6 +50,7 @@ public:
static bool m_IsGc; static bool m_IsGc;
static QStringList GetAllWellName(); static QStringList GetAllWellName();
static QStringList GetAllWellRoundName(QString WellName,QStringList& WellRoundFileNameList); static QStringList GetAllWellRoundName(QString WellName,QStringList& WellRoundFileNameList);
static QMap<QString, QList<QString> > m_qmapWellFiles;
}; };
class Function class Function
{ {
@ -84,8 +88,8 @@ public:
int isdelim(char c); int isdelim(char c);
int iswhite(char c); int iswhite(char c);
//int ComputeCurve(CString csExpress,float sdeps,float edeps,BOOL IsCurrentOpen); //int ComputeCurve(CString csExpress,float sdeps,float edeps,BOOL IsCurrentOpen);
BOOL GetKey(); // BOOL GetKey();
BOOL CheckKey(); // BOOL CheckKey();
int GetCodeLen(int Code); int GetCodeLen(int Code);
//add whp //add whp
QString csName[MaxArg],csOutName; 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(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); static void ReSampling(short *mr,int Row,int Col,float *aDep,float *tDep,int tnp);
}; };
#endif #endif

3
DataMgr/include/DataManagger.h
View File

@ -17,7 +17,7 @@ public:
~CDataManagger(); ~CDataManagger();
int GetDefTabNum(); int GetDefTabNum();
DEFAULTTABLE *GetDefauleTable(); 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 统一离散数据入口 //whp change 2020.3.9 for 统一离散数据入口
//交互导入数据表 //交互导入数据表
//void execInDefTable(int curitemType,const QString& showWellName,const QString& wellFileName); //void execInDefTable(int curitemType,const QString& showWellName,const QString& wellFileName);
@ -102,6 +102,5 @@ private:
QString m_fileName; QString m_fileName;
QStringList m_CurveNameList; QStringList m_CurveNameList;
// QList<CObjWellLog*> m_ObjList; // QList<CObjWellLog*> m_ObjList;
QMap<QString, QList<QString> > m_qmapWellFiles;
}; };