From a0dae9209e1ccdbfc93a52fe7ba322b79fa12aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Wed, 20 Sep 2017 08:05:37 +0200 Subject: [PATCH] #1815 Observed data. Add folder 'Observed Data' in case editor --- .../RicSummaryCurveCreator.cpp | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp index 8dbee54cfd..33f5dfe894 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp @@ -33,6 +33,8 @@ #include "RimSummaryPlot.h" #include "RimSummaryPlotCollection.h" #include "RimSummaryCurveCollection.h" +#include "RimObservedDataCollection.h" +#include "RimObservedData.h" #include "RiuMainPlotWindow.h" @@ -377,21 +379,19 @@ QList RicSummaryCurveCreator::calculateValueOptions(cons } } - // Observed cases + // Observed data + auto observedDataColl = oilField->observedDataCollection(); + if (observedDataColl->allObservedData().size() > 0) + { + options.push_back(caf::PdmOptionItemInfo::createHeader("Observed Data", true)); - // Under construction... - //auto observedCases = sumCaseMainColl->topLevelSummaryCases/*observedCases*/(); - //if (observedCases.size() > 0) - //{ - // options.push_back(caf::PdmOptionItemInfo::createHeader("Observed Summary Cases", true)); - - // for (const auto& sumCase : observedCases) - // { - // auto optionItem = caf::PdmOptionItemInfo(sumCase->caseName(), sumCase); - // optionItem.setLevel(1); - // options.push_back(optionItem); - // } - //} + for (const auto& obsData : observedDataColl->allObservedData()) + { + auto optionItem = caf::PdmOptionItemInfo(obsData->caseName(), obsData); + optionItem.setLevel(1); + options.push_back(optionItem); + } + } } } }