OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 07:03:25 -06: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp
View File

@ -102,7 +102,7 @@ RimWellPath* RicNewWellLogFileCurveFeature::selectedWellPathWithLogFile() const
if (selection.size() > 0)
{
RimWellPath* wellPath = selection[0];
if (wellPath->m_wellLogFile())
if (wellPath->wellLogFile())
{
return wellPath;
}
@ -123,9 +123,9 @@ bool RicNewWellLogFileCurveFeature::wellLogFilesAvailable() const
for (size_t i = 0; i < wellPaths.size(); i++)
{
if (wellPaths[i]->m_wellLogFile())
if (wellPaths[i]->wellLogFile())
{
if (wellPaths[i]->m_wellLogFile()->wellLogFile())
if (wellPaths[i]->wellLogFile()->wellLogFile())
{
return true;
}

6
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h
View File

@ -63,10 +63,10 @@ public:
QString caseName() const;
double rkbDiff() const;
int currentTimeStep() const;
void setCurrentTimeStep(int timeStep);
int currentTimeStep() const;
void setCurrentTimeStep(int timeStep);
void setEclipseResultDefinition(const RimEclipseResultDefinition* def);
void setEclipseResultDefinition(const RimEclipseResultDefinition* def);
protected:
virtual QString createCurveAutoName();

8
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
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)
{

6
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -82,13 +82,12 @@ public:
caf::PdmField<cvf::Color3f> wellPathColor;
caf::PdmField<double> wellPathRadiusScaleFactor;
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RimFishbonesCollection* fishbonesCollection();
const RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationIntervalCollection();
const RimPerforationCollection* perforationIntervalCollection() const;
const RimWellPathCompletions* completions() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* fractureCollection();
const RimWellPathFractureCollection* fractureCollection() const;
@ -138,4 +137,7 @@ private:
cvf::ref<RigWellPath> m_wellPath;
cvf::ref<RivWellPathPartMgr> m_wellPathPartMgr;
caf::PdmField<QString> m_name;
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
};

2
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -137,7 +137,7 @@ void RimWellPathCollection::readWellPathFiles()
}
}
RimWellLogFile* wellLogFile = wellPaths[wpIdx]->m_wellLogFile;
RimWellLogFile* wellLogFile = wellPaths[wpIdx]->wellLogFile();
if (wellLogFile)
{
QString errorMessage;