From a887e9c2ab435d8ad92d637c3af6a003e70b446b Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Mon, 15 Jun 2026 17:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=A1=A8=E6=A0=BC=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=BC=95=E8=B5=B7=E7=9A=84=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WellLogUI/src/griddataadapter.cpp | 4 ++-- common/geometryutils.cpp | 2 ++ logPlus/qtprojectwidgets.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/WellLogUI/src/griddataadapter.cpp b/WellLogUI/src/griddataadapter.cpp index 7c99b7f..f018d1f 100644 --- a/WellLogUI/src/griddataadapter.cpp +++ b/WellLogUI/src/griddataadapter.cpp @@ -2613,7 +2613,7 @@ void GridDataAdapter::initTableWellLogData(DType type,QList WellLo return ; } char name[100]; - strcpy(name,m_pWellLogs[0]->GetName().toLocal8Bit().toStdString().c_str()); + strcpy(name,m_pWellLogs[0]->GetName().toStdString().c_str()); int iIndex=logio->OpenTable(name); if (iIndex >=0) { @@ -2747,7 +2747,7 @@ void GridDataAdapter::updatetTableWellLogData() return ; } char name[100]; - strcpy(name,m_pWellLogs[0]->GetName().toLocal8Bit().toStdString().c_str()); + strcpy(name,m_pWellLogs[0]->GetName().toStdString().c_str()); int iIndex=logio->OpenTable(name); if (iIndex >=0) { diff --git a/common/geometryutils.cpp b/common/geometryutils.cpp index bddbc04..247b76d 100644 --- a/common/geometryutils.cpp +++ b/common/geometryutils.cpp @@ -1123,6 +1123,8 @@ QString GBKToUTF8(const QByteArray& gbkData) { // UTF-8 转 GBK QByteArray UTF8ToGBK(const QString& utf8Str) { + // 此处编码 库加了#pragma execution_character_set("utf-8") ，是否正确？？？ + return utf8Str.toStdString().c_str(); QTextCodec* gbkCodec = QTextCodec::codecForName("GBK"); if (!gbkCodec) { return QByteArray(); diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index 798eb72..924c243 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -2012,8 +2012,10 @@ void QtProjectWidgets::onDeleteObject() } QList listDeleteObject = mapDeleteObject[strSlfName]; - for (int j=0; jDeleteObject(listDeleteObject.at(j).toLocal8Bit().data()); + for (int j = 0; j < listDeleteObject.size(); j++) + { + logio->DeleteObject(listDeleteObject.at(j).toStdString().c_str()); + } logio->Close(); delete logio; }