From 7ac873a489b5fbe6dfb4b0f819cb33ad0ac4f0b3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Thu, 26 Mar 2026 10:14:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=A7=A3=E9=87=8A?= =?UTF-8?q?=E7=BB=93=E8=AE=BA=E9=81=93json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/formdraw.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index a757e4f..44ed1db 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -431,7 +431,8 @@ void FormDraw::DisplayLines(QJsonArray linesArray) } if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT" || strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE" - || strLineName == "LAYER_DATA") + || strLineName == "LAYER_DATA" + || strLineName == "RESULT") { //固井结论/井壁取心/录井剖面/文字结论/地质分层 DisplayTable_One(lineObjInfo); From 826d38f081ff2ded64d86eaea4bd893e053a6008 Mon Sep 17 00:00:00 2001 From: zhaolei <353719554@qq.com> Date: Thu, 26 Mar 2026 11:07:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E9=BB=8F=E8=B4=B4?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=BA=E6=B1=89=E5=AD=97=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/qtprojectwidgets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index 00eba14..965ce55 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -1175,11 +1175,11 @@ void QtProjectWidgets::onPasteSelObject() // 粘贴 char buf[1000]; int i=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)) break; } - logio->CopyObject(m_strCopyCurveObjectName.toStdString().c_str(), buf); + logio->CopyObject(m_strCopyCurveObjectName.toLocal8Bit().data(), buf); logio->Close(); delete logio; From 9a4b300414a27ceb17e9339a63a52820444ad450 Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Thu, 26 Mar 2026 11:11:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Slfio/include/MemRdWt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Slfio/include/MemRdWt.h b/Slfio/include/MemRdWt.h index fbd4d74..5c15379 100644 --- a/Slfio/include/MemRdWt.h +++ b/Slfio/include/MemRdWt.h @@ -125,7 +125,7 @@ public: CMemRdWt(const char *wellname,bool mconst=FALSE,int FileType=0); ~CMemRdWt(); - static bool getPrjAllSlf(QString prjname, QVector &vecSlfList, QVector &vecWellList);//直方图，获取当前工程下的slf + static bool getPrjAllSlf(QString prjname, QVector &vecSlfList, QVector &vecWellList);//获取当前工程下的slf void Initialize(bool mconst=FALSE); void BackData();