diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 1308db5..2d5f9e6 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -156,7 +156,6 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo) //道-对象 FormInfo* pInfo = m_formTrack->setDrawDt(listdt, objInfo); - if ("waveObject" == strType) { FormWave *pwave = new FormWave(this, strSlfName, strWellName, m_strTrackName, strLineName); @@ -175,7 +174,17 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo) curv->initGeometry(m_strUuid, m_iScale, dW); curv->show(); - if ("waveObject" == strType) + if ("DrawImageObject" == strType) + { + curv->setScaleX(0, 264); + curv->m_strType = "DrawImageObject"; + curv->m_bX2Y = false; + curv->show(); + + //图像 成像 + curv->initImage(strSlfName, strLineName); + } + else if ("waveObject" == strType) { curv->m_nMode = pInfo->getFillTypeIndex(); //curv->m_fmin = pInfo->getVMin(); @@ -537,7 +546,7 @@ void FormDraw::DisplayLines(QJsonArray linesArray) if (strType == "curveObject") { DisplayLine_One(lineObjInfo); - } + } else if (strType == "tableObject") { QString strLineName = "";