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

Compare commits

base: jiayulong:0868f89b1a68df8cc81a233091f2e038753a9628
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:826d38f081ff2ded64d86eaea4bd893e053a6008
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "0868f89b1a68df8cc81a233091f2e038753a9628" and "826d38f081ff2ded64d86eaea4bd893e053a6008" have entirely different histories.
0868f89b1a ... 826d38f081

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

2
Slfio/include/MemRdWt.h
View File

@ -125,7 +125,7 @@ public:
CMemRdWt(const char *wellname,bool mconst=FALSE,int FileType=0); CMemRdWt(const char *wellname,bool mconst=FALSE,int FileType=0);
~CMemRdWt(); ~CMemRdWt();
static bool getPrjAllSlf(QString prjname, QVector<QString> &vecSlfList, QVector<QString> &vecWellList);//获取当前工程下的slf static bool getPrjAllSlf(QString prjname, QVector<QString> &vecSlfList, QVector<QString> &vecWellList);//直方图，获取当前工程下的slf
void Initialize(bool mconst=FALSE); void Initialize(bool mconst=FALSE);
void BackData(); void BackData();

3
logPlus/formdraw.cpp
View File

@ -431,8 +431,7 @@ void FormDraw::DisplayLines(QJsonArray linesArray)
} }
if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT" if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT"
|| strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE" || strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE"
|| strLineName == "LAYER_DATA" || strLineName == "LAYER_DATA")
|| strLineName == "RESULT")
{ {
//固井结论/井壁取心/录井剖面/文字结论/地质分层 //固井结论/井壁取心/录井剖面/文字结论/地质分层
DisplayTable_One(lineObjInfo); DisplayTable_One(lineObjInfo);