From 26f89f6e3577d8ced98d4f8292f17802e86a93a8 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 5 Apr 2019 10:11:30 +0200 Subject: [PATCH] #4016 Observed Cases : Simplify access functions --- ApplicationCode/Application/RiaApplication.cpp | 11 +++-------- ApplicationCode/ProjectDataModel/RimOilField.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimProject.cpp | 15 ++++++++------- .../Summary/RimObservedDataCollection.cpp | 8 ++------ .../Summary/RimObservedDataCollection.h | 3 +-- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index f9ea2f3d73..eb4f104e1a 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -548,15 +548,10 @@ bool RiaApplication::loadProject(const QString& projectFileName, { oilField->observedDataCollection = new RimObservedDataCollection(); } - for (auto observedCases : oilField->observedDataCollection()->allObservedData()) + for (RimObservedData* observedData : oilField->observedDataCollection()->allObservedData()) { - observedCases->createSummaryReaderInterface(); - - RimObservedData* rimObservedData = dynamic_cast(observedCases); - if (rimObservedData) - { - rimObservedData->updateMetaData(); - } + observedData->createSummaryReaderInterface(); + observedData->updateMetaData(); } oilField->fractureDefinitionCollection()->loadAndUpdateData(); diff --git a/ApplicationCode/ProjectDataModel/RimOilField.cpp b/ApplicationCode/ProjectDataModel/RimOilField.cpp index 5008d49818..75e35f18ab 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp @@ -121,11 +121,11 @@ QString RimOilField::uniqueShortNameForCase(RimSummaryCase* summaryCase) std::set allAutoShortNames; std::vector allCases = summaryCaseMainCollection->allSummaryCases(); - std::vector observedDataCases = observedDataCollection->allObservedData(); + std::vector observedDataCases = observedDataCollection->allObservedData(); for (auto observedData : observedDataCases) { - allCases.push_back(dynamic_cast(observedData)); + allCases.push_back(observedData); } for (RimSummaryCase* sumCase : allCases) diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index b23a7ff55a..04a548adc2 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -30,10 +30,9 @@ #include "RigEclipseCaseData.h" #include "RigGridBase.h" +#include "RimAdvancedSnapshotExportDefinition.h" #include "RimAnnotationCollection.h" #include "RimAnnotationInViewCollection.h" -#include "RimPolylinesFromFileAnnotation.h" -#include "RimUserDefinedPolylinesAnnotation.h" #include "RimCalcScript.h" #include "RimCase.h" #include "RimCaseCollection.h" @@ -47,28 +46,30 @@ #include "RimFormationNamesCollection.h" #include "RimFractureTemplate.h" #include "RimFractureTemplateCollection.h" -#include "RimGridCrossPlotCollection.h" -#include "RimSaturationPressurePlotCollection.h" -#include "RimValveTemplate.h" -#include "RimValveTemplateCollection.h" #include "RimGeoMechCase.h" #include "RimGeoMechModels.h" +#include "RimGridCrossPlotCollection.h" #include "RimGridSummaryCase.h" #include "RimGridView.h" #include "RimIdenticalGridCaseGroup.h" #include "RimMainPlotCollection.h" #include "RimMeasurement.h" -#include "RimAdvancedSnapshotExportDefinition.h" +#include "RimObservedData.h" #include "RimObservedDataCollection.h" #include "RimOilField.h" #include "RimPltPlotCollection.h" +#include "RimPolylinesFromFileAnnotation.h" #include "RimRftPlotCollection.h" +#include "RimSaturationPressurePlotCollection.h" #include "RimScriptCollection.h" #include "RimSummaryCalculationCollection.h" #include "RimSummaryCaseMainCollection.h" #include "RimSummaryCrossPlotCollection.h" #include "RimSummaryPlotCollection.h" #include "RimTools.h" +#include "RimUserDefinedPolylinesAnnotation.h" +#include "RimValveTemplate.h" +#include "RimValveTemplateCollection.h" #include "RimViewLinker.h" #include "RimViewLinkerCollection.h" #include "RimWellLogFile.h" diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp index 11363d5a5a..fea5bcd6ef 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp @@ -75,13 +75,9 @@ void RimObservedDataCollection::removeObservedData(RimObservedData* observedData //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimObservedDataCollection::allObservedData() +std::vector RimObservedDataCollection::allObservedData() { - std::vector allObservedData; - - allObservedData.insert(allObservedData.begin(), m_observedDataArray.begin(), m_observedDataArray.end()); - - return allObservedData; + return m_observedDataArray.childObjects(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h index 0bcd4d8b37..5b3834bc22 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h @@ -21,7 +21,6 @@ #include "cafPdmObject.h" #include "cafPdmChildArrayField.h" -class RimSummaryCase; class RimObservedData; class QFile; @@ -39,7 +38,7 @@ public: void removeObservedData(RimObservedData* observedData); RimObservedData* createAndAddRsmObservedDataFromFile(const QString& fileName, QString* errorText = nullptr); RimObservedData* createAndAddCvsObservedDataFromFile(const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText = nullptr); - std::vector allObservedData(); + std::vector allObservedData(); private: bool fileExists(const QString& fileName, QString* errorText = nullptr);