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 of several files

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-27 10:19:24 +02:00
parent a24ce670cf
commit dc23c63b97
11 changed files with 63 additions and 55 deletions
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}RimObservedDataCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
${CEE_CURRENT_LIST_DIR}RimObservedRsmspecColumnBasedData.h
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.h
)
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}RimObservedDataCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
${CEE_CURRENT_LIST_DIR}RimObservedRsmspecColumnBasedData.cpp
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.cpp
)
list(APPEND CODE_HEADER_FILES

18
ApplicationCode/ProjectDataModel/Summary/RimObservedRsmspecColumnBasedData.cpp → ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.cpp
View File

@@ -16,22 +16,22 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimColumnBasedUserData.h"
#include "RifColumnBasedRsmspecParser.h"
#include "RifReaderRmspecColumnBasedData.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifColumnBasedUserData.h"
#include "RifSummaryReaderInterface.h"
#include "cafUtils.h"
CAF_PDM_SOURCE_INIT(RimObservedRsmspecColumnBasedData, "RimObservedRsmspecColumnBasedData");
CAF_PDM_SOURCE_INIT(RimColumnBasedUserData, "RimColumnBasedUserData");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedRsmspecColumnBasedData::RimObservedRsmspecColumnBasedData()
RimColumnBasedUserData::RimColumnBasedUserData()
{
CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/Default.png", "", "");
m_summaryHeaderFilename.uiCapability()->setUiName("File");
@@ -40,7 +40,7 @@ RimObservedRsmspecColumnBasedData::RimObservedRsmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedRsmspecColumnBasedData::~RimObservedRsmspecColumnBasedData()
RimColumnBasedUserData::~RimColumnBasedUserData()
{
}
@@ -48,11 +48,11 @@ RimObservedRsmspecColumnBasedData::~RimObservedRsmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedRsmspecColumnBasedData::createSummaryReaderInterface()
void RimColumnBasedUserData::createSummaryReaderInterface()
{
if (caf::Utils::fileExists(this->summaryHeaderFilename()))
{
m_summeryReader = new RifReaderRmspecColumnBasedData();
m_summeryReader = new RifColumnBasedUserData();
if (!m_summeryReader->open(this->summaryHeaderFilename()))
{
m_summeryReader = nullptr;
@@ -67,7 +67,7 @@ void RimObservedRsmspecColumnBasedData::createSummaryReaderInterface()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimObservedRsmspecColumnBasedData::summaryReader()
RifSummaryReaderInterface* RimColumnBasedUserData::summaryReader()
{
return m_summeryReader.p();
}

10
ApplicationCode/ProjectDataModel/Summary/RimObservedRsmspecColumnBasedData.h → ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.h
View File

@@ -24,22 +24,22 @@
#include "cafPdmField.h"
#include "cvfObject.h"
class RifReaderRmspecColumnBasedData;
class RifColumnBasedUserData;
//==================================================================================================
//
//==================================================================================================
class RimObservedRsmspecColumnBasedData : public RimObservedData
class RimColumnBasedUserData : public RimObservedData
{
CAF_PDM_HEADER_INIT;
public:
RimObservedRsmspecColumnBasedData();
virtual ~RimObservedRsmspecColumnBasedData();
RimColumnBasedUserData();
virtual ~RimColumnBasedUserData();
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
private:
cvf::ref<RifReaderRmspecColumnBasedData> m_summeryReader;
cvf::ref<RifColumnBasedUserData> m_summeryReader;
};

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

@@ -20,7 +20,7 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimColumnBasedUserData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
@@ -70,9 +70,9 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
RimObservedRsmspecColumnBasedData* rsmspecColumnBasedData = new RimObservedRsmspecColumnBasedData();
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
observedData = rsmspecColumnBasedData;
observedData = columnBasedUserData;
}
else
{