diff --git a/Slfio/include/MemRdWt.h b/Slfio/include/MemRdWt.h index fbd4d74..5c15379 100644 --- a/Slfio/include/MemRdWt.h +++ b/Slfio/include/MemRdWt.h @@ -125,7 +125,7 @@ public: CMemRdWt(const char *wellname,bool mconst=FALSE,int FileType=0); ~CMemRdWt(); - static bool getPrjAllSlf(QString prjname, QVector &vecSlfList, QVector &vecWellList);//直方图,获取当前工程下的slf + static bool getPrjAllSlf(QString prjname, QVector &vecSlfList, QVector &vecWellList);//获取当前工程下的slf void Initialize(bool mconst=FALSE); void BackData(); diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 84a063a..9fc63a2 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -431,7 +431,8 @@ void FormDraw::DisplayLines(QJsonArray linesArray) } if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT" || strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE" - || strLineName == "LAYER_DATA") + || strLineName == "LAYER_DATA" + || strLineName == "RESULT") { //固井结论/井壁取心/录井剖面/文字结论/地质分层 DisplayTable_One(lineObjInfo); diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index 00eba14..965ce55 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -1175,11 +1175,11 @@ void QtProjectWidgets::onPasteSelObject() // 粘贴 char buf[1000]; int i=1; while(1) { - sprintf(buf,"%s_%d",m_strCopyCurveObjectName.toStdString().c_str(),i++); + sprintf(buf,"%s_%d",m_strCopyCurveObjectName.toLocal8Bit().data(),i++); if (0>logio->FindObjectName(buf)) break; } - logio->CopyObject(m_strCopyCurveObjectName.toStdString().c_str(), buf); + logio->CopyObject(m_strCopyCurveObjectName.toLocal8Bit().data(), buf); logio->Close(); delete logio;