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 a method and a member variable

Browse Source
This commit is contained in:
Pål Hagen 2015-09-16 16:20:07 +02:00
parent 06f73bc359
commit 1dc7bbe667
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@ -92,7 +92,7 @@ bool RimWellLogFile::readFile()
m_wellLogChannelNames.deleteAllChildObjects(); m_wellLogChannelNames.deleteAllChildObjects();
QStringList wellLogNames = m_wellLogDataFile->wellLogNames(); QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames();
for (int logIdx = 0; logIdx < wellLogNames.size(); logIdx++) for (int logIdx = 0; logIdx < wellLogNames.size(); logIdx++)
{ {
RimWellLog* wellLog = new RimWellLog(); RimWellLog* wellLog = new RimWellLog();

8
ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
View File

@ -77,7 +77,7 @@ bool RigWellLogFile::open(const QString& fileName)
// wellLogNames.append(QString::fromStdString(itDL->first)); // wellLogNames.append(QString::fromStdString(itDL->first));
// } // }
m_wellLogNames = wellLogNames; m_wellLogChannelNames = wellLogNames;
m_wellLogFile = well; m_wellLogFile = well;
return true; return true;
@ -94,7 +94,7 @@ void RigWellLogFile::close()
m_wellLogFile = NULL; m_wellLogFile = NULL;
} }
m_wellLogNames.clear(); m_wellLogChannelNames.clear();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -109,9 +109,9 @@ QString RigWellLogFile::wellName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RigWellLogFile::wellLogNames() const QStringList RigWellLogFile::wellLogChannelNames() const
{ {
return m_wellLogNames; return m_wellLogChannelNames;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ReservoirDataModel/RigWellLogFile.h
View File

@ -43,7 +43,7 @@ public:
bool open(const QString& fileName); bool open(const QString& fileName);
QString wellName() const; QString wellName() const;
QStringList wellLogNames() const; QStringList wellLogChannelNames() const;
std::vector<double> depthValues() const; std::vector<double> depthValues() const;
std::vector<double> values(const QString& name) const; std::vector<double> values(const QString& name) const;
@ -52,5 +52,5 @@ private:
void close(); void close();
NRLib::Well* m_wellLogFile; NRLib::Well* m_wellLogFile;
QStringList m_wellLogNames; QStringList m_wellLogChannelNames;
}; };