From 8de9a46c6a558db48953e9ab9824d7a7ffea6f1d Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Tue, 8 Jan 2019 10:54:46 +0100 Subject: [PATCH] Rename RimContourMapProjection::generateTriangles to generateTrianglesWithVertexValues Signed-off-by: Gaute Lindkvist --- .../ModelVisualization/RivContourMapProjectionPartMgr.cpp | 2 +- ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp | 2 +- ApplicationCode/ProjectDataModel/RimContourMapProjection.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp index 94f4919130..00efd96707 100644 --- a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp @@ -41,7 +41,7 @@ void RivContourMapProjectionPartMgr::createProjectionGeometry() { m_contourMapProjection->generateContourPolygons(); m_contourLinePolygons = m_contourMapProjection->contourPolygons(); - m_contourMapTriangles = m_contourMapProjection->generateTriangles(); + m_contourMapTriangles = m_contourMapProjection->generateTrianglesWithVertexValues(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp index 1e9becb0c2..5bea4a6783 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp @@ -107,7 +107,7 @@ RimContourMapProjection::~RimContourMapProjection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimContourMapProjection::generateTriangles() const +std::vector RimContourMapProjection::generateTrianglesWithVertexValues() const { std::vector vertices = generateVertices(); diff --git a/ApplicationCode/ProjectDataModel/RimContourMapProjection.h b/ApplicationCode/ProjectDataModel/RimContourMapProjection.h index 510398d918..78ae71e17c 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapProjection.h +++ b/ApplicationCode/ProjectDataModel/RimContourMapProjection.h @@ -72,7 +72,7 @@ public: RimContourMapProjection(); ~RimContourMapProjection() override; - std::vector generateTriangles() const; + std::vector generateTrianglesWithVertexValues() const; std::vector generateVertices() const; void generateContourPolygons(); std::vector generatePickPointPolygon();