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

(#435) Renamed class

Browse Source
This commit is contained in:
Pål Hagen 2015-09-15 13:21:30 +02:00
parent 01118fafda
commit 03e4b89508
5 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/CMakeLists_files.cmake
View File

@ -69,7 +69,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.h
${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
${CEE_CURRENT_LIST_DIR}RimWellLasFileInfo.h
${CEE_CURRENT_LIST_DIR}RimWellLasLog.h
${CEE_CURRENT_LIST_DIR}RimWellLog.h
)
set (SOURCE_GROUP_SOURCE_FILES
@ -137,7 +137,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
${CEE_CURRENT_LIST_DIR}RimWellLasFileInfo.cpp
${CEE_CURRENT_LIST_DIR}RimWellLasLog.cpp
${CEE_CURRENT_LIST_DIR}RimWellLog.cpp
)
list(APPEND CODE_HEADER_FILES

4
ApplicationCode/ProjectDataModel/RimWellLasFileInfo.cpp
View File

@ -18,7 +18,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellLasFileInfo.h"
#include "RimWellLasLog.h"
#include "RimWellLog.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
@ -110,7 +110,7 @@ bool RimWellLasFileInfo::readFile()
for (size_t logIdx = 0; logIdx < wellLogNames.size(); logIdx++)
{
RimWellLasLog* wellLog = new RimWellLasLog();
RimWellLog* wellLog = new RimWellLog();
wellLog->setName(wellLogNames[logIdx]);
m_lasFileLogs.push_back(wellLog);
}

4
ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h
View File

@ -24,7 +24,7 @@
#include "cafPdmChildArrayField.h"
class RimWellLasLog;
class RimWellLog;
class QString;
@ -49,7 +49,7 @@ public:
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
private:
caf::PdmChildArrayField<RimWellLasLog*> m_lasFileLogs;
caf::PdmChildArrayField<RimWellLog*> m_lasFileLogs;
private:
caf::PdmField<QString> m_wellName;

10
ApplicationCode/ProjectDataModel/RimWellLasLog.cpp → ApplicationCode/ProjectDataModel/RimWellLog.cpp
View File

@ -17,19 +17,19 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellLasLog.h"
#include "RimWellLog.h"
#include <QString>
CAF_PDM_SOURCE_INIT(RimWellLasLog, "WellLasLog");
CAF_PDM_SOURCE_INIT(RimWellLog, "WellLog");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLasLog::RimWellLasLog()
RimWellLog::RimWellLog()
{
CAF_PDM_InitObject("Well LAS File Log", "", "", "");
CAF_PDM_InitObject("Well Log", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_name, "Name", "", "", "", "");
m_name.uiCapability()->setUiHidden(true);
@ -39,7 +39,7 @@ RimWellLasLog::RimWellLasLog()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLasLog::setName(const QString& name)
void RimWellLog::setName(const QString& name)
{
m_name = name;
}

4
ApplicationCode/ProjectDataModel/RimWellLasLog.h → ApplicationCode/ProjectDataModel/RimWellLog.h
View File

@ -28,12 +28,12 @@ class QString;
///
///
//==================================================================================================
class RimWellLasLog : public caf::PdmObject
class RimWellLog : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimWellLasLog();
RimWellLog();
void setName(const QString& name);