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

#3760 Summary plot. Z ordering different types of summary curves

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-11-29 15:28:53 +01:00
parent f14d36ca23
commit 7f0b05a93b
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -1028,7 +1028,6 @@ void RimEnsembleCurveSet::updateStatisticsCurves(const std::vector<RimSummaryCas
curve->setSummaryCaseY(m_ensembleStatCase.get());
curve->setSummaryAddressY(address);
curve->setLeftOrRightAxisY(m_plotAxis());
curve->setZOrder(1000);
curve->updateCurveVisibility(false);
curve->loadDataAndUpdate(false);

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

@ -164,6 +164,7 @@ void RimSummaryCurve::setSummaryCaseY(RimSummaryCase* sumCase)
}
m_yValuesSummaryCase = sumCase;
setZIndexFromCurveInfo();
}
//--------------------------------------------------------------------------------------------------
@ -211,6 +212,7 @@ void RimSummaryCurve::setSummaryAddressY(const RifEclipseSummaryAddress& address
}
m_yValuesCurveVariable->setAddress(address);
setZIndexFromCurveInfo();
m_yValuesSummaryFilter->updateFromAddress(address);
@ -660,6 +662,44 @@ 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();
if (sumCase && sumAddr.isValid())
{
if (sumCase->isObservedData())
{
setZOrder(Z_SINGLE_CURVE_OBSERVED);
}
else if (sumAddr.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS)
{
setZOrder(Z_ENSEMBLE_STAT_CURVE);
}
else if (sumCase->ensemble())
{
setZOrder(Z_ENSEMBLE_CURVE);
}
else
{
setZOrder(Z_SINGLE_CURVE_NON_OBSERVED);
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@ -106,6 +106,7 @@ private:
static void appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase,
RimSummaryFilter* summaryFilter);
void setZIndexFromCurveInfo();
private:
// Y values