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

#1813 Observed data: Functions to add observed data to collection

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-18 10:44:28 +02:00
parent 7bb7e4c5f9
commit ae7430a697
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp
View File

@ -20,6 +20,7 @@
#include "RimObservedDataCollection.h" #include "RimObservedDataCollection.h"
#include "RimObservedData.h" #include "RimObservedData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection"); CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
@ -42,3 +43,34 @@ RimObservedDataCollection::~RimObservedDataCollection()
{ {
m_observedDataArray.deleteAllChildObjects(); m_observedDataArray.deleteAllChildObjects();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedDataCollection::removeObservedData(RimObservedData* observedData)
{
m_observedDataArray.removeChildObject(observedData);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedDataCollection::addObservedData(RimObservedData* observedData)
{
m_observedDataArray.push_back(observedData);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryObservedDataFile* RimObservedDataCollection::createAndAddObservedDataFromFileName(const QString& fileName)
{
RimSummaryObservedDataFile* newObservedData = new RimSummaryObservedDataFile();
this->m_observedDataArray.push_back(newObservedData);
newObservedData->setSummaryHeaderFilename(fileName);
newObservedData->updateOptionSensitivity();
return newObservedData;
}

5
ApplicationCode/ProjectDataModel/RimObservedDataCollection.h
View File

@ -20,6 +20,7 @@
#include "cafPdmChildArrayField.h" #include "cafPdmChildArrayField.h"
class RimObservedData; class RimObservedData;
class RimSummaryObservedDataFile;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -32,6 +33,10 @@ public:
RimObservedDataCollection(); RimObservedDataCollection();
virtual ~RimObservedDataCollection(); virtual ~RimObservedDataCollection();
void removeObservedData(RimObservedData* observedData);
void addObservedData(RimObservedData* observedData);
RimSummaryObservedDataFile* createAndAddObservedDataFromFileName(const QString& fileName);
private: private:
caf::PdmChildArrayField<RimObservedData*> m_observedDataArray; caf::PdmChildArrayField<RimObservedData*> m_observedDataArray;
}; };