From c69de5f28b3e5657f5f387e479a45333ce4e4534 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 30 Jun 2026 14:17:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=BA=92=E9=BA=9F=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=95=E5=A3=81=E5=8F=96=E5=BF=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=80=E8=87=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/QtWindowWellSection.cpp | 6 +++--- logPlus/qmycustomplot.cpp | 28 +++++++++++++++++----------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/logPlus/QtWindowWellSection.cpp b/logPlus/QtWindowWellSection.cpp index 143e069..9417459 100644 --- a/logPlus/QtWindowWellSection.cpp +++ b/logPlus/QtWindowWellSection.cpp @@ -637,9 +637,9 @@ void CQtWindowWellSection::OnListBedValue(QString m_csWellName,QString m_OGTable int m_CoreRecNum=0; for(int j=0;j<4;j++) { - if(j==0) color=cs+"corecolor.ini"; - else if(j==1) color=cs+"corelith.ini"; - else if(j==2) color=cs+"coreoil.ini"; + if(j==0) color=cs+"Corecolor.ini"; + else if(j==1) color=cs+"CoreLith.ini"; + else if(j==2) color=cs+"CoreOil.ini"; else color=cs+"colorind.ini"; FILE *fp=fopen(color.toStdString().c_str(),"rt"); QStringList ss; diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index e0b69d3..73a1646 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -2432,9 +2432,9 @@ bool QMyCustomPlot::SaveToSLF_SwallCore() QString color; for(int j=0;j<4;j++) { - if(j==0) color=cs+"corecolor.ini"; - else if(j==1) color=cs+"corelith.ini"; - else if(j==2) color=cs+"coreoil.ini"; + if(j==0) color=cs+"Corecolor.ini"; + else if(j==1) color=cs+"CoreLith.ini"; + else if(j==2) color=cs+"CoreOil.ini"; else color=cs+"colorind.ini"; FILE *fp=fopen(color.toStdString().c_str(),"rt"); QStringList ss; @@ -3214,9 +3214,9 @@ void QMyCustomPlot::addItem_SWallCore() QString color; for(int j=0;j<4;j++) { - if(j==0) color=cs+"corecolor.ini"; - else if(j==1) color=cs+"corelith.ini"; - else if(j==2) color=cs+"coreoil.ini"; + if(j==0) color=cs+"Corecolor.ini"; + else if(j==1) color=cs+"CoreLith.ini"; + else if(j==2) color=cs+"CoreOil.ini"; else color=cs+"colorind.ini"; FILE *fp=fopen(color.toStdString().c_str(),"rt"); QStringList ss; @@ -3989,9 +3989,9 @@ bool QMyCustomPlot::LoadFromSLF_SwallCore(QString strSlfName, QString strLineNam QString color; for(int j=0;j<4;j++) { - if(j==0) color=cs+"corecolor.ini"; - else if(j==1) color=cs+"corelith.ini"; - else if(j==2) color=cs+"coreoil.ini"; + if(j==0) color=cs+"Corecolor.ini"; + else if(j==1) color=cs+"CoreLith.ini"; + else if(j==2) color=cs+"CoreOil.ini"; else color=cs+"colorind.ini"; FILE *fp=fopen(color.toStdString().c_str(),"rt"); QStringList ss; @@ -7622,7 +7622,10 @@ void QMyCustomPlot::s_changeGeoLithLine(QString strUuid, QString strSlfName, QSt //重新加载 LoadFromSLF_GeoLith(m_strSlfName, m_strLineName); - //不清空属性窗口 + //不清空属性窗口(修改为：对象已失效，需要清空属性) + + //属性清空 + PropertyService()->InitCurrentViewInfo(); } //改变录井剖面属性，是否显示 @@ -7679,7 +7682,10 @@ void QMyCustomPlot::s_changeGeoLithShow(QString strUuid, QString strSlfName, QSt //重新加载 LoadFromSLF_GeoLith(m_strSlfName, m_strLineName); - //不清空属性窗口 + //不清空属性窗口(修改为：对象已失效，需要清空属性) + + //属性清空 + PropertyService()->InitCurrentViewInfo(); } //改变沉积相属性，是否显示 From a27c1a52cbfe6670e713d82b99273b2d7e0c66c8 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 30 Jun 2026 14:59:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E9=BA=92=E9=BA=9F?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=EF=BC=8C=E5=B2=A9=E6=80=A7=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E5=BA=93.lib=E7=BB=9F=E4=B8=80=E9=87=87=E7=94=A8UTF8=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/GeoIndicatorGenerator.cpp | 1 + logPlus/GeoIndicatorGenerator.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/logPlus/GeoIndicatorGenerator.cpp b/logPlus/GeoIndicatorGenerator.cpp index 54e7fc1..23675c6 100644 --- a/logPlus/GeoIndicatorGenerator.cpp +++ b/logPlus/GeoIndicatorGenerator.cpp @@ -67,6 +67,7 @@ bool GeoIndicatorGenerator::initGeoInf(QString libName, int libNum) if(!file.open(QIODevice::ReadOnly)) return false; QTextStream stream(&file); + stream.setCodec("UTF-8"); // 设置UTF-8编码 QString line; int lineNum = 0; diff --git a/logPlus/GeoIndicatorGenerator.h b/logPlus/GeoIndicatorGenerator.h index 075be76..e058ac2 100644 --- a/logPlus/GeoIndicatorGenerator.h +++ b/logPlus/GeoIndicatorGenerator.h @@ -4,6 +4,8 @@ #include #include #include +#pragma execution_character_set("utf-8") + class GeoIndicatorGenerator { public: From d42d981451f18dbe39e8c3206f0ed7a02608d9e6 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 30 Jun 2026 16:26:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BA=92=E9=BA=9F=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=B2=89=E7=A7=AF=E7=9B=B8=E4=B8=AD?= =?UTF-8?q?=E6=96=87=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))