From 301d274eed48406dd37fae76e433fe126e5d4313 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 11 Aug 2014 14:38:36 +0200 Subject: [PATCH] Rename --- .../ModelVisualization/RivFaultGeometryGenerator.h | 4 ++-- .../ModelVisualization/RivFaultPartMgr.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h index f0e8fd1cc2..f6ec717715 100644 --- a/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h @@ -53,8 +53,8 @@ public: // Mapping between cells and geometry - const cvf::StructGridQuadToCellFaceMapper * cellFromQuadMapper() { return m_quadMapper.p(); } - const cvf::StuctGridTriangleToCellFaceMapper * cellFromTriangleMapper() { return m_triangleMapper.p(); } + const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper() { return m_quadMapper.p(); } + const cvf::StuctGridTriangleToCellFaceMapper* triangleToCellFaceMapper() { return m_triangleMapper.p(); } // Generated geometry cvf::ref generateSurface(); diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index eabf868769..dc036eb046 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -117,7 +117,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* RivTernaryTextureCoordsCreator texturer(cellResultSlot, cellResultSlot->ternaryLegendConfig(), timeStepIndex, m_grid->gridIndex(), - m_nativeFaultGenerator->cellFromQuadMapper()); + m_nativeFaultGenerator->quadToCellFaceMapper()); texturer.createTextureCoords(m_nativeFaultFacesTextureCoords.p()); @@ -129,7 +129,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* RivTextureCoordsCreator texturer(cellResultSlot, timeStepIndex, m_grid->gridIndex(), - m_nativeFaultGenerator->cellFromQuadMapper()); + m_nativeFaultGenerator->quadToCellFaceMapper()); if (!texturer.isValid()) { @@ -150,7 +150,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* RivTernaryTextureCoordsCreator texturer(cellResultSlot, cellResultSlot->ternaryLegendConfig(), timeStepIndex, m_grid->gridIndex(), - m_oppositeFaultGenerator->cellFromQuadMapper()); + m_oppositeFaultGenerator->quadToCellFaceMapper()); texturer.createTextureCoords(m_oppositeFaultFacesTextureCoords.p()); @@ -162,7 +162,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* RivTextureCoordsCreator texturer(cellResultSlot, timeStepIndex, m_grid->gridIndex(), - m_oppositeFaultGenerator->cellFromQuadMapper()); + m_oppositeFaultGenerator->quadToCellFaceMapper()); if (!texturer.isValid()) { @@ -215,7 +215,7 @@ void RivFaultPartMgr::generatePartGeometry() // Set mapping from triangle face index to cell index cvf::ref si = new RivSourceInfo; - si->m_cellFaceFromTriangleMapper = m_nativeFaultGenerator->cellFromTriangleMapper(); + si->m_cellFaceFromTriangleMapper = m_nativeFaultGenerator->triangleToCellFaceMapper(); part->setSourceInfo(si.p()); part->updateBoundingBox(); @@ -268,7 +268,7 @@ void RivFaultPartMgr::generatePartGeometry() // Set mapping from triangle face index to cell index cvf::ref si = new RivSourceInfo; - si->m_cellFaceFromTriangleMapper = m_oppositeFaultGenerator->cellFromTriangleMapper(); + si->m_cellFaceFromTriangleMapper = m_oppositeFaultGenerator->triangleToCellFaceMapper(); part->setSourceInfo(si.p()); part->updateBoundingBox();