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

#1918 Observed Data : Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-27 15:19:04 +02:00
parent cdd1a96f44
commit 67c1ee2dbb
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@ -25,7 +25,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.h
${CEE_CURRENT_LIST_DIR}RimObservedData.h ${CEE_CURRENT_LIST_DIR}RimObservedData.h
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h ${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h ${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.h ${CEE_CURRENT_LIST_DIR}RimObservedEclipseUserData.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
@ -49,7 +49,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.cpp
${CEE_CURRENT_LIST_DIR}RimObservedData.cpp ${CEE_CURRENT_LIST_DIR}RimObservedData.cpp
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp ${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.cpp ${CEE_CURRENT_LIST_DIR}RimObservedEclipseUserData.cpp
) )
list(APPEND CODE_HEADER_FILES list(APPEND CODE_HEADER_FILES

4
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -23,7 +23,7 @@
#include "RifKeywordVectorParser.h" #include "RifKeywordVectorParser.h"
#include "RimColumnBasedUserData.h" #include "RimObservedEclipseUserData.h"
#include "RimObservedData.h" #include "RimObservedData.h"
#include "RimSummaryObservedDataFile.h" #include "RimSummaryObservedDataFile.h"
@ -102,7 +102,7 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
if (eclipseUserData) if (eclipseUserData)
{ {
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData(); RimObservedEclipseUserData* columnBasedUserData = new RimObservedEclipseUserData();
observedData = columnBasedUserData; observedData = columnBasedUserData;
} }

12
ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.cpp → ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimColumnBasedUserData.h" #include "RimObservedEclipseUserData.h"
#include "RiaLogging.h" #include "RiaLogging.h"
@ -30,14 +30,14 @@
#include <QFile> #include <QFile>
CAF_PDM_SOURCE_INIT(RimColumnBasedUserData, "RimColumnBasedUserData"); CAF_PDM_SOURCE_INIT(RimObservedEclipseUserData, "RimObservedEclipseUserData");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimColumnBasedUserData::RimColumnBasedUserData() RimObservedEclipseUserData::RimObservedEclipseUserData()
{ {
CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/Default.png", "", ""); CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/Default.png", "", "");
m_summaryHeaderFilename.uiCapability()->setUiName("File"); m_summaryHeaderFilename.uiCapability()->setUiName("File");
@ -46,7 +46,7 @@ RimColumnBasedUserData::RimColumnBasedUserData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimColumnBasedUserData::~RimColumnBasedUserData() RimObservedEclipseUserData::~RimObservedEclipseUserData()
{ {
} }
@ -54,7 +54,7 @@ RimColumnBasedUserData::~RimColumnBasedUserData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimColumnBasedUserData::createSummaryReaderInterface() void RimObservedEclipseUserData::createSummaryReaderInterface()
{ {
m_summeryReader = nullptr; m_summeryReader = nullptr;
@ -101,7 +101,7 @@ void RimColumnBasedUserData::createSummaryReaderInterface()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimColumnBasedUserData::summaryReader() RifSummaryReaderInterface* RimObservedEclipseUserData::summaryReader()
{ {
return m_summeryReader.p(); return m_summeryReader.p();
} }

6
ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.h → ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.h
View File

@ -29,12 +29,12 @@ class RifSummaryReaderInterface;
//================================================================================================== //==================================================================================================
// //
//================================================================================================== //==================================================================================================
class RimColumnBasedUserData : public RimObservedData class RimObservedEclipseUserData : public RimObservedData
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimColumnBasedUserData(); RimObservedEclipseUserData();
virtual ~RimColumnBasedUserData(); virtual ~RimObservedEclipseUserData();
virtual void createSummaryReaderInterface() override; virtual void createSummaryReaderInterface() override;