diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 0e51ba3..0939dcb 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -463,144 +463,10 @@ void FormDraw::DisplayLines(QJsonArray linesArray) //套管组件 DisplayTubing_One(lineObjInfo); } - } - else if("plObject" == strType) - { - initFgrq(curv); - } - else if("roseObject" == strType) - { - initRose(curv); - } - else if("dcaObject" == strType) - { - initDCA(curv); - } - else if("tdtObject" == strType) - { - initTDT(curv); - - if(m_iY1 == 0.0) - { - QTimer::singleShot(200, this, [=]() { - m_iY2 = -2000; - m_iY1 = -2030; - emit CallManage::getInstance()->sig_changeDepth(m_strUuid, m_strSlfName, m_strWellName, m_iY1, m_iY2); - }); - } - - } - else if (strType == "tableObject") - { - //新建表格曲线 - emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName); - } - curv->replot(); - - connect(curv, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(s_mouseWheel(QWheelEvent*))); - - QTimer::singleShot(100, this, [=]() { - emit CallManage::getInstance()->sig_ReplotFinished(m_strUuid); - }); - - // - m_listLineName.push_back(strLineName); -} - - -void FormDraw::setDrawPropert(QJsonObject objInfo) -{ - if (objInfo.contains("formInfos")) - { - QJsonValue value = objInfo.value("formInfos"); - if (value.isArray()) { - QJsonArray linesArray = value.toArray(); - qDebug() << "linesArray number:" << QString::number(linesArray.size()); - //展示所有曲线 - DisplayLines(linesArray); - } - } -} - -void FormDraw::DisplayLines(QJsonArray linesArray) -{ - QMap mapLines; - - int id = 0; - int iCount = linesArray.size(); - for (int i = 0; i < iCount; i++) - { - QJsonValue lineValue = linesArray[i]; - - QJsonObject lineObj = lineValue.toObject(); - // - if (lineObj.contains("id")) - { - QJsonValue value = lineObj.value("id"); - if (value.isDouble()) { - id = value.toInt(); - qDebug() << "id:" << QString::number(id); - // - mapLines.insert(id, i); - } - } - } - - for (int id = 0; id < iCount; id++) - { - if (mapLines.contains(id)) - { - int iNum = mapLines.value(id); - //按照id顺序,展示曲线 - QJsonValue lineValue = linesArray[iNum]; - QJsonObject lineObj = lineValue.toObject(); - // - if (lineObj.contains("info")) - { - QJsonValue value = lineObj.value("info"); - if (value.isObject()) { - QJsonObject lineObjInfo = value.toObject(); - - QString strType = lineObjInfo.value("Type").toString(); - - //展示其中一条曲线 - if (strType == "curveObject") + else if (strType == "depthObject") { - DisplayLine_One(lineObjInfo); - } - else if (strType == "tableObject") - { - QString strLineName = ""; - if (lineObjInfo.contains("LineName")) - { - QJsonValue value = lineObjInfo.value("LineName"); - if (value.isString()) { - strLineName = value.toString(); - //qDebug() << "LineName:" << strLineName; - } - } - if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT" - || strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE" - || strLineName == "LAYER_DATA") - { - //固井结论/井壁取心/录井剖面/文字结论/地质分层 - DisplayTable_One(lineObjInfo); - } - } - else if (strType == "JiegutextObject") - { - //气测/FMT/射孔/文本 - DisplayJiegutext_One(lineObjInfo); - } - else if (strType == "LogfaceObject") - { - //沉积相 - DisplayFac_One(lineObjInfo); - } - else if (strType == "TubingstringObject") - { - //套管组件 - DisplayTubing_One(lineObjInfo); + // 深度 + DisplayDepth_One(lineObjInfo); } else if (strType == "SantuyibiaoObject") { @@ -617,6 +483,22 @@ void FormDraw::DisplayLines(QJsonArray linesArray) } } +// 深度 +void FormDraw::DisplayDepth_One(QJsonObject objInfo) +{ + QString strType = objInfo.value("Type").toString(); + QString strLineName = objInfo.value("LineName").toString(); + + QStringList dt; + dt << m_strUuid; + dt << m_strWellName; + dt << m_strSlfName; + dt << strLineName; + dt << strType; + dt << QString::number(m_nTrackW); + this->setDrawData(dt, objInfo); +} + //表格:固井结论等 void FormDraw::DisplayTable_One(QJsonObject lineObjInfo) {