From d42d981451f18dbe39e8c3206f0ed7a02608d9e6 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 30 Jun 2026 16:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=92=E9=BA=9F=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=89=E7=A7=AF=E7=9B=B8=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/qmycustomplot.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 73a1646..347f62c 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -9519,7 +9519,7 @@ void QMyCustomPlot::ReadFracDef_Fac() { m_FracDef.clear(); - QString fracFilePath = GetConfPath() + "GEoFac.ini"; + QString fracFilePath = GetConfPath() + "GeoFac.ini"; // FAC_DEF fd; @@ -9588,7 +9588,9 @@ void QMyCustomPlot::ReadData_Fac(QString strSlfName, QString csCurve, bool bAdd) if(bAdd) { //微相 - this->addMFacToPlot(-frac.edep, -frac.sdep, QString::fromLocal8Bit(frac.mFac), false); + //QString strMFac = QString::fromLocal8Bit(frac.mFac); + QString strMFac = GBKToUTF8(frac.mFac); + this->addMFacToPlot(-frac.edep, -frac.sdep, strMFac, false); } } mrw.CloseTable(iIndex); @@ -9627,9 +9629,9 @@ void QMyCustomPlot::DrawFac(int iType) FAC_TABLE pObj; pObj =m_ObjList_Fac[0]; if (iType==1) - str1 = QString::fromLocal8Bit(pObj.Fac); + str1 = GBKToUTF8(pObj.Fac);//QString::fromLocal8Bit(pObj.Fac); else - str1 = QString::fromLocal8Bit(pObj.Phase); + str1 = GBKToUTF8(pObj.Phase);//QString::fromLocal8Bit(pObj.Phase); str1.trimmed(); top = pObj.sdep; @@ -9638,9 +9640,9 @@ void QMyCustomPlot::DrawFac(int iType) pObj =m_ObjList_Fac[j]; if (iType==1) - str2= QString::fromLocal8Bit(pObj.Fac); + str2= GBKToUTF8(pObj.Fac);//QString::fromLocal8Bit(pObj.Fac); else - str2 = QString::fromLocal8Bit(pObj.Phase); + str2 = GBKToUTF8(pObj.Phase);//QString::fromLocal8Bit(pObj.Phase); str2.trimmed(); // if (str2!=str1 || j==(m_ObjList_Fac.count()-1))