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

#2692 Ensemble curves. Add ensemble selection support to curve editor

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-10 21:29:55 +02:00
parent 090435a2ea
commit 6270dd3bc9
16 changed files with 265 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -466,6 +466,23 @@ QString RimSummaryPlot::asciiDataForPlotExport() const
return out;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RimSummaryPlot::summaryAndEnsembleCurves() const
{
std::vector<RimSummaryCurve*> curves = summaryCurves();
for (const auto& curveSet : ensembleCurveSetCollection()->curveSets())
{
for (const auto& curve : curveSet->curves())
{
curves.push_back(curve);
}
}
return curves;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -967,7 +984,32 @@ void RimSummaryPlot::deleteCurve(RimSummaryCurve* curve)
{
if (m_summaryCurveCollection)
{
m_summaryCurveCollection->deleteCurve(curve);
for (auto& c : m_summaryCurveCollection->curves())
{
if (c == curve)
{
m_summaryCurveCollection->deleteCurve(curve);
return;
}
}
}
if (m_ensembleCurveSetCollection)
{
for (auto& curveSet : m_ensembleCurveSetCollection->curveSets())
{
for (auto& c : curveSet->curves())
{
if (c == curve)
{
curveSet->deleteCurve(curve);
if (curveSet->curves().empty())
{
m_ensembleCurveSetCollection->deleteCurveSet(curveSet);
}
return;
}
}
}
}
}
}
@@ -986,7 +1028,7 @@ void RimSummaryPlot::deleteCurvesAssosiatedWithCase(RimSummaryCase* summaryCase)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSetCollection* RimSummaryPlot::ensembleCurveSets() const
RimEnsembleCurveSetCollection* RimSummaryPlot::ensembleCurveSetCollection() const
{
return m_ensembleCurveSetCollection;
}