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

#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
Download Patch File Download Diff File Expand all files Collapse all files

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);