From 9db96cbb1b17fa0a4595c8ce017fcbf36557ce19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Thu, 28 Sep 2017 14:42:06 +0200 Subject: [PATCH] #1943 Curve creator. RimProject::allSummaryCases also returns observed data --- ApplicationCode/ProjectDataModel/RimProject.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index ba2b600cc8..3d45850efd 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -537,16 +537,23 @@ void RimProject::allCases(std::vector& cases) //-------------------------------------------------------------------------------------------------- void RimProject::allSummaryCases(std::vector& sumCases) { + sumCases.clear(); for (RimOilField* oilField: oilFields) { if(!oilField) continue; RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection(); if(sumCaseMainColl) { - sumCases.clear(); std::vector allSummaryCases = sumCaseMainColl->allSummaryCases(); sumCases.insert(sumCases.end(), allSummaryCases.begin(), allSummaryCases.end()); } + + auto observedDataColl = oilField->observedDataCollection(); + if (observedDataColl != nullptr && observedDataColl->allObservedData().size() > 0) + { + auto observedData = observedDataColl->allObservedData(); + sumCases.insert(sumCases.end(), observedData.begin(), observedData.end()); + } } }