OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3826 Summary curves. Draw error bars in front of all curves except from observed data curves

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-12-05 09:35:05 +01:00 committed by Magne Sjaastad
parent 0fa5a5b000
commit d482d3a4ca
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -667,15 +667,6 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionI
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::setZIndexFromCurveInfo()
{
// Z index. Higher Z is painted in front
enum ZIndex
{
Z_ENSEMBLE_CURVE = 100,
Z_ENSEMBLE_STAT_CURVE = 200,
Z_SINGLE_CURVE_NON_OBSERVED = 300,
Z_SINGLE_CURVE_OBSERVED = 400
};
auto sumAddr = summaryAddressY();
auto sumCase = summaryCaseY();
@ -683,19 +674,19 @@ void RimSummaryCurve::setZIndexFromCurveInfo()
{
if (sumCase->isObservedData())
{
setZOrder(Z_SINGLE_CURVE_OBSERVED);
setZOrder(RiuQwtPlotCurve::Z_SINGLE_CURVE_OBSERVED);
}
else if (sumAddr.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS)
{
setZOrder(Z_ENSEMBLE_STAT_CURVE);
setZOrder(RiuQwtPlotCurve::Z_ENSEMBLE_STAT_CURVE);
}
else if (sumCase->ensemble())
{
setZOrder(Z_ENSEMBLE_CURVE);
setZOrder(RiuQwtPlotCurve::Z_ENSEMBLE_CURVE);
}
else
{
setZOrder(Z_SINGLE_CURVE_NON_OBSERVED);
setZOrder(RiuQwtPlotCurve::Z_SINGLE_CURVE_NON_OBSERVED);
}
}
}

1
ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp
View File

@ -55,6 +55,7 @@ RiuQwtPlotCurve::RiuQwtPlotCurve(const QString &title)
m_errorBars->setStyle(QwtPlotIntervalCurve::CurveStyle::NoCurve);
m_errorBars->setSymbol(new QwtIntervalSymbol(QwtIntervalSymbol::Bar));
m_errorBars->setItemAttribute(QwtPlotItem::Legend, false);
m_errorBars->setZ(Z_ERROR_BARS);
m_showErrorBars = true;
m_attachedToPlot = nullptr;

10
ApplicationCode/UserInterface/RiuQwtPlotCurve.h
View File

@ -63,6 +63,16 @@ public:
STYLE_DASH_DOT
};
// Z index. Higher Z is painted in front
enum ZIndex
{
Z_ENSEMBLE_CURVE = 100,
Z_ENSEMBLE_STAT_CURVE = 200,
Z_SINGLE_CURVE_NON_OBSERVED = 300,
Z_ERROR_BARS = 400,
Z_SINGLE_CURVE_OBSERVED = 500
};
public:
explicit RiuQwtPlotCurve(const QString &title = QString::null);
~RiuQwtPlotCurve() override;