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

#1813 Observed data: Make RimObservedDataFile derived from RimObservedData. remove Ascii data model object

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-15 14:31:17 +02:00
parent b4f2b2accf
commit 520befcad0
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -92,7 +92,7 @@ ${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}RimAsciiObservedData.h
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
@ -190,7 +190,7 @@ ${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}RimAsciiObservedData.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)

16
ApplicationCode/ProjectDataModel/RimAsciiObservedData.cpp → ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
View File

@ -16,21 +16,27 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimAsciiObservedData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimAsciiObservedData, "AsciiObservedData");
#include "RigObservedData.h"
#include "QFileInfo"
CAF_PDM_SOURCE_INIT(RimSummaryObservedDataFile, "SummaryObservedDataFile");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAsciiObservedData::RimAsciiObservedData()
RimSummaryObservedDataFile::RimSummaryObservedDataFile()
{
CAF_PDM_InitObject("Ascii file", ":/Default.png", "", "");
CAF_PDM_InitObject("Observed data file", ":/Default.png", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAsciiObservedData::~RimAsciiObservedData()
RimSummaryObservedDataFile::~RimSummaryObservedDataFile()
{
}

13
ApplicationCode/ProjectDataModel/RimAsciiObservedData.h → ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.h
View File

@ -22,19 +22,16 @@
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cvfObject.h"
//==================================================================================================
//
//==================================================================================================
class RimAsciiObservedData : public RimObservedData
class RimSummaryObservedDataFile : public RimObservedData
{
CAF_PDM_HEADER_INIT;
public:
RimAsciiObservedData();
~RimAsciiObservedData();
protected:
private:
RimSummaryObservedDataFile();
virtual ~RimSummaryObservedDataFile();
};