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

#5779 Add const to access methods

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-07 14:28:55 +02:00 committed by Gaute Lindkvist
parent 46da0863b8
commit 9041bc80fa
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
View File

@ -575,7 +575,8 @@ RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionGeometryGenerator::int
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Mat4d RivExtrudedCurveIntersectionGeometryGenerator::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
cvf::Mat4d
RivExtrudedCurveIntersectionGeometryGenerator::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat ) const
{
cvf::Mat4d flattenMx = cvf::Mat4d::IDENTITY;

2
ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.h
View File

@ -79,7 +79,7 @@ public:
RimExtrudedCurveIntersection* intersection() const;
cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat );
cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat ) const;
// GeomGen Interface
bool isAnyGeometryPresent() const override;

2
ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
View File

@ -710,7 +710,7 @@ const RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionPartMgr::interse
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Mat4d RivExtrudedCurveIntersectionPartMgr::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
cvf::Mat4d RivExtrudedCurveIntersectionPartMgr::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat ) const
{
return m_intersectionGenerator->unflattenTransformMatrix( intersectionPointFlat );
}

2
ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h
View File

@ -77,7 +77,7 @@ public:
const RimExtrudedCurveIntersection* intersection() const;
cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat );
cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat ) const;
public:
private:

13
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@ -356,9 +356,9 @@ void Rim2dIntersectionView::updateName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RivExtrudedCurveIntersectionPartMgr> Rim2dIntersectionView::flatIntersectionPartMgr() const
const RivExtrudedCurveIntersectionPartMgr* Rim2dIntersectionView::flatIntersectionPartMgr() const
{
return m_flatIntersectionPartMgr;
return m_flatIntersectionPartMgr.p();
}
//--------------------------------------------------------------------------------------------------
@ -374,9 +374,14 @@ bool Rim2dIntersectionView::isGridVisualizationMode() const
//--------------------------------------------------------------------------------------------------
cvf::Vec3d Rim2dIntersectionView::transformToUtm( const cvf::Vec3d& unscaledPointInFlatDomain ) const
{
cvf::Mat4d unflatXf = this->flatIntersectionPartMgr()->unflattenTransformMatrix( unscaledPointInFlatDomain );
if ( m_flatIntersectionPartMgr.notNull() )
{
cvf::Mat4d unflatXf = flatIntersectionPartMgr()->unflattenTransformMatrix( unscaledPointInFlatDomain );
return unscaledPointInFlatDomain.getTransformedPoint( unflatXf );
return unscaledPointInFlatDomain.getTransformedPoint( unflatXf );
}
return unscaledPointInFlatDomain;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
View File

@ -65,8 +65,8 @@ public:
void update3dInfo();
void updateName();
cvf::ref<RivExtrudedCurveIntersectionPartMgr> flatIntersectionPartMgr() const;
cvf::Vec3d transformToUtm( const cvf::Vec3d& unscaledPointInFlatDomain ) const;
const RivExtrudedCurveIntersectionPartMgr* flatIntersectionPartMgr() const;
cvf::Vec3d transformToUtm( const cvf::Vec3d& unscaledPointInFlatDomain ) const;
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform() const override;