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

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
crqiqi77 2026-03-26 11:38:36 +08:00
commit 6e1cd420e3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File 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,7 +431,8 @@ 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);

4
logPlus/qtprojectwidgets.cpp
View File

@ -1175,11 +1175,11 @@ void QtProjectWidgets::onPasteSelObject() // 粘贴
char buf[1000]; char buf[1000];
int i=1; int i=1;
while(1) { while(1) {
sprintf(buf,"%s_%d",m_strCopyCurveObjectName.toStdString().c_str(),i++); sprintf(buf,"%s_%d",m_strCopyCurveObjectName.toLocal8Bit().data(),i++);
if (0>logio->FindObjectName(buf)) if (0>logio->FindObjectName(buf))
break; break;
} }
logio->CopyObject(m_strCopyCurveObjectName.toStdString().c_str(), buf); logio->CopyObject(m_strCopyCurveObjectName.toLocal8Bit().data(), buf);
logio->Close(); logio->Close();
delete logio; delete logio;