OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4016 Observed Cases : Simplify access functions

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-05 10:11:30 +02:00
parent f99a332277
commit 26f89f6e35
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Application/RiaApplication.cpp
View File

@ -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<RimObservedData*>(observedCases);
if (rimObservedData)
{
rimObservedData->updateMetaData();
}
observedData->createSummaryReaderInterface();
observedData->updateMetaData();
}
oilField->fractureDefinitionCollection()->loadAndUpdateData();

4
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@ -121,11 +121,11 @@ QString RimOilField::uniqueShortNameForCase(RimSummaryCase* summaryCase)
std::set<QString> allAutoShortNames;
std::vector<RimSummaryCase*> allCases = summaryCaseMainCollection->allSummaryCases();
std::vector<RimSummaryCase*> observedDataCases = observedDataCollection->allObservedData();
std::vector<RimObservedData*> observedDataCases = observedDataCollection->allObservedData();
for (auto observedData : observedDataCases)
{
allCases.push_back(dynamic_cast<RimSummaryCase*>(observedData));
allCases.push_back(observedData);
}
for (RimSummaryCase* sumCase : allCases)

15
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -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"

8
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -75,13 +75,9 @@ void RimObservedDataCollection::removeObservedData(RimObservedData* observedData
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimObservedDataCollection::allObservedData()
std::vector<RimObservedData*> RimObservedDataCollection::allObservedData()
{
std::vector<RimSummaryCase*> allObservedData;
allObservedData.insert(allObservedData.begin(), m_observedDataArray.begin(), m_observedDataArray.end());
return allObservedData;
return m_observedDataArray.childObjects();
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h
View File

@ -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<RimSummaryCase*> allObservedData();
std::vector<RimObservedData*> allObservedData();
private:
bool fileExists(const QString& fileName, QString* errorText = nullptr);