Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator

and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr

ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.cpp

@@ -34,7 +34,7 @@
 #include "RivObjectSourceInfo.h"
 #include "RivWellPathSourceInfo.h"
 
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 #include "cafDisplayCoordTransform.h"
 #include "cafSelectionManager.h"
 #include "cvfPart.h"

ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake

@@ -1,7 +1,7 @@
 
 set (SOURCE_GROUP_HEADER_FILES
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionGeometryGenerator.h
+${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.h
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionPartMgr.h
+${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.h
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.h
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h
 ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h
@@ -12,8 +12,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionGeometryGenerator.cpp
+${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.cpp
-${CMAKE_CURRENT_LIST_DIR}/RivIntersectionPartMgr.cpp
+${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivIntersectionGeometryGenerator.h"
+#include "RivExtrudedCurveIntersectionGeometryGenerator.h"
 
 #include "RigMainGrid.h"
 #include "RigResultAccessor.h"
@@ -28,7 +28,7 @@
 #include "RimExtrudedCurveIntersection.h"
 
 #include "RivHexGridIntersectionTools.h"
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 #include "RivPolylineGenerator.h"
 
 #include "cafDisplayCoordTransform.h"
@@ -58,7 +58,7 @@ cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimExtrudedCur
 /// isFlattened means to transform each flat section of the intersection onto the XZ plane
 /// placed adjacent to each other as if they were rotated around the common extrusion line like a hinge
 //--------------------------------------------------------------------------------------------------
-RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                      crossSection,
+RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                      crossSection,
                                                                     std::vector<std::vector<cvf::Vec3d>>& polylines,
                                                                     const cvf::Vec3d& extrusionDirection,
                                                                     const RivIntersectionHexGridInterface* grid,
@@ -81,12 +81,12 @@ RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator( RimExtrudedC
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionGeometryGenerator::~RivIntersectionGeometryGenerator() {}
+RivExtrudedCurveIntersectionGeometryGenerator::~RivExtrudedCurveIntersectionGeometryGenerator() {}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionGeometryGenerator::calculateSegementTransformPrLinePoint()
+void RivExtrudedCurveIntersectionGeometryGenerator::calculateSegementTransformPrLinePoint()
 {
     if ( m_isFlattened )
     {
@@ -136,7 +136,7 @@ void RivIntersectionGeometryGenerator::calculateSegementTransformPrLinePoint()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionGeometryGenerator::calculateFlattenedOrOffsetedPolyline()
+void RivExtrudedCurveIntersectionGeometryGenerator::calculateFlattenedOrOffsetedPolyline()
 {
     CVF_ASSERT( m_segementTransformPrLinePoint.size() == m_polyLines.size() );
 
@@ -212,7 +212,7 @@ private:
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionGeometryGenerator::calculateArrays()
+void RivExtrudedCurveIntersectionGeometryGenerator::calculateArrays()
 {
     if ( m_triangleVxes->size() ) return;
 
@@ -449,7 +449,7 @@ void RivIntersectionGeometryGenerator::calculateArrays()
 /// Generate surface drawable geo from the specified region
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::generateSurface()
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::generateSurface()
 {
     calculateArrays();
 
@@ -466,7 +466,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::generateSurface()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createMeshDrawable()
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createMeshDrawable()
 {
     if ( !( m_cellBorderLineVxes.notNull() && m_cellBorderLineVxes->size() != 0 ) ) return nullptr;
 
@@ -483,7 +483,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createMeshDrawable(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createFaultMeshDrawable()
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createFaultMeshDrawable()
 {
     if ( !( m_faultCellBorderLineVxes.notNull() && m_faultCellBorderLineVxes->size() != 0 ) ) return nullptr;
 
@@ -500,7 +500,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createFaultMeshDraw
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createLineAlongPolylineDrawable()
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongPolylineDrawable()
 {
     return RivPolylineGenerator::createLineAlongPolylineDrawable( m_flattenedOrOffsettedPolyLines );
 }
@@ -509,7 +509,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createLineAlongPoly
 ///
 //--------------------------------------------------------------------------------------------------
 cvf::ref<cvf::DrawableGeo>
-    RivIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+    RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
 {
     cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( crossSection() );
     std::vector<cvf::Vec3d>              displayCoords;
@@ -526,7 +526,7 @@ cvf::ref<cvf::DrawableGeo>
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createPointsFromPolylineDrawable()
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromPolylineDrawable()
 {
     return RivPolylineGenerator::createPointsFromPolylineDrawable( m_flattenedOrOffsettedPolyLines );
 }
@@ -535,7 +535,7 @@ cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createPointsFromPol
 ///
 //--------------------------------------------------------------------------------------------------
 cvf::ref<cvf::DrawableGeo>
-    RivIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+    RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
 {
     cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( crossSection() );
     std::vector<cvf::Vec3d>              displayCoords;
@@ -552,7 +552,7 @@ cvf::ref<cvf::DrawableGeo>
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const std::vector<size_t>& RivIntersectionGeometryGenerator::triangleToCellIndex() const
+const std::vector<size_t>& RivExtrudedCurveIntersectionGeometryGenerator::triangleToCellIndex() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
     return m_triangleToCellIdxMap;
@@ -562,7 +562,7 @@ const std::vector<size_t>& RivIntersectionGeometryGenerator::triangleToCellIndex
 ///
 //--------------------------------------------------------------------------------------------------
 const std::vector<RivIntersectionVertexWeights>&
-    RivIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
+    RivExtrudedCurveIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
     return m_triVxToCellCornerWeights;
@@ -571,7 +571,7 @@ const std::vector<RivIntersectionVertexWeights>&
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const cvf::Vec3fArray* RivIntersectionGeometryGenerator::triangleVxes() const
+const cvf::Vec3fArray* RivExtrudedCurveIntersectionGeometryGenerator::triangleVxes() const
 {
     CVF_ASSERT( m_triangleVxes->size() );
     return m_triangleVxes.p();
@@ -580,7 +580,7 @@ const cvf::Vec3fArray* RivIntersectionGeometryGenerator::triangleVxes() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimExtrudedCurveIntersection* RivIntersectionGeometryGenerator::crossSection() const
+RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionGeometryGenerator::crossSection() const
 {
     return m_crossSection;
 }
@@ -588,7 +588,7 @@ RimExtrudedCurveIntersection* RivIntersectionGeometryGenerator::crossSection() c
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::Mat4d RivIntersectionGeometryGenerator::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
+cvf::Mat4d RivExtrudedCurveIntersectionGeometryGenerator::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
 {
     cvf::Mat4d flattenMx = cvf::Mat4d::IDENTITY;
 
@@ -616,7 +616,7 @@ cvf::Mat4d RivIntersectionGeometryGenerator::unflattenTransformMatrix( const cvf
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RivIntersectionGeometryGenerator::isAnyGeometryPresent() const
+bool RivExtrudedCurveIntersectionGeometryGenerator::isAnyGeometryPresent() const
 {
     if ( m_triangleVxes->size() == 0 )
     {

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.h

@@ -46,17 +46,17 @@ class ScalarMapper;
 class DrawableGeo;
 } // namespace cvf
 
-class RivIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
+class RivExtrudedCurveIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
 {
 public:
-    RivIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       crossSection,
+    RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       crossSection,
                                       std::vector<std::vector<cvf::Vec3d>>&  polylines,
                                       const cvf::Vec3d&                      extrusionDirection,
                                       const RivIntersectionHexGridInterface* grid,
                                       bool                                   isFlattened,
                                       const cvf::Vec3d&                      flattenedPolylineStartPoint );
 
-    ~RivIntersectionGeometryGenerator() override;
+    ~RivExtrudedCurveIntersectionGeometryGenerator() override;
 
     // Generate geometry
     cvf::ref<cvf::DrawableGeo> generateSurface();

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 
 #include "RiaGuiApplication.h"
 #include "RiaOffshoreSphericalCoords.h"
@@ -50,7 +50,7 @@
 #include "RiuGeoMechXfTensorResultAccessor.h"
 
 #include "RivHexGridIntersectionTools.h"
-#include "RivIntersectionGeometryGenerator.h"
+#include "RivExtrudedCurveIntersectionGeometryGenerator.h"
 #include "RivIntersectionResultsColoringTools.h"
 #include "RivIntersectionSourceInfo.h"
 #include "RivMeshLinesSourceInfo.h"
@@ -84,7 +84,7 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr::RivIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
+RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
     : m_rimCrossSection( rimCrossSection )
     , m_isFlattened( isFlattened )
 {
@@ -99,7 +99,7 @@ RivIntersectionPartMgr::RivIntersectionPartMgr( RimExtrudedCurveIntersection* ri
     {
         cvf::Vec3d                                direction = m_rimCrossSection->extrusionDirection();
         cvf::ref<RivIntersectionHexGridInterface> hexGrid   = m_rimCrossSection->createHexGridInterface();
-        m_crossSectionGenerator                             = new RivIntersectionGeometryGenerator( m_rimCrossSection,
+        m_crossSectionGenerator                             = new RivExtrudedCurveIntersectionGeometryGenerator( m_rimCrossSection,
                                                                         polyLines,
                                                                         direction,
                                                                         hexGrid.p(),
@@ -111,7 +111,7 @@ RivIntersectionPartMgr::RivIntersectionPartMgr( RimExtrudedCurveIntersection* ri
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::applySingleColorEffect()
+void RivExtrudedCurveIntersectionPartMgr::applySingleColorEffect()
 {
     if ( m_crossSectionGenerator.isNull() ) return;
 
@@ -149,7 +149,7 @@ void RivIntersectionPartMgr::applySingleColorEffect()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::updateCellResultColor( size_t                        timeStepIndex,
+void RivExtrudedCurveIntersectionPartMgr::updateCellResultColor( size_t                        timeStepIndex,
                                                     const cvf::ScalarMapper*      explicitScalarColorMapper,
                                                     const RivTernaryScalarMapper* explicitTernaryColorMapper )
 {
@@ -221,7 +221,7 @@ void RivIntersectionResultsColoringTools::calculateNodeOrElementNodeBasedGeoMech
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::generatePartGeometry()
+void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
 {
     if ( m_crossSectionGenerator.isNull() ) return;
 
@@ -313,7 +313,7 @@ void RivIntersectionPartMgr::generatePartGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
+void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
 {
     m_faultMeshLabels     = nullptr;
     m_faultMeshLabelLines = nullptr;
@@ -420,7 +420,7 @@ void RivIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::createPolyLineParts( bool useBufferObjects )
+void RivExtrudedCurveIntersectionPartMgr::createPolyLineParts( bool useBufferObjects )
 {
     // Highlight line
 
@@ -504,7 +504,7 @@ void RivIntersectionPartMgr::createPolyLineParts( bool useBufferObjects )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::createExtrusionDirParts( bool useBufferObjects )
+void RivExtrudedCurveIntersectionPartMgr::createExtrusionDirParts( bool useBufferObjects )
 {
     m_highlightLineAlongExtrusionDir = nullptr;
     m_highlightPointsForExtrusionDir = nullptr;
@@ -587,7 +587,7 @@ void RivIntersectionPartMgr::createExtrusionDirParts( bool useBufferObjects )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model,
+void RivExtrudedCurveIntersectionPartMgr::appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model,
                                                                    cvf::Transform*      scaleTransform )
 {
     if ( m_crossSectionFaces.isNull() )
@@ -605,7 +605,7 @@ void RivIntersectionPartMgr::appendNativeCrossSectionFacesToModel( cvf::ModelBas
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
+void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
 {
     if ( m_crossSectionGridLines.isNull() )
     {
@@ -640,7 +640,7 @@ void RivIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* mo
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&           view,
+void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&           view,
                                                          cvf::ModelBasicList* model,
                                                          cvf::Transform*      scaleTransform )
 {
@@ -695,7 +695,7 @@ void RivIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&           vi
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const RimExtrudedCurveIntersection* RivIntersectionPartMgr::intersection() const
+const RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionPartMgr::intersection() const
 {
     return m_rimCrossSection.p();
 }
@@ -703,7 +703,7 @@ const RimExtrudedCurveIntersection* RivIntersectionPartMgr::intersection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::Mat4d RivIntersectionPartMgr::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
+cvf::Mat4d RivExtrudedCurveIntersectionPartMgr::unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat )
 {
     return m_crossSectionGenerator->unflattenTransformMatrix( intersectionPointFlat );
 }

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h

@@ -51,7 +51,7 @@ class RimCellEdgeColors;
 class RimEclipseCellColors;
 class RimExtrudedCurveIntersection;
 class RivTernaryScalarMapper;
-class RivIntersectionGeometryGenerator;
+class RivExtrudedCurveIntersectionGeometryGenerator;
 class RivIntersectionHexGridInterface;
 class RivIntersectionVertexWeights;
 class RivPipeGeometryGenerator;
@@ -61,10 +61,10 @@ class RivPipeGeometryGenerator;
 ///
 //==================================================================================================
 
-class RivIntersectionPartMgr : public cvf::Object
+class RivExtrudedCurveIntersectionPartMgr : public cvf::Object
 {
 public:
-    explicit RivIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened = false );
+    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened = false );
 
     void applySingleColorEffect();
     void updateCellResultColor( size_t                        timeStepIndex,
@@ -89,7 +89,7 @@ private:
 private:
     caf::PdmPointer<RimExtrudedCurveIntersection> m_rimCrossSection;
 
-    cvf::ref<RivIntersectionGeometryGenerator> m_crossSectionGenerator;
+    cvf::ref<RivExtrudedCurveIntersectionGeometryGenerator> m_crossSectionGenerator;
 
     cvf::ref<cvf::Part> m_crossSectionFaces;
     cvf::ref<cvf::Part> m_crossSectionGridLines;

ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp

@@ -37,7 +37,7 @@
 #include "RimTernaryLegendConfig.h"
 
 #include "RivIntersectionBoxSourceInfo.h"
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 #include "RivIntersectionResultsColoringTools.h"
 #include "RivMeshLinesSourceInfo.h"
 #include "RivPartPriority.h"

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp

@@ -19,12 +19,12 @@
 
 #include "RivIntersectionSourceInfo.h"
 
-#include "RivIntersectionGeometryGenerator.h"
+#include "RivExtrudedCurveIntersectionGeometryGenerator.h"
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionSourceInfo::RivIntersectionSourceInfo( RivIntersectionGeometryGenerator* geometryGenerator )
+RivIntersectionSourceInfo::RivIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
     : m_crossSectionGeometryGenerator( geometryGenerator )
 {
     CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() );

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h

@@ -23,18 +23,18 @@
 #include "cvfObject.h"
 #include <array>
 
-class RivIntersectionGeometryGenerator;
+class RivExtrudedCurveIntersectionGeometryGenerator;
 class RimExtrudedCurveIntersection;
 
 class RivIntersectionSourceInfo : public cvf::Object
 {
 public:
-    explicit RivIntersectionSourceInfo( RivIntersectionGeometryGenerator* geometryGenerator );
+    explicit RivIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator );
 
     const std::vector<size_t>& triangleToCellIndex() const;
     std::array<cvf::Vec3f, 3>  triangle( int triangleIdx ) const;
     RimExtrudedCurveIntersection*           crossSection() const;
 
 private:
-    cvf::cref<RivIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;
+    cvf::cref<RivExtrudedCurveIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;
 };

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp

@@ -37,7 +37,7 @@
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"
 
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 #include "RivSimWellPipesPartMgr.h"
 #include "RivTernarySaturationOverlayItem.h"
 #include "RivWellHeadPartMgr.h"
@@ -354,7 +354,7 @@ void Rim2dIntersectionView::updateName()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<RivIntersectionPartMgr> Rim2dIntersectionView::flatIntersectionPartMgr() const
+cvf::ref<RivExtrudedCurveIntersectionPartMgr> Rim2dIntersectionView::flatIntersectionPartMgr() const
 {
     return m_flatIntersectionPartMgr;
 }
@@ -540,7 +540,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
         nativeOrOverrideViewer()->addFrame( new cvf::Scene(), isUsingOverrideViewer() );
     }
 
-    m_flatIntersectionPartMgr = new RivIntersectionPartMgr( m_intersection(), true );
+    m_flatIntersectionPartMgr = new RivExtrudedCurveIntersectionPartMgr( m_intersection(), true );
 
     m_intersectionVizModel->removeAllParts();
 

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h

@@ -28,7 +28,7 @@ class RimTernaryLegendConfig;
 class RivSimWellPipesPartMgr;
 class RivWellHeadPartMgr;
 class RivWellPathPartMgr;
-class RivIntersectionPartMgr;
+class RivExtrudedCurveIntersectionPartMgr;
 
 namespace cvf
 {
@@ -71,7 +71,7 @@ public:
     void update3dInfo();
     void updateName();
 
-    cvf::ref<RivIntersectionPartMgr> flatIntersectionPartMgr() const;
+    cvf::ref<RivExtrudedCurveIntersectionPartMgr> flatIntersectionPartMgr() const;
     cvf::Vec3d                       transformToUtm( const cvf::Vec3d& unscaledPointInFlatDomain ) const;
 
     cvf::ref<caf::DisplayCoordTransform> displayCoordTransform() const override;
@@ -119,7 +119,7 @@ private:
 
     caf::PdmPtrField<RimExtrudedCurveIntersection*> m_intersection;
 
-    cvf::ref<RivIntersectionPartMgr> m_flatIntersectionPartMgr;
+    cvf::ref<RivExtrudedCurveIntersectionPartMgr> m_flatIntersectionPartMgr;
     cvf::ref<RivSimWellPipesPartMgr> m_flatSimWellPipePartMgr;
     cvf::ref<RivWellHeadPartMgr>     m_flatWellHeadPartMgr;
     cvf::ref<RivWellPathPartMgr>     m_flatWellpathPartMgr;

ApplicationCode/ProjectDataModel/RimEclipseView.h

@@ -57,7 +57,7 @@ class RimStimPlanColors;
 class RimVirtualPerforationResults;
 class RiuViewer;
 class RivReservoirSimWellsPartMgr;
-class RivIntersectionPartMgr;
+class RivExtrudedCurveIntersectionPartMgr;
 class RivReservoirViewPartMgr;
 class RimRegularLegendConfig;
 class RimTernaryLegendConfig;

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp

@@ -36,7 +36,7 @@
 #include "RimWellPath.h"
 
 #include "RiuViewer.h"
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 
 #include "cafCmdFeature.h"
 #include "cafCmdFeatureManager.h"
@@ -492,9 +492,9 @@ std::vector<std::vector<cvf::Vec3d>> RimExtrudedCurveIntersection::polyLines( cv
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr* RimExtrudedCurveIntersection::intersectionPartMgr()
+RivExtrudedCurveIntersectionPartMgr* RimExtrudedCurveIntersection::intersectionPartMgr()
 {
-    if ( m_crossSectionPartMgr.isNull() ) m_crossSectionPartMgr = new RivIntersectionPartMgr( this );
+    if ( m_crossSectionPartMgr.isNull() ) m_crossSectionPartMgr = new RivExtrudedCurveIntersectionPartMgr( this );
 
     return m_crossSectionPartMgr.p();
 }

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h

@@ -30,7 +30,7 @@
 #include "RimIntersectionHandle.h"
 
 class RimWellPath;
-class RivIntersectionPartMgr;
+class RivExtrudedCurveIntersectionPartMgr;
 class RimIntersectionResultDefinition;
 class RimSimWellInView;
 class RimSimWellInViewCollection;
@@ -85,7 +85,7 @@ public:
     void                                 appendPointToPolyLine( const cvf::Vec3d& point );
 
     Rim2dIntersectionView*  correspondingIntersectionView();
-    RivIntersectionPartMgr* intersectionPartMgr();
+    RivExtrudedCurveIntersectionPartMgr* intersectionPartMgr();
     void                    rebuildGeometry();
 
     std::vector<cvf::Vec3d> polyLinesForExtrusionDirection() const;
@@ -140,7 +140,7 @@ private:
     static double               azimuthInRadians( cvf::Vec3d vec );
 
 private:
-    cvf::ref<RivIntersectionPartMgr> m_crossSectionPartMgr;
+    cvf::ref<RivExtrudedCurveIntersectionPartMgr> m_crossSectionPartMgr;
 
     mutable std::vector<std::vector<cvf::Vec3d>> m_simulationWellBranchCenterlines;
 };

ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -30,7 +30,7 @@
 #include "Riu3DMainWindowTools.h"
 
 #include "RivIntersectionBoxPartMgr.h"
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 
 #include "cvfModelBasicList.h"
 

ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp

@@ -34,7 +34,7 @@
 
 #include "RiuGeoMechXfTensorResultAccessor.h"
 
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 
 #include "cafDisplayCoordTransform.h"
 

ApplicationCode/UserInterface/RiuResultTextBuilder.cpp

@@ -38,7 +38,7 @@
 #include "RimRegularLegendConfig.h"
 #include "RimReservoirCellResultsStorage.h"
 
-#include "RivIntersectionPartMgr.h"
+#include "RivExtrudedCurveIntersectionPartMgr.h"
 
 #include "cafDisplayCoordTransform.h"