From 16ab7fcb72feed8e78f93aad21a643d5082eabd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 21 Sep 2016 10:36:11 +0200 Subject: [PATCH] #815 More renaming CrossSection -> Intersection --- ApplicationCode/CMakeLists.txt | 2 +- .../Intersections/CMakeLists_files.cmake | 4 +-- .../RivCrossSectionSourceInfo.cpp | 4 +-- .../Intersections/RivCrossSectionSourceInfo.h | 6 ++--- ...p => RivIntersectionGeometryGenerator.cpp} | 26 +++++++++---------- ...r.h => RivIntersectionGeometryGenerator.h} | 6 ++--- .../Intersections/RivIntersectionPartMgr.cpp | 2 +- .../Intersections/RivIntersectionPartMgr.h | 4 +-- 8 files changed, 27 insertions(+), 27 deletions(-) rename ApplicationCode/ModelVisualization/Intersections/{RivCrossSectionGeometryGenerator.cpp => RivIntersectionGeometryGenerator.cpp} (94%) rename ApplicationCode/ModelVisualization/Intersections/{RivCrossSectionGeometryGenerator.h => RivIntersectionGeometryGenerator.h} (94%) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 8b97b48dc5..d6a1b26df3 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -392,7 +392,7 @@ if(RESINSIGHT_ENABLE_COTIRE) set_source_files_properties (UnitTests/opm-parser-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE) # variables at global file scope - set_source_files_properties (ModelVisualization/RivCrossSectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) + set_source_files_properties (ModelVisualization/RivIntersectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/RivIntersectionPartMgr.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/GridBox/RivGridBoxGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (Commands/WellLogCommands/RicWellLogPlotCurveFeatureImpl.cpp PROPERTIES COTIRE_EXCLUDED TRUE) diff --git a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake index 2592bf3180..7caf015d51 100644 --- a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake @@ -5,7 +5,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") endif() set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.h +${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.h ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h ${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.h ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h @@ -13,7 +13,7 @@ ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.cpp +${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp ${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.cpp ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp b/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp index 2f35e3f6cd..7b7730f46d 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp @@ -19,13 +19,13 @@ #include "RivCrossSectionSourceInfo.h" -#include "RivCrossSectionGeometryGenerator.h" +#include "RivIntersectionGeometryGenerator.h" //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivCrossSectionGeometryGenerator* geometryGenerator) +RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator) : m_crossSectionGeometryGenerator(geometryGenerator) { CVF_ASSERT(m_crossSectionGeometryGenerator.notNull()); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h index 46afb6e409..5e6ee17e2e 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h @@ -23,18 +23,18 @@ #include "cvfObject.h" #include "cvfArray.h" -class RivCrossSectionGeometryGenerator; +class RivIntersectionGeometryGenerator; class RimCrossSection; class RivCrossSectionSourceInfo : public cvf::Object { public: - RivCrossSectionSourceInfo(RivCrossSectionGeometryGenerator* geometryGenerator); + RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator); const std::vector& triangleToCellIndex() const; const RimCrossSection* crossSection() const; private: - cvf::cref m_crossSectionGeometryGenerator; + cvf::cref m_crossSectionGeometryGenerator; }; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp similarity index 94% rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.cpp rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp index de91f8a223..90e574e261 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RivCrossSectionGeometryGenerator.h" +#include "RivIntersectionGeometryGenerator.h" #include "RigMainGrid.h" #include "RigResultAccessor.h" @@ -35,7 +35,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivCrossSectionGeometryGenerator::RivCrossSectionGeometryGenerator(const RimCrossSection* crossSection, +RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator(const RimCrossSection* crossSection, std::vector > &polylines, const cvf::Vec3d& extrusionDirection, const RivIntersectionHexGridInterface* grid) @@ -51,7 +51,7 @@ RivCrossSectionGeometryGenerator::RivCrossSectionGeometryGenerator(const RimCros //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivCrossSectionGeometryGenerator::~RivCrossSectionGeometryGenerator() +RivIntersectionGeometryGenerator::~RivIntersectionGeometryGenerator() { } @@ -59,7 +59,7 @@ RivCrossSectionGeometryGenerator::~RivCrossSectionGeometryGenerator() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionGeometryGenerator::calculateArrays() +void RivIntersectionGeometryGenerator::calculateArrays() { if (m_triangleVxes->size()) return; @@ -207,7 +207,7 @@ void RivCrossSectionGeometryGenerator::calculateArrays() /// Generate surface drawable geo from the specified region /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCrossSectionGeometryGenerator::generateSurface() +cvf::ref RivIntersectionGeometryGenerator::generateSurface() { calculateArrays(); @@ -225,7 +225,7 @@ cvf::ref RivCrossSectionGeometryGenerator::generateSurface() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCrossSectionGeometryGenerator::createMeshDrawable() +cvf::ref RivIntersectionGeometryGenerator::createMeshDrawable() { if (!(m_cellBorderLineVxes.notNull() && m_cellBorderLineVxes->size() != 0)) return NULL; @@ -244,7 +244,7 @@ cvf::ref RivCrossSectionGeometryGenerator::createMeshDrawable( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCrossSectionGeometryGenerator::createLineAlongPolylineDrawable() +cvf::ref RivIntersectionGeometryGenerator::createLineAlongPolylineDrawable() { std::vector lineIndices; std::vector vertices; @@ -287,7 +287,7 @@ cvf::ref RivCrossSectionGeometryGenerator::createLineAlongPoly //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCrossSectionGeometryGenerator::createPointsFromPolylineDrawable() +cvf::ref RivIntersectionGeometryGenerator::createPointsFromPolylineDrawable() { std::vector vertices; @@ -321,7 +321,7 @@ cvf::ref RivCrossSectionGeometryGenerator::createPointsFromPol //-------------------------------------------------------------------------------------------------- /// Remove the lines from the polyline that is nearly parallel to the extrusion direction //-------------------------------------------------------------------------------------------------- -void RivCrossSectionGeometryGenerator::adjustPolyline(const std::vector& polyLine, +void RivIntersectionGeometryGenerator::adjustPolyline(const std::vector& polyLine, const cvf::Vec3d extrDir, std::vector* adjustedPolyline) { @@ -347,7 +347,7 @@ void RivCrossSectionGeometryGenerator::adjustPolyline(const std::vector& RivCrossSectionGeometryGenerator::triangleToCellIndex() const +const std::vector& RivIntersectionGeometryGenerator::triangleToCellIndex() const { CVF_ASSERT(m_triangleVxes->size()); return m_triangleToCellIdxMap; @@ -356,7 +356,7 @@ const std::vector& RivCrossSectionGeometryGenerator::triangleToCellIndex //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const std::vector& RivCrossSectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const +const std::vector& RivIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const { CVF_ASSERT(m_triangleVxes->size()); return m_triVxToCellCornerWeights; @@ -365,7 +365,7 @@ const std::vector& RivCrossSectionGeometryGenerato //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const RimCrossSection* RivCrossSectionGeometryGenerator::crossSection() const +const RimCrossSection* RivIntersectionGeometryGenerator::crossSection() const { return m_crossSection; } @@ -373,7 +373,7 @@ const RimCrossSection* RivCrossSectionGeometryGenerator::crossSection() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RivCrossSectionGeometryGenerator::isAnyGeometryPresent() const +bool RivIntersectionGeometryGenerator::isAnyGeometryPresent() const { if (m_triangleVxes->size() == 0) { diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h similarity index 94% rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.h rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h index 8467cb56a8..39efaaf873 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h @@ -43,15 +43,15 @@ namespace cvf } -class RivCrossSectionGeometryGenerator : public cvf::Object +class RivIntersectionGeometryGenerator : public cvf::Object { public: - RivCrossSectionGeometryGenerator(const RimCrossSection* crossSection, + RivIntersectionGeometryGenerator(const RimCrossSection* crossSection, std::vector > &polylines, const cvf::Vec3d& extrusionDirection, const RivIntersectionHexGridInterface* grid ); - ~RivCrossSectionGeometryGenerator(); + ~RivIntersectionGeometryGenerator(); bool isAnyGeometryPresent() const; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index f4d95da239..e24b82d79e 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -507,7 +507,7 @@ void RivIntersectionPartMgr::computeData() { cvf::Vec3d direction = extrusionDirection(polyLines[0]); cvf::ref hexGrid = createHexGridInterface(); - m_crossSectionGenerator = new RivCrossSectionGeometryGenerator(m_rimCrossSection, polyLines, direction, hexGrid.p()); + m_crossSectionGenerator = new RivIntersectionGeometryGenerator(m_rimCrossSection, polyLines, direction, hexGrid.p()); } } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h index 486861559b..0873978d1f 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h @@ -19,7 +19,7 @@ #pragma once -#include "RivCrossSectionGeometryGenerator.h" +#include "RivIntersectionGeometryGenerator.h" #include "cvfBase.h" #include "cvfObject.h" @@ -80,7 +80,7 @@ private: cvf::Color3f m_defaultColor; - cvf::ref m_crossSectionGenerator; + cvf::ref m_crossSectionGenerator; cvf::ref m_crossSectionFaces; cvf::ref m_crossSectionGridLines; cvf::ref m_crossSectionFacesTextureCoords;