From c69de5f28b3e5657f5f387e479a45333ce4e4534 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 30 Jun 2026 14:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=92=E9=BA=9F=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=95=E5=A3=81=E5=8F=96=E5=BF=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=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(); } //改变沉积相属性，是否显示