OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make wellLogFile field private in RimWellPath. Some whitespace changes

Browse Source
This commit is contained in:
Jacob Støren
2017-10-06 13:24:45 +02:00
parent 6f82f0f614
commit 9bb5dcf011
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
+4 -4
View File
@@ -92,7 +92,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate(bool updateParentPlot)
}
else if (m_wellPath)
{
RimWellLogFile* logFileInfo = m_wellPath->m_wellLogFile;
RimWellLogFile* logFileInfo = m_wellPath->wellLogFile();
if (logFileInfo)
{
RigWellLogFile* wellLogFile = logFileInfo->wellLogFile();
@@ -220,7 +220,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
for (size_t i = 0; i < wellPaths.size(); i++)
{
// Only include well paths coming from a well log file
if (wellPaths[i]->m_wellLogFile())
if (wellPaths[i]->wellLogFile())
{
options.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i]));
}
@@ -237,7 +237,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
{
if (m_wellPath())
{
RimWellLogFile* wellLogFile = m_wellPath->m_wellLogFile();
RimWellLogFile* wellLogFile = m_wellPath->wellLogFile();
if (wellLogFile)
{
const caf::PdmChildArrayField<RimWellLogFileChannel*>* fileLogs = wellLogFile->wellLogChannelNames();
@@ -272,7 +272,7 @@ QString RimWellLogFileCurve::createCurveAutoName()
txt += " : ";
txt += m_wellLogChannnelName;
RimWellLogFile* logFileInfo = m_wellPath->m_wellLogFile;
RimWellLogFile* logFileInfo = m_wellPath->wellLogFile();
RigWellLogFile* wellLogFile = logFileInfo ? logFileInfo->wellLogFile() : NULL;
if (wellLogFile)
{