diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index 9e9ab26e2b..57c0db8f0f 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -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(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h index 239c3f800a..39557b1bed 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.h +++ b/ApplicationCode/ProjectDataModel/RimWellPath.h @@ -76,9 +76,12 @@ public: caf::PdmChildField 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); diff --git a/ApplicationCode/ReservoirDataModel/RigWellPath.cpp b/ApplicationCode/ReservoirDataModel/RigWellPath.cpp index ea4d77351c..46fe2385b4 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPath.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPath.cpp @@ -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; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPath.h b/ApplicationCode/ReservoirDataModel/RigWellPath.h index 1d4c60de9c..f09603fec8 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPath.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPath.h @@ -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 clippedPointSubset(double startMD, double endMD) const; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h index 665c6a60c0..d58acfdce9 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h @@ -54,6 +54,7 @@ public: virtual ~PdmChildArrayField(); PdmChildArrayField& operator() () { return *this; } + const PdmChildArrayField& operator() () const { return *this; } // Reimplementation of PdmPointersFieldHandle methods