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

Make more const accessors available

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-05-29 12:56:40 +02:00
parent dbcdd4dde0
commit 45f5b5a80a
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -171,6 +171,16 @@ RimFishbonesCollection* RimWellPath::fishbonesCollection()
return m_completions->fishbonesCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimFishbonesCollection * RimWellPath::fishbonesCollection() const
{
CVF_ASSERT(m_completions);
return m_completions->fishbonesCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -181,6 +191,16 @@ RimPerforationCollection* RimWellPath::perforationIntervalCollection()
return m_completions->perforationCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimPerforationCollection* RimWellPath::perforationIntervalCollection() const
{
CVF_ASSERT(m_completions);
return m_completions->perforationCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -189,6 +209,14 @@ RigWellPath* RimWellPath::wellPathGeometry()
return m_wellPath.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigWellPath * RimWellPath::wellPathGeometry() const
{
return m_wellPath.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -76,9 +76,12 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
RimFishbonesCollection* fishbonesCollection();
const RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationIntervalCollection();
const RimPerforationCollection* perforationIntervalCollection() const;
RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const;
RivWellPathPartMgr* partMgr();
bool readWellPathFile(QString * errorMessage, RifWellPathImporter* wellPathImporter);

2
ApplicationCode/ReservoirDataModel/RigWellPath.cpp
View File

@@ -57,7 +57,7 @@ double RigWellPath::datumElevation() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RigWellPath::interpolatedPointAlongWellPath(double measuredDepth)
cvf::Vec3d RigWellPath::interpolatedPointAlongWellPath(double measuredDepth) const
{
cvf::Vec3d wellPathPoint = cvf::Vec3d::ZERO;

2
ApplicationCode/ReservoirDataModel/RigWellPath.h
View File

@@ -40,7 +40,7 @@ public:
void setDatumElevation(double value);
bool hasDatumElevation() const;
double datumElevation() const;
cvf::Vec3d interpolatedPointAlongWellPath(double measuredDepth);
cvf::Vec3d interpolatedPointAlongWellPath(double measuredDepth) const;
double wellPathAzimuthAngle(const cvf::Vec3d& position) const;
void twoClosestPoints(const cvf::Vec3d& position, cvf::Vec3d* p1, cvf::Vec3d* p2) const;
std::vector<cvf::Vec3d> clippedPointSubset(double startMD, double endMD) const;

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h
View File

@@ -54,6 +54,7 @@ public:
virtual ~PdmChildArrayField();
PdmChildArrayField& operator() () { return *this; }
const PdmChildArrayField& operator() () const { return *this; }
// Reimplementation of PdmPointersFieldHandle methods