diff --git a/logPlus/TransparentDraggableResult.h b/logPlus/TransparentDraggableResult.h index a0ded18..1b320e1 100644 --- a/logPlus/TransparentDraggableResult.h +++ b/logPlus/TransparentDraggableResult.h @@ -59,9 +59,8 @@ public: //拉伸 void DrawSVGSteched(QPainter* painter,QString svgFileName,QRectF borderRect,bool IsWellSectonHorizonLayout) { - QString svg; - QSvgRenderer m_SvgRenderer; - svg=svgFileName; + QString svg=svgFileName; + QSvgRenderer m_SvgRenderer; m_SvgRenderer.load(svg); m_SvgRenderer.render(painter,borderRect); } diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 428701b..29cf76d 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -1705,48 +1705,122 @@ bool FormDraw::LoadFromSLF_Result(QMyCustomPlot *widget, QString strSlfName, QSt // QString strUuid = ""; - if(result != "" && m_Result->MDepth1!=0) { - widget->addResultToPlot(-m_Result->MDepth1, -m_Result->StartDepth, result, strUuid); + if(result != "") + { + if(m_Result->MDepth1!=0) + { + widget->addResultToPlot(-m_Result->MDepth1, -m_Result->StartDepth, result, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->StartDepth, result, strUuid); + } } - if(result1 != "" && m_Result->MDepth2!=0) { - widget->addResultToPlot(-m_Result->MDepth2, -m_Result->MDepth1, result1, strUuid); + if(result1 != "") + { + if(m_Result->MDepth2!=0) + { + widget->addResultToPlot(-m_Result->MDepth2, -m_Result->MDepth1, result1, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth1, result1, strUuid); + } } - if(result2 != "" && m_Result->MDepth3!=0) { - widget->addResultToPlot(-m_Result->MDepth3, -m_Result->MDepth2, result2, strUuid); + if(result2 != "") + { + if(m_Result->MDepth3!=0) + { + widget->addResultToPlot(-m_Result->MDepth3, -m_Result->MDepth2, result2, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth2, result2, strUuid); + } } - if(result3 != "" && m_Result->MDepth4!=0) { - widget->addResultToPlot(-m_Result->MDepth4, -m_Result->MDepth3, result3, strUuid); + if(result3 != "") + { + if(m_Result->MDepth4!=0) + { + widget->addResultToPlot(-m_Result->MDepth4, -m_Result->MDepth3, result3, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth3, result3, strUuid); + } } - if(result4 != "" && m_Result->MDepth5!=0) { - widget->addResultToPlot(-m_Result->MDepth5, -m_Result->MDepth4, result4, strUuid); + if(result4 != "") + { + if(m_Result->MDepth5!=0) + { + widget->addResultToPlot(-m_Result->MDepth5, -m_Result->MDepth4, result4, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth4, result4, strUuid); + } } - if(result5 != "" && m_Result->MDepth6!=0) { - widget->addResultToPlot(-m_Result->MDepth6, -m_Result->MDepth5, result5, strUuid); + if(result5 != "") + { + if(m_Result->MDepth6!=0) + { + widget->addResultToPlot(-m_Result->MDepth6, -m_Result->MDepth5, result5, strUuid); + } + else{ + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth5, result5, strUuid); + } } - if(result6 != "" && m_Result->MDepth6!=0) { - widget->addResultToPlot(-m_Result->MDepth7, -m_Result->MDepth6, result6, strUuid); + if(result6 != "") + { + if(m_Result->MDepth6!=0) + { + widget->addResultToPlot(-m_Result->MDepth7, -m_Result->MDepth6, result6, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth6, result6, strUuid); + } } - if(result7 != "" && m_Result->MDepth8!=0) { - widget->addResultToPlot(-m_Result->MDepth8, -m_Result->MDepth7, result7, strUuid); + if(result7 != "") + { + if(m_Result->MDepth8!=0) + { + widget->addResultToPlot(-m_Result->MDepth8, -m_Result->MDepth7, result7, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth7, result7, strUuid); + } } - if(result8 != "" && m_Result->MDepth9!=0) { - widget->addResultToPlot(-m_Result->MDepth9, -m_Result->MDepth8, result8, strUuid); + if(result8 != "") + { + if(m_Result->MDepth9!=0) + { + widget->addResultToPlot(-m_Result->MDepth9, -m_Result->MDepth8, result8, strUuid); + } + else { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth8, result8, strUuid); + } } - if(result9 != "" && m_Result->MDepth10!=0) { - widget->addResultToPlot(-m_Result->MDepth10, -m_Result->MDepth9, result9, strUuid); + if(result9 != "") + { + if(m_Result->MDepth10!=0) + { + widget->addResultToPlot(-m_Result->MDepth10, -m_Result->MDepth9, result9, strUuid); + } + else{ + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth9, result9, strUuid); + } } - if(result10 != "" && m_Result->MDepth10!=0) { - widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth10, result10, strUuid); + if(result10 != "") + { + if(m_Result->MDepth10!=0) + { + widget->addResultToPlot(-m_Result->EndDepth, -m_Result->MDepth10, result10, strUuid); + } } }