From b87bbc12b276c216bb748aaee5c6a62836c01659 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Thu, 14 Sep 2017 15:59:33 +0200 Subject: [PATCH] #1813 Observed data: headers above functions --- ApplicationCode/ProjectDataModel/RimObservedData.cpp | 7 ++++++- ApplicationCode/ProjectDataModel/RimObservedData.h | 3 +++ .../ProjectDataModel/RimObservedDataCollection.cpp | 6 ++++++ .../ProjectDataModel/RimObservedDataCollection.h | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.cpp b/ApplicationCode/ProjectDataModel/RimObservedData.cpp index fdf6b2f7f5..49bec159f5 100644 --- a/ApplicationCode/ProjectDataModel/RimObservedData.cpp +++ b/ApplicationCode/ProjectDataModel/RimObservedData.cpp @@ -20,12 +20,17 @@ CAF_PDM_SOURCE_INIT(RimObservedData, "ObservedData"); - +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- RimObservedData::RimObservedData() { CAF_PDM_InitObject("Observed data file", ":/Default.png", "", ""); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- RimObservedData::~RimObservedData() { } \ No newline at end of file diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.h b/ApplicationCode/ProjectDataModel/RimObservedData.h index 757cfe8d59..9d5acd6235 100644 --- a/ApplicationCode/ProjectDataModel/RimObservedData.h +++ b/ApplicationCode/ProjectDataModel/RimObservedData.h @@ -18,6 +18,9 @@ #include "cafPdmObject.h" +//================================================================================================== +// +//================================================================================================== class RimObservedData : public caf::PdmObject { CAF_PDM_HEADER_INIT; diff --git a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp index 1b365d4d08..aa0df39e45 100644 --- a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -21,6 +21,9 @@ CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection"); +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- RimObservedDataCollection::RimObservedDataCollection() { CAF_PDM_InitObject("Observed Data", ":/Folder.png", "", ""); @@ -30,6 +33,9 @@ RimObservedDataCollection::RimObservedDataCollection() m_observedData.uiCapability()->setUiHidden(true); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- RimObservedDataCollection::~RimObservedDataCollection() { m_observedData.deleteAllChildObjects(); diff --git a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.h b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.h index b80b190c92..0f1a2ba1c1 100644 --- a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.h +++ b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.h @@ -21,6 +21,9 @@ class RimObservedData; +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- class RimObservedDataCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT;