麒麟系统,解决沉积相中文乱码问题
This commit is contained in:
parent
a27c1a52cb
commit
d42d981451
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user