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

Compare commits

base: jiayulong:86500a56d8675ca52d6ebd0000d9d5781baaa8aa
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:6513750e759534dc1cbd9adc16d9442bdb4040f2
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "86500a56d8675ca52d6ebd0000d9d5781baaa8aa" and "6513750e759534dc1cbd9adc16d9442bdb4040f2" have entirely different histories.
86500a56d8 ... 6513750e75

2 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

14
DataMgr/include/DataHelper.h
View File

@ -1,14 +1,11 @@
#ifndef DATAHELPER_H #ifndef DATAHELPER_H
#define DATAHELPER_H #define DATAHELPER_H
#ifdef WIN32 #include <Windows.h>
#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 曲线计算
@ -50,7 +47,6 @@ 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
{ {
@ -88,8 +84,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;
@ -112,4 +108,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,6 @@ public:
~CDataManagger(); ~CDataManagger();
int GetDefTabNum(); int GetDefTabNum();
DEFAULTTABLE *GetDefauleTable(); DEFAULTTABLE *GetDefauleTable();
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);
@ -26,7 +25,7 @@ public:
//void dataInTable(const QStringList& lst ); //void dataInTable(const QStringList& lst );
//QStringList dataInTable(int curitemType,const QString& showWellName,const QString& wellFileName);//返回不能识别的非定式的数据文件列表 //QStringList dataInTable(int curitemType,const QString& showWellName,const QString& wellFileName);//返回不能识别的非定式的数据文件列表
void dataInTable(int curitemType,QString& showWellName,QString& wellFileName); void dataInTable(int curitemType,QString& showWellName,QString& wellFileName);
void CopyObject(int curitemType,const QString& WellName,const QString& wellFileName); // void CopyObject(int curitemType,const QString& WellName,const QString& wellFileName);
// //
//曲线属性编辑 //曲线属性编辑
void CurvePropertyEdit(int Type,const QString& FileName,const QString& CurveName); void CurvePropertyEdit(int Type,const QString& FileName,const QString& CurveName);