OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 23:23:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1813 Observed data: Rename Observed data child array

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-15 13:18:06 +02:00
parent 3a0b0db8d1
commit 1a6e3447a7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp
View File

@ -16,6 +16,8 @@
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
@ -28,9 +30,9 @@ RimObservedDataCollection::RimObservedDataCollection()
{
CAF_PDM_InitObject("Observed Data", ":/Folder.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_observedData, "ObservedData", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_observedDataArray, "ObservedDataArray", "", "", "", "");
m_observedData.uiCapability()->setUiHidden(true);
m_observedDataArray.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@ -38,5 +40,5 @@ RimObservedDataCollection::RimObservedDataCollection()
//--------------------------------------------------------------------------------------------------
RimObservedDataCollection::~RimObservedDataCollection()
{
m_observedData.deleteAllChildObjects();
m_observedDataArray.deleteAllChildObjects();
}

2
ApplicationCode/ProjectDataModel/RimObservedDataCollection.h
View File

@ -33,5 +33,5 @@ public:
virtual ~RimObservedDataCollection();
private:
caf::PdmChildArrayField<RimObservedData*> m_observedData;
caf::PdmChildArrayField<RimObservedData*> m_observedDataArray;
};