From 363224e39a44bba5ff41e32cd2460995d9152a6d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 22 Sep 2017 10:31:16 +0200
Subject: [PATCH] #1839 Observed Data : Move summary files into summary folder

---
 ApplicationCode/ProjectDataModel/CMakeLists_files.cmake     | 6 ------
 .../ProjectDataModel/Summary/CMakeLists_files.cmake         | 6 ++++++
 .../ProjectDataModel/{ => Summary}/RimObservedData.cpp      | 0
 .../ProjectDataModel/{ => Summary}/RimObservedData.h        | 0
 .../{ => Summary}/RimObservedDataCollection.cpp             | 0
 .../{ => Summary}/RimObservedDataCollection.h               | 0
 .../{ => Summary}/RimSummaryObservedDataFile.cpp            | 0
 .../{ => Summary}/RimSummaryObservedDataFile.h              | 0
 doc/observed_data.plantuml                                  | 5 ++++-
 9 files changed, 10 insertions(+), 7 deletions(-)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimObservedData.cpp (100%)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimObservedData.h (100%)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimObservedDataCollection.cpp (100%)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimObservedDataCollection.h (100%)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimSummaryObservedDataFile.cpp (100%)
 rename ApplicationCode/ProjectDataModel/{ => Summary}/RimSummaryObservedDataFile.h (100%)

diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index c264254a40..503483a496 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -90,9 +90,6 @@ ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimDialogData.h
 ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h
-${CEE_CURRENT_LIST_DIR}RimObservedData.h
-${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h
-${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) 
@@ -188,9 +185,6 @@ ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimDialogData.cpp
 ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp
-${CEE_CURRENT_LIST_DIR}RimObservedData.cpp
-${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
 )
 
 if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
diff --git a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
index 1706ac849b..4cf9811be3 100644
--- a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
@@ -22,6 +22,9 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.h
+${CEE_CURRENT_LIST_DIR}RimObservedData.h
+${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h
+${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -42,6 +45,9 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.cpp
+${CEE_CURRENT_LIST_DIR}RimObservedData.cpp
+${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedData.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimObservedData.cpp
rename to ApplicationCode/ProjectDataModel/Summary/RimObservedData.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.h b/ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimObservedData.h
rename to ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
diff --git a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp
rename to ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimObservedDataCollection.h
rename to ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.h
rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.h
diff --git a/doc/observed_data.plantuml b/doc/observed_data.plantuml
index 7b13dd5687..d2df9bc6cc 100644
--- a/doc/observed_data.plantuml
+++ b/doc/observed_data.plantuml
@@ -12,7 +12,10 @@ RifReaderObservedData *-- "N" RifColumnBasedAsciiParser
 RimSummaryCase <|-- RimFileSummaryCase
 RimSummaryCase <|-- RimObservedData
 
-RimObservedData <|-- RimSummaryObservedDataFile
+RimObservedData <|-- RimObservedAsciiColumnBasedData
+
+RimObservedData <|-- RimObservedRsmspecColumnBasedData
+RimObservedData <|-- RimObservedRsmspecKeywordBasedData
 
 
 @enduml