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

(#436) Renamed some classes/files, methods and variables

Browse Source
This commit is contained in:
Pål Hagen
2015-09-16 16:06:06 +02:00
parent 8ed9945ccf
commit 6d41aa0b18
8 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -23,7 +23,7 @@
#include "RifJsonEncodeDecode.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimWellLasFileInfo.h"
#include "RimWellLogFile.h"
#include "RimWellPathCollection.h"
#include "RivWellPathPartMgr.h"
@@ -82,8 +82,8 @@ RimWellPath::RimWellPath()
CAF_PDM_InitField(&wellPathRadiusScaleFactor, "WellPathRadiusScale", 1.0, "Well path radius scale", "", "", "");
CAF_PDM_InitField(&wellPathColor, "WellPathColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Well path color", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_lasFileInfo, "LasFileInfo", "Las File Info", "", "", "");
m_lasFileInfo.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_wellLogFile, "WellLogFile", "Well Log File", "", "", "");
m_wellLogFile.uiCapability()->setUiHidden(true);
m_wellPath = NULL;
m_project = NULL;
@@ -95,9 +95,9 @@ RimWellPath::RimWellPath()
//--------------------------------------------------------------------------------------------------
RimWellPath::~RimWellPath()
{
if (m_lasFileInfo())
if (m_wellLogFile())
{
delete m_lasFileInfo;
delete m_wellLogFile;
}
}
@@ -175,24 +175,24 @@ void RimWellPath::readWellPathFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLasFileInfo* RimWellPath::readWellLogFile(const QString& logFilePath)
RimWellLogFile* RimWellPath::readWellLogFile(const QString& logFilePath)
{
QFileInfo fi(logFilePath);
RimWellLasFileInfo* lasFileInfo = NULL;
RimWellLogFile* wellLogFile = NULL;
if (fi.suffix().compare("las") == 0)
{
lasFileInfo = new RimWellLasFileInfo();
lasFileInfo->setFileName(logFilePath);
if (!lasFileInfo->readFile())
wellLogFile = new RimWellLogFile();
wellLogFile->setFileName(logFilePath);
if (!wellLogFile->readFile())
{
delete lasFileInfo;
lasFileInfo = NULL;
delete wellLogFile;
wellLogFile = NULL;
}
}
return lasFileInfo;
return wellLogFile;
}
//--------------------------------------------------------------------------------------------------
@@ -356,15 +356,15 @@ void RimWellPath::updateFilePathsFromProjectPath()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPath::setLogFileInfo(RimWellLasFileInfo* logFileInfo)
void RimWellPath::setLogFileInfo(RimWellLogFile* logFileInfo)
{
if (m_lasFileInfo())
if (m_wellLogFile())
{
delete m_lasFileInfo;
delete m_wellLogFile;
}
m_lasFileInfo = logFileInfo;
m_lasFileInfo->uiCapability()->setUiHidden(true);
m_wellLogFile = logFileInfo;
m_wellLogFile->uiCapability()->setUiHidden(true);
this->name = m_lasFileInfo->wellName();
this->name = m_wellLogFile->wellName();
}