Rename RimIntersection to RimExtrudedCurveIntersection

ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp

@@ -21,7 +21,7 @@
 
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimTensorResults.h"
 
@@ -98,7 +98,7 @@ void RicAppendIntersectionFeatureCmd::redo()
 {
     CVF_ASSERT( m_intersectionCollection );
 
-    RimIntersection* intersection = new RimIntersection();
+    RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
     intersection->setName( "Intersection" );
     m_intersectionCollection->appendIntersectionAndUpdate( intersection );
 

ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp

@@ -22,7 +22,7 @@
 #include "RimCase.h"
 #include "RimEclipseCase.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionCollection.h"
 
@@ -49,7 +49,7 @@ enum SelectionComposition
 };
 
 static RimIntersectionCollection*       selectedIntersectionCollection();
-static std::vector<RimIntersection*>    selectedIntersections();
+static std::vector<RimExtrudedCurveIntersection*>    selectedIntersections();
 static std::vector<RimIntersectionBox*> selectedIntersectionBoxes();
 static SelectionComposition             selectionComposition();
 static RimCase*                         commonGridCase( std::vector<caf::PdmUiItem*> selectedItems );
@@ -83,7 +83,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::onActionTriggered( bool isChec
             copyIntersectionBoxesToOtherViews( *gridCase, coll->intersectionBoxes() );
         }
 
-        std::vector<RimIntersection*>    selIntersections     = selectedIntersections();
+        std::vector<RimExtrudedCurveIntersection*>    selIntersections     = selectedIntersections();
         std::vector<RimIntersectionBox*> selIntersectionBoxes = selectedIntersectionBoxes();
 
         if ( compostion == SEL_INTERSECTIONS || compostion == SEL_BOTH_INTERSECTION_TYPES )
@@ -110,9 +110,9 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::setupActionLook( QAction* acti
 ///
 //--------------------------------------------------------------------------------------------------
 void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( RimCase&                      gridCase,
-                                                                                 std::vector<RimIntersection*> intersections )
+                                                                                 std::vector<RimExtrudedCurveIntersection*> intersections )
 {
-    for ( RimIntersection* intersection : intersections )
+    for ( RimExtrudedCurveIntersection* intersection : intersections )
     {
         for ( Rim3dView* const view : gridCase.views() )
         {
@@ -124,7 +124,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
             {
                 RimIntersectionCollection* destCollection = currGridView->crossSectionCollection();
 
-                RimIntersection* copy = dynamic_cast<RimIntersection*>(
+                RimExtrudedCurveIntersection* copy = dynamic_cast<RimExtrudedCurveIntersection*>(
                     intersection->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
                 CVF_ASSERT( copy );
 
@@ -179,9 +179,9 @@ RimIntersectionCollection* selectedIntersectionCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimIntersection*> selectedIntersections()
+std::vector<RimExtrudedCurveIntersection*> selectedIntersections()
 {
-    return caf::selectedObjectsByType<RimIntersection*>();
+    return caf::selectedObjectsByType<RimExtrudedCurveIntersection*>();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -204,7 +204,7 @@ SelectionComposition selectionComposition()
     if ( gridCase && gridCase->gridViews().size() > 1 )
     {
         RimIntersectionCollection*       selColl              = selectedIntersectionCollection();
-        std::vector<RimIntersection*>    selIntersections     = selectedIntersections();
+        std::vector<RimExtrudedCurveIntersection*>    selIntersections     = selectedIntersections();
         std::vector<RimIntersectionBox*> selIntersectionBoxes = selectedIntersectionBoxes();
 
         if ( selColl )

ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.h

@@ -24,7 +24,7 @@
 #include "cafPdmPointer.h"
 
 class RimCase;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class RimIntersectionBox;
 class RimIntersectionCollection;
 
@@ -41,6 +41,6 @@ protected:
     void onActionTriggered( bool isChecked ) override;
     void setupActionLook( QAction* actionToSetup ) override;
 
-    void copyIntersectionsToOtherViews( RimCase& gridCase, std::vector<RimIntersection*> intersections );
+    void copyIntersectionsToOtherViews( RimCase& gridCase, std::vector<RimExtrudedCurveIntersection*> intersections );
     void copyIntersectionBoxesToOtherViews( RimCase& gridCase, std::vector<RimIntersectionBox*> intersectionBoxes );
 };

ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp

@@ -22,7 +22,7 @@
 
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 
 #include "Riu3DMainWindowTools.h"
@@ -105,9 +105,9 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
 {
     CVF_ASSERT( m_intersectionCollection );
 
-    RimIntersection* intersection = new RimIntersection();
+    RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
     intersection->setName( "Azimuth and Dip" );
-    intersection->type                                   = RimIntersection::CS_AZIMUTHLINE;
+    intersection->type                                   = RimExtrudedCurveIntersection::CS_AZIMUTHLINE;
     intersection->inputTwoAzimuthPointsFromViewerEnabled = true;
 
     RimCase* rimCase;

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp

@@ -23,7 +23,7 @@
 
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 
 #include "Riu3DMainWindowTools.h"
@@ -103,9 +103,9 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
 {
     CVF_ASSERT( m_intersectionCollection );
 
-    RimIntersection* intersection = new RimIntersection();
+    RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
     intersection->setName( "Polyline" );
-    intersection->type                           = RimIntersection::CS_POLYLINE;
+    intersection->type                           = RimExtrudedCurveIntersection::CS_POLYLINE;
     intersection->inputPolyLineFromViewerEnabled = true;
 
     m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );

ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp

@@ -20,7 +20,7 @@
 #include "RicNewSimWellIntersectionFeature.h"
 
 #include "RimEclipseView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimSimWellInView.h"
 
@@ -101,9 +101,9 @@ void RicNewSimWellIntersectionCmd::redo()
     CVF_ASSERT( m_intersectionCollection );
     CVF_ASSERT( m_simWell );
 
-    RimIntersection* intersection = new RimIntersection();
+    RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
     intersection->setName( m_simWell->name );
-    intersection->type           = RimIntersection::CS_SIMULATION_WELL;
+    intersection->type           = RimExtrudedCurveIntersection::CS_SIMULATION_WELL;
     intersection->simulationWell = m_simWell;
 
     m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );

ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp

@@ -22,7 +22,7 @@
 #include "RiaApplication.h"
 
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimWellPath.h"
 
@@ -108,9 +108,9 @@ void RicNewWellPathIntersectionFeatureCmd::redo()
     CVF_ASSERT( m_intersectionCollection );
     CVF_ASSERT( m_wellPath );
 
-    RimIntersection* intersection = new RimIntersection();
+    RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
     intersection->setName( m_wellPath->name() );
-    intersection->type     = RimIntersection::CS_WELL_PATH;
+    intersection->type     = RimExtrudedCurveIntersection::CS_WELL_PATH;
     intersection->wellPath = m_wellPath;
 
     m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );

ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp

@@ -20,7 +20,7 @@
 
 #include "Rim2dIntersectionView.h"
 #include "RimCase.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "Riu3DMainWindowTools.h"
 #include "Riu3dSelectionManager.h"
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT( RicNewIntersectionViewFeature, "RicNewIntersectionViewFeatu
 //--------------------------------------------------------------------------------------------------
 bool RicNewIntersectionViewFeature::isCommandEnabled()
 {
-    std::set<RimIntersection*> objects = selectedIntersections();
+    std::set<RimExtrudedCurveIntersection*> objects = selectedIntersections();
 
     return !objects.empty();
 }
@@ -50,7 +50,7 @@ bool RicNewIntersectionViewFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicNewIntersectionViewFeature::onActionTriggered( bool isChecked )
 {
-    std::set<RimIntersection*> intersections = selectedIntersections();
+    std::set<RimExtrudedCurveIntersection*> intersections = selectedIntersections();
 
     Rim2dIntersectionView* objectToSelect = nullptr;
 
@@ -62,7 +62,7 @@ void RicNewIntersectionViewFeature::onActionTriggered( bool isChecked )
         intersection->firstAncestorOrThisOfType( rimCase );
         if ( rimCase )
         {
-            if ( intersection->direction() != RimIntersection::CS_VERTICAL )
+            if ( intersection->direction() != RimExtrudedCurveIntersection::CS_VERTICAL )
             {
                 QString text =
                     QString(
@@ -101,9 +101,9 @@ void RicNewIntersectionViewFeature::setupActionLook( QAction* actionToSetup )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<RimIntersection*> RicNewIntersectionViewFeature::selectedIntersections()
+std::set<RimExtrudedCurveIntersection*> RicNewIntersectionViewFeature::selectedIntersections()
 {
-    std::set<RimIntersection*> objects;
+    std::set<RimExtrudedCurveIntersection*> objects;
 
     Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
     RiuSelectionItem*      selItem       = riuSelManager->selectedItem( Riu3dSelectionManager::RUI_TEMPORARY );
@@ -111,7 +111,7 @@ std::set<RimIntersection*> RicNewIntersectionViewFeature::selectedIntersections(
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( generalSelectionItem )
     {
-        RimIntersection* intersection = dynamic_cast<RimIntersection*>( generalSelectionItem->m_object );
+        RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
         if ( intersection )
         {
             objects.insert( intersection );
@@ -123,7 +123,7 @@ std::set<RimIntersection*> RicNewIntersectionViewFeature::selectedIntersections(
     }
 
     {
-        std::vector<RimIntersection*> selectedObjects = caf::selectedObjectsByType<RimIntersection*>();
+        std::vector<RimExtrudedCurveIntersection*> selectedObjects = caf::selectedObjectsByType<RimExtrudedCurveIntersection*>();
         for ( auto obj : selectedObjects )
         {
             objects.insert( obj );

ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h

@@ -22,7 +22,7 @@
 
 #include <set>
 
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 
 //==================================================================================================
 ///
@@ -37,5 +37,5 @@ protected:
     void setupActionLook( QAction* actionToSetup ) override;
 
 private:
-    static std::set<RimIntersection*> selectedIntersections();
+    static std::set<RimExtrudedCurveIntersection*> selectedIntersections();
 };

ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp

@@ -24,7 +24,7 @@
 
 #include "Rim3dView.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimMeasurement.h"
 #include "RimProject.h"
 

ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp

@@ -26,7 +26,7 @@
 #include "RimGeoMechView.h"
 #include "RimGridCrossPlotCurve.h"
 #include "RimGridCrossPlotDataSet.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimMimeData.h"
 #include "RimSummaryCurveFilter.h"
@@ -141,7 +141,7 @@ bool RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported( caf::PdmObjec
     {
         return true;
     }
-    else if ( dynamic_cast<RimIntersection*>( pdmObject ) )
+    else if ( dynamic_cast<RimExtrudedCurveIntersection*>( pdmObject ) )
     {
         return true;
     }

ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp

@@ -20,7 +20,7 @@
 
 #include "RicPasteFeatureImpl.h"
 
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionCollection.h"
 
@@ -41,7 +41,7 @@ bool RicPasteIntersectionsFeature::isCommandEnabled()
     caf::PdmObjectGroup objectGroup;
     RicPasteFeatureImpl::findObjectsFromClipboardRefs( &objectGroup );
 
-    std::vector<caf::PdmPointer<RimIntersection>> intersectionObjects;
+    std::vector<caf::PdmPointer<RimExtrudedCurveIntersection>> intersectionObjects;
     objectGroup.objectsByType( &intersectionObjects );
 
     std::vector<caf::PdmPointer<RimIntersectionBox>> intersectionBoxObjects;
@@ -81,12 +81,12 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
 
     if ( objectGroup.objects.size() == 0 ) return;
 
-    std::vector<caf::PdmPointer<RimIntersection>> intersectionObjects;
+    std::vector<caf::PdmPointer<RimExtrudedCurveIntersection>> intersectionObjects;
     objectGroup.objectsByType( &intersectionObjects );
 
     for ( size_t i = 0; i < intersectionObjects.size(); i++ )
     {
-        RimIntersection* intersection = dynamic_cast<RimIntersection*>(
+        RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>(
             intersectionObjects[i]->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
 
         QString nameOfCopy = QString( "Copy of " ) + intersection->name();
@@ -146,7 +146,7 @@ RimIntersectionCollection* RicPasteIntersectionsFeature::findIntersectionCollect
         return intersectionCollection;
     }
 
-    RimIntersection* intersection = dynamic_cast<RimIntersection*>( objectHandle );
+    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( objectHandle );
     if ( intersection )
     {
         intersection->firstAncestorOrThisOfType( intersectionCollection );

ApplicationCode/Commands/RicDeleteItemFeature.cpp

@@ -41,7 +41,7 @@
 #include "RimGridCrossPlotDataSet.h"
 #include "RimGridTimeHistoryCurve.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimMultiPlotWindow.h"
@@ -117,7 +117,7 @@ bool isDeletable( caf::PdmUiItem* uiItem )
     }
     if ( dynamic_cast<RimSummaryCurve*>( uiItem ) ) return true;
     if ( dynamic_cast<RimGridTimeHistoryCurve*>( uiItem ) ) return true;
-    if ( dynamic_cast<RimIntersection*>( uiItem ) ) return true;
+    if ( dynamic_cast<RimExtrudedCurveIntersection*>( uiItem ) ) return true;
     if ( dynamic_cast<RimIntersectionBox*>( uiItem ) ) return true;
     if ( dynamic_cast<RimFormationNames*>( uiItem ) ) return true;
     if ( dynamic_cast<RimFormationNamesCollection*>( uiItem ) ) return true;

ApplicationCode/Commands/RicHideIntersectionFeature.cpp

@@ -21,7 +21,7 @@
 #include "RiaApplication.h"
 
 #include "Rim3dView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "Riu3dSelectionManager.h"
 
@@ -43,7 +43,7 @@ bool RicHideIntersectionFeature::isCommandEnabled()
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( !generalSelectionItem ) return false;
 
-    RimIntersection* intersection = dynamic_cast<RimIntersection*>( generalSelectionItem->m_object );
+    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
     if ( intersection )
     {
         return true;
@@ -65,7 +65,7 @@ void RicHideIntersectionFeature::onActionTriggered( bool isChecked )
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( !generalSelectionItem ) return;
 
-    RimIntersection* intersection = dynamic_cast<RimIntersection*>( generalSelectionItem->m_object );
+    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
     if ( intersection )
     {
         intersection->setActive( false );

ApplicationCode/Commands/RicSelectColorResult.cpp

@@ -26,7 +26,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "Riu3DMainWindowTools.h"
 

ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp

@@ -20,7 +20,7 @@
 #include "RiaApplication.h"
 
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "cafDisplayCoordTransform.h"
 #include "cafSelectionManager.h"
@@ -41,13 +41,13 @@ RicIntersectionPickEventHandler* RicIntersectionPickEventHandler::instance()
 //--------------------------------------------------------------------------------------------------
 bool RicIntersectionPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eventObject )
 {
-    std::vector<RimIntersection*> selection;
+    std::vector<RimExtrudedCurveIntersection*> selection;
     caf::SelectionManager::instance()->objectsByType( &selection );
 
     if ( selection.size() == 1 )
     {
         {
-            RimIntersection* intersection = selection[0];
+            RimExtrudedCurveIntersection* intersection = selection[0];
 
             RimGridView* gridView = nullptr;
             intersection->firstAncestorOrThisOfTypeAsserted( gridView );

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp

@@ -25,7 +25,7 @@
 #include "Rim3dView.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "RivHexGridIntersectionTools.h"
 #include "RivIntersectionPartMgr.h"
@@ -44,7 +44,7 @@
 
 #include "RivSectionFlattner.h"
 
-cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimIntersection* intersection )
+cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimExtrudedCurveIntersection* intersection )
 {
     Rim3dView* rimView = nullptr;
     intersection->firstAncestorOrThisOfType( rimView );
@@ -58,7 +58,7 @@ cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimIntersectio
 /// 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( RimIntersection*                      crossSection,
+RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                      crossSection,
                                                                     std::vector<std::vector<cvf::Vec3d>>& polylines,
                                                                     const cvf::Vec3d& extrusionDirection,
                                                                     const RivIntersectionHexGridInterface* grid,
@@ -254,7 +254,7 @@ void RivIntersectionGeometryGenerator::calculateArrays()
             double maxSectionHeightUp   = 0;
             double maxSectionHeightDown = 0;
 
-            if ( m_crossSection->type == RimIntersection::CS_AZIMUTHLINE )
+            if ( m_crossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
             {
                 maxSectionHeightUp   = m_crossSection->lengthUp();
                 maxSectionHeightDown = m_crossSection->lengthDown();
@@ -320,7 +320,7 @@ void RivIntersectionGeometryGenerator::calculateArrays()
                                                                        &hexPlaneCutTriangleVxes,
                                                                        &cellFaceForEachTriangleEdge );
 
-                if ( m_crossSection->type == RimIntersection::CS_AZIMUTHLINE )
+                if ( m_crossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
                 {
                     bool hasAnyPointsOnSurface = false;
                     for ( caf::HexGridIntersectionTools::ClipVx vertex : hexPlaneCutTriangleVxes )
@@ -580,7 +580,7 @@ const cvf::Vec3fArray* RivIntersectionGeometryGenerator::triangleVxes() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersection* RivIntersectionGeometryGenerator::crossSection() const
+RimExtrudedCurveIntersection* RivIntersectionGeometryGenerator::crossSection() const
 {
     return m_crossSection;
 }

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h

@@ -36,7 +36,7 @@
 class RigMainGrid;
 class RigActiveCellInfo;
 class RigResultAccessor;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class RivIntersectionHexGridInterface;
 class RivIntersectionVertexWeights;
 
@@ -49,7 +49,7 @@ class DrawableGeo;
 class RivIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
 {
 public:
-    RivIntersectionGeometryGenerator( RimIntersection*                       crossSection,
+    RivIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       crossSection,
                                       std::vector<std::vector<cvf::Vec3d>>&  polylines,
                                       const cvf::Vec3d&                      extrusionDirection,
                                       const RivIntersectionHexGridInterface* grid,
@@ -77,7 +77,7 @@ public:
         return m_faultMeshLabelAndAnchorPositions;
     }
 
-    RimIntersection* crossSection() const;
+    RimExtrudedCurveIntersection* crossSection() const;
 
     cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat );
 
@@ -93,7 +93,7 @@ private:
     void calculateSegementTransformPrLinePoint();
     void calculateFlattenedOrOffsetedPolyline();
 
-    RimIntersection*                           m_crossSection;
+    RimExtrudedCurveIntersection*                           m_crossSection;
     cvf::cref<RivIntersectionHexGridInterface> m_hexGrid;
     const std::vector<std::vector<cvf::Vec3d>> m_polyLines;
     cvf::Vec3d                                 m_extrusionDirection;

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp

@@ -39,7 +39,7 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
@@ -84,7 +84,7 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr::RivIntersectionPartMgr( RimIntersection* rimCrossSection, bool isFlattened )
+RivIntersectionPartMgr::RivIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
     : m_rimCrossSection( rimCrossSection )
     , m_isFlattened( isFlattened )
 {
@@ -427,8 +427,8 @@ void RivIntersectionPartMgr::createPolyLineParts( bool useBufferObjects )
     m_highlightLineAlongPolyline = nullptr;
     m_highlightPointsForPolyline = nullptr;
 
-    if ( m_rimCrossSection->type == RimIntersection::CS_POLYLINE ||
+    if ( m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_POLYLINE ||
-         m_rimCrossSection->type == RimIntersection::CS_AZIMUTHLINE )
+         m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE )
     {
         {
             cvf::ref<cvf::DrawableGeo> polylineGeo = m_crossSectionGenerator->createLineAlongPolylineDrawable();
@@ -509,7 +509,7 @@ void RivIntersectionPartMgr::createExtrusionDirParts( bool useBufferObjects )
     m_highlightLineAlongExtrusionDir = nullptr;
     m_highlightPointsForExtrusionDir = nullptr;
 
-    if ( m_rimCrossSection->direction() == RimIntersection::CS_TWO_POINTS )
+    if ( m_rimCrossSection->direction() == RimExtrudedCurveIntersection::CS_TWO_POINTS )
     {
         {
             cvf::ref<cvf::DrawableGeo> polylineGeo = m_crossSectionGenerator->createLineAlongExtrusionLineDrawable(
@@ -695,7 +695,7 @@ void RivIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&           vi
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const RimIntersection* RivIntersectionPartMgr::intersection() const
+const RimExtrudedCurveIntersection* RivIntersectionPartMgr::intersection() const
 {
     return m_rimCrossSection.p();
 }

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h

@@ -49,7 +49,7 @@ class RigResultAccessor;
 class Rim3dView;
 class RimCellEdgeColors;
 class RimEclipseCellColors;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class RivTernaryScalarMapper;
 class RivIntersectionGeometryGenerator;
 class RivIntersectionHexGridInterface;
@@ -64,7 +64,7 @@ class RivPipeGeometryGenerator;
 class RivIntersectionPartMgr : public cvf::Object
 {
 public:
-    explicit RivIntersectionPartMgr( RimIntersection* rimCrossSection, bool isFlattened = false );
+    explicit RivIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened = false );
 
     void applySingleColorEffect();
     void updateCellResultColor( size_t                        timeStepIndex,
@@ -75,7 +75,7 @@ public:
     void appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
     void appendPolylinePartsToModel( Rim3dView& view, cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
 
-    const RimIntersection* intersection() const;
+    const RimExtrudedCurveIntersection* intersection() const;
 
     cvf::Mat4d unflattenTransformMatrix( const cvf::Vec3d& intersectionPointFlat );
 
@@ -87,7 +87,7 @@ private:
     void createExtrusionDirParts( bool useBufferObjects );
 
 private:
-    caf::PdmPointer<RimIntersection> m_rimCrossSection;
+    caf::PdmPointer<RimExtrudedCurveIntersection> m_rimCrossSection;
 
     cvf::ref<RivIntersectionGeometryGenerator> m_crossSectionGenerator;
 

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp

@@ -56,7 +56,7 @@ std::array<cvf::Vec3f, 3> RivIntersectionSourceInfo::triangle( int triangleIdx )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersection* RivIntersectionSourceInfo::crossSection() const
+RimExtrudedCurveIntersection* RivIntersectionSourceInfo::crossSection() const
 {
     return m_crossSectionGeometryGenerator->crossSection();
 }

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h

@@ -24,7 +24,7 @@
 #include <array>
 
 class RivIntersectionGeometryGenerator;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 
 class RivIntersectionSourceInfo : public cvf::Object
 {
@@ -33,7 +33,7 @@ public:
 
     const std::vector<size_t>& triangleToCellIndex() const;
     std::array<cvf::Vec3f, 3>  triangle( int triangleIdx ) const;
-    RimIntersection*           crossSection() const;
+    RimExtrudedCurveIntersection*           crossSection() const;
 
 private:
     cvf::cref<RivIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -88,7 +88,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionHandle.h
-${CMAKE_CURRENT_LIST_DIR}/RimIntersection.h
+${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.h
@@ -233,7 +233,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionHandle.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimIntersection.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.cpp

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp

@@ -26,7 +26,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSimWellInView.h"
@@ -123,7 +123,7 @@ void Rim2dIntersectionView::setVisible( bool isVisible )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void Rim2dIntersectionView::setIntersection( RimIntersection* intersection )
+void Rim2dIntersectionView::setIntersection( RimExtrudedCurveIntersection* intersection )
 {
     CAF_ASSERT( intersection );
 
@@ -135,7 +135,7 @@ void Rim2dIntersectionView::setIntersection( RimIntersection* intersection )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersection* Rim2dIntersectionView::intersection() const
+RimExtrudedCurveIntersection* Rim2dIntersectionView::intersection() const
 {
     return m_intersection();
 }
@@ -553,7 +553,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
     m_flatSimWellPipePartMgr = nullptr;
     m_flatWellHeadPartMgr    = nullptr;
 
-    if ( m_intersection->type() == RimIntersection::CS_SIMULATION_WELL && m_intersection->simulationWell() )
+    if ( m_intersection->type() == RimExtrudedCurveIntersection::CS_SIMULATION_WELL && m_intersection->simulationWell() )
     {
         RimEclipseView* eclipseView = nullptr;
         m_intersection->firstAncestorOrThisOfType( eclipseView );
@@ -566,7 +566,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
     }
 
     m_flatWellpathPartMgr = nullptr;
-    if ( m_intersection->type() == RimIntersection::CS_WELL_PATH && m_intersection->wellPath() )
+    if ( m_intersection->type() == RimExtrudedCurveIntersection::CS_WELL_PATH && m_intersection->wellPath() )
     {
         Rim3dView* settingsView = nullptr;
         m_intersection->firstAncestorOrThisOfType( settingsView );

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h

@@ -22,7 +22,7 @@
 #include "cafPdmProxyValueField.h"
 #include "cafPdmPtrField.h"
 
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class RimRegularLegendConfig;
 class RimTernaryLegendConfig;
 class RivSimWellPipesPartMgr;
@@ -49,8 +49,8 @@ public:
     ~Rim2dIntersectionView( void ) override;
 
     void             setVisible( bool isVisible );
-    void             setIntersection( RimIntersection* intersection );
+    void             setIntersection( RimExtrudedCurveIntersection* intersection );
-    RimIntersection* intersection() const;
+    RimExtrudedCurveIntersection* intersection() const;
 
     bool     isUsingFormationNames() const override;
     void     scheduleGeometryRegen( RivCellSetEnum geometryType ) override;
@@ -117,7 +117,7 @@ private:
     caf::PdmChildField<RimRegularLegendConfig*> m_legendConfig;
     caf::PdmChildField<RimTernaryLegendConfig*> m_ternaryLegendConfig;
 
-    caf::PdmPtrField<RimIntersection*> m_intersection;
+    caf::PdmPtrField<RimExtrudedCurveIntersection*> m_intersection;
 
     cvf::ref<RivIntersectionPartMgr> m_flatIntersectionPartMgr;
     cvf::ref<RivSimWellPipesPartMgr> m_flatSimWellPipePartMgr;

ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp

@@ -20,7 +20,7 @@
 
 #include "Rim2dIntersectionView.h"
 #include "RimCase.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 CAF_PDM_SOURCE_INIT( Rim2dIntersectionViewCollection, "Intersection2dViewCollection" );
 
@@ -61,10 +61,10 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
     RimCase* parentCase = nullptr;
     this->firstAncestorOrThisOfTypeAsserted( parentCase );
 
-    std::vector<RimIntersection*> allOrderedIntersectionsInCase;
+    std::vector<RimExtrudedCurveIntersection*> allOrderedIntersectionsInCase;
     parentCase->descendantsIncludingThisOfType( allOrderedIntersectionsInCase );
 
-    std::set<RimIntersection*> currentIntersections( allOrderedIntersectionsInCase.begin(),
+    std::set<RimExtrudedCurveIntersection*> currentIntersections( allOrderedIntersectionsInCase.begin(),
                                                      allOrderedIntersectionsInCase.end() );
 
     // Delete views without a valid intersection
@@ -83,7 +83,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
 
     // Build map from intersection to view
 
-    std::map<RimIntersection*, Rim2dIntersectionView*> intersectionToViewMap;
+    std::map<RimExtrudedCurveIntersection*, Rim2dIntersectionView*> intersectionToViewMap;
     for ( Rim2dIntersectionView* iv : m_intersectionViews )
     {
         CVF_ASSERT( iv && iv->intersection() );
@@ -94,7 +94,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
 
     // Insert the old views in correct order, and create new views as we go
 
-    for ( RimIntersection* intersection : allOrderedIntersectionsInCase )
+    for ( RimExtrudedCurveIntersection* intersection : allOrderedIntersectionsInCase )
     {
         auto it = intersectionToViewMap.find( intersection );
         if ( it == intersectionToViewMap.end() )

ApplicationCode/ProjectDataModel/RimCase.cpp

@@ -33,7 +33,7 @@
 #include "Rim2dIntersectionView.h"
 #include "Rim2dIntersectionViewCollection.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCase, "RimCase" );
 

ApplicationCode/ProjectDataModel/RimCase.h

@@ -34,7 +34,7 @@ class RimGridView;
 class RimFormationNames;
 class RimTimeStepFilter;
 class Rim2dIntersectionView;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class Rim2dIntersectionViewCollection;
 
 namespace cvf

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -74,7 +74,7 @@
 #include "RimGridCrossPlotCollection.h"
 #include "RimGridCrossPlotDataSet.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultDefinition.h"
@@ -666,7 +666,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
             menuBuilder.addSeparator();
             menuBuilder << "RicCopyIntersectionsToAllViewsInCaseFeature";
         }
-        else if ( dynamic_cast<RimIntersection*>( uiItem ) )
+        else if ( dynamic_cast<RimExtrudedCurveIntersection*>( uiItem ) )
         {
             menuBuilder << "RicPasteIntersectionsFeature";
             menuBuilder.addSeparator();

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -59,7 +59,7 @@
 #include "RimGridCollection.h"
 #include "RimGridCrossPlotDataSet.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
@@ -1633,7 +1633,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
     {
         this->loadDataAndUpdate();
 
-        std::vector<RimIntersection*> intersections = m_crossSectionCollection->intersections();
+        std::vector<RimExtrudedCurveIntersection*> intersections = m_crossSectionCollection->intersections();
         for ( auto intersection : intersections )
         {
             if ( intersection && intersection->correspondingIntersectionView() )

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 #include "RiaApplication.h"
 
@@ -55,32 +55,32 @@
 namespace caf
 {
 template <>
-void caf::AppEnum<RimIntersection::CrossSectionEnum>::setUp()
+void caf::AppEnum<RimExtrudedCurveIntersection::CrossSectionEnum>::setUp()
 {
-    addItem( RimIntersection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path" );
+    addItem( RimExtrudedCurveIntersection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path" );
-    addItem( RimIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well" );
+    addItem( RimExtrudedCurveIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well" );
-    addItem( RimIntersection::CS_POLYLINE, "CS_POLYLINE", "Polyline" );
+    addItem( RimExtrudedCurveIntersection::CS_POLYLINE, "CS_POLYLINE", "Polyline" );
-    addItem( RimIntersection::CS_AZIMUTHLINE, "CS_AZIMUTHLINE", "Azimuth and Dip" );
+    addItem( RimExtrudedCurveIntersection::CS_AZIMUTHLINE, "CS_AZIMUTHLINE", "Azimuth and Dip" );
-    setDefault( RimIntersection::CS_WELL_PATH );
+    setDefault( RimExtrudedCurveIntersection::CS_WELL_PATH );
 }
 
 template <>
-void caf::AppEnum<RimIntersection::CrossSectionDirEnum>::setUp()
+void caf::AppEnum<RimExtrudedCurveIntersection::CrossSectionDirEnum>::setUp()
 {
-    addItem( RimIntersection::CS_VERTICAL, "CS_VERTICAL", "Vertical" );
+    addItem( RimExtrudedCurveIntersection::CS_VERTICAL, "CS_VERTICAL", "Vertical" );
-    addItem( RimIntersection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal" );
+    addItem( RimExtrudedCurveIntersection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal" );
-    addItem( RimIntersection::CS_TWO_POINTS, "CS_TWO_POINTS", "Defined by Two Points" );
+    addItem( RimExtrudedCurveIntersection::CS_TWO_POINTS, "CS_TWO_POINTS", "Defined by Two Points" );
-    setDefault( RimIntersection::CS_VERTICAL );
+    setDefault( RimExtrudedCurveIntersection::CS_VERTICAL );
 }
 
 } // namespace caf
 
-CAF_PDM_SOURCE_INIT( RimIntersection, "CrossSection" );
+CAF_PDM_SOURCE_INIT( RimExtrudedCurveIntersection, "CrossSection" );
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersection::RimIntersection()
+RimExtrudedCurveIntersection::RimExtrudedCurveIntersection()
 {
     CAF_PDM_InitObject( "Intersection", ":/CrossSection16x16.png", "", "" );
 
@@ -137,12 +137,12 @@ RimIntersection::RimIntersection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimIntersection::~RimIntersection() {}
+RimExtrudedCurveIntersection::~RimExtrudedCurveIntersection() {}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
+void RimExtrudedCurveIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
                                         const QVariant&            oldValue,
                                         const QVariant&            newValue )
 {
@@ -232,7 +232,7 @@ void RimIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
+void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
     uiOrdering.add( &m_name );
     caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup( "Intersecting Geometry" );
@@ -304,7 +304,7 @@ void RimIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+QList<caf::PdmOptionItemInfo> RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                       bool*                      useOptionsOnly )
 {
     QList<caf::PdmOptionItemInfo> options;
@@ -361,7 +361,7 @@ QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions( const caf:
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSimWellInViewCollection* RimIntersection::simulationWellCollection() const
+RimSimWellInViewCollection* RimExtrudedCurveIntersection::simulationWellCollection() const
 {
     RimEclipseView* eclipseView = nullptr;
     firstAncestorOrThisOfType( eclipseView );
@@ -377,7 +377,7 @@ RimSimWellInViewCollection* RimIntersection::simulationWellCollection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::updateAzimuthLine()
+void RimExtrudedCurveIntersection::updateAzimuthLine()
 {
     if ( m_twoAzimuthPoints().size() == 2 )
     {
@@ -399,7 +399,7 @@ void RimIntersection::updateAzimuthLine()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<std::vector<cvf::Vec3d>> RimIntersection::polyLines( cvf::Vec3d* flattenedPolylineStartPoint ) const
+std::vector<std::vector<cvf::Vec3d>> RimExtrudedCurveIntersection::polyLines( cvf::Vec3d* flattenedPolylineStartPoint ) const
 {
     if ( flattenedPolylineStartPoint ) *flattenedPolylineStartPoint = cvf::Vec3d::ZERO;
 
@@ -492,7 +492,7 @@ std::vector<std::vector<cvf::Vec3d>> RimIntersection::polyLines( cvf::Vec3d* fla
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr* RimIntersection::intersectionPartMgr()
+RivIntersectionPartMgr* RimExtrudedCurveIntersection::intersectionPartMgr()
 {
     if ( m_crossSectionPartMgr.isNull() ) m_crossSectionPartMgr = new RivIntersectionPartMgr( this );
 
@@ -502,7 +502,7 @@ RivIntersectionPartMgr* RimIntersection::intersectionPartMgr()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::rebuildGeometry()
+void RimExtrudedCurveIntersection::rebuildGeometry()
 {
     m_crossSectionPartMgr = nullptr;
 }
@@ -510,7 +510,7 @@ void RimIntersection::rebuildGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<cvf::Vec3d> RimIntersection::polyLinesForExtrusionDirection() const
+std::vector<cvf::Vec3d> RimExtrudedCurveIntersection::polyLinesForExtrusionDirection() const
 {
     return m_customExtrusionPoints;
 }
@@ -518,7 +518,7 @@ std::vector<cvf::Vec3d> RimIntersection::polyLinesForExtrusionDirection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::updateSimulationWellCenterline() const
+void RimExtrudedCurveIntersection::updateSimulationWellCenterline() const
 {
     if ( m_isActive() && type == CS_SIMULATION_WELL && simulationWell() )
     {
@@ -540,7 +540,7 @@ void RimIntersection::updateSimulationWellCenterline() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::addExtents( std::vector<cvf::Vec3d>& polyLine ) const
+void RimExtrudedCurveIntersection::addExtents( std::vector<cvf::Vec3d>& polyLine ) const
 {
     size_t lineVxCount = polyLine.size();
 
@@ -596,7 +596,7 @@ void RimIntersection::addExtents( std::vector<cvf::Vec3d>& polyLine ) const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::updateWellExtentDefaultValue()
+void RimExtrudedCurveIntersection::updateWellExtentDefaultValue()
 {
     RimCase* ownerCase = nullptr;
     firstAncestorOrThisOfType( ownerCase );
@@ -614,7 +614,7 @@ void RimIntersection::updateWellExtentDefaultValue()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::updateName()
+void RimExtrudedCurveIntersection::updateName()
 {
     if ( type == CS_SIMULATION_WELL && simulationWell() )
     {
@@ -640,7 +640,7 @@ void RimIntersection::updateName()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-int RimIntersection::branchIndex() const
+int RimExtrudedCurveIntersection::branchIndex() const
 {
     RimSimWellInViewCollection* coll = simulationWellCollection();
 
@@ -660,7 +660,7 @@ int RimIntersection::branchIndex() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::setPushButtonText( bool buttonEnable, caf::PdmUiPushButtonEditorAttribute* attribute )
+void RimExtrudedCurveIntersection::setPushButtonText( bool buttonEnable, caf::PdmUiPushButtonEditorAttribute* attribute )
 {
     if ( attribute )
     {
@@ -678,7 +678,7 @@ void RimIntersection::setPushButtonText( bool buttonEnable, caf::PdmUiPushButton
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::setBaseColor( bool enable, caf::PdmUiListEditorAttribute* attribute )
+void RimExtrudedCurveIntersection::setBaseColor( bool enable, caf::PdmUiListEditorAttribute* attribute )
 {
     if ( attribute && enable )
     {
@@ -689,7 +689,7 @@ void RimIntersection::setBaseColor( bool enable, caf::PdmUiListEditorAttribute*
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::defineEditorAttribute( const caf::PdmFieldHandle* field,
+void RimExtrudedCurveIntersection::defineEditorAttribute( const caf::PdmFieldHandle* field,
                                              QString                    uiConfigName,
                                              caf::PdmUiEditorAttribute* attribute )
 {
@@ -742,7 +742,7 @@ void RimIntersection::defineEditorAttribute( const caf::PdmFieldHandle* field,
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::appendPointToPolyLine( const cvf::Vec3d& point )
+void RimExtrudedCurveIntersection::appendPointToPolyLine( const cvf::Vec3d& point )
 {
     m_userPolyline.v().push_back( point );
 
@@ -754,7 +754,7 @@ void RimIntersection::appendPointToPolyLine( const cvf::Vec3d& point )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-Rim2dIntersectionView* RimIntersection::correspondingIntersectionView()
+Rim2dIntersectionView* RimExtrudedCurveIntersection::correspondingIntersectionView()
 {
     std::vector<Rim2dIntersectionView*> objects;
     this->objectsWithReferringPtrFieldsOfType( objects );
@@ -771,7 +771,7 @@ Rim2dIntersectionView* RimIntersection::correspondingIntersectionView()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::appendPointToExtrusionDirection( const cvf::Vec3d& point )
+void RimExtrudedCurveIntersection::appendPointToExtrusionDirection( const cvf::Vec3d& point )
 {
     if ( m_customExtrusionPoints().size() > 1 ) m_customExtrusionPoints.v().clear();
 
@@ -785,7 +785,7 @@ void RimIntersection::appendPointToExtrusionDirection( const cvf::Vec3d& point )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::appendPointToAzimuthLine( const cvf::Vec3d& point )
+void RimExtrudedCurveIntersection::appendPointToAzimuthLine( const cvf::Vec3d& point )
 {
     if ( m_twoAzimuthPoints().empty() )
     {
@@ -813,11 +813,11 @@ void RimIntersection::appendPointToAzimuthLine( const cvf::Vec3d& point )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::Vec3d RimIntersection::extrusionDirection() const
+cvf::Vec3d RimExtrudedCurveIntersection::extrusionDirection() const
 {
     cvf::Vec3d dir = cvf::Vec3d::Z_AXIS;
 
-    if ( direction() == RimIntersection::CS_HORIZONTAL )
+    if ( direction() == RimExtrudedCurveIntersection::CS_HORIZONTAL )
     {
         std::vector<std::vector<cvf::Vec3d>> lines = this->polyLines();
         if ( lines.size() > 0 && lines[0].size() > 1 )
@@ -832,7 +832,7 @@ cvf::Vec3d RimIntersection::extrusionDirection() const
             dir                    = polyLineDir ^ up;
         }
     }
-    else if ( direction() == RimIntersection::CS_TWO_POINTS && m_customExtrusionPoints().size() > 1 )
+    else if ( direction() == RimExtrudedCurveIntersection::CS_TWO_POINTS && m_customExtrusionPoints().size() > 1 )
     {
         dir = m_customExtrusionPoints()[m_customExtrusionPoints().size() - 1] - m_customExtrusionPoints()[0];
     }
@@ -854,7 +854,7 @@ cvf::Vec3d RimIntersection::extrusionDirection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-double RimIntersection::lengthUp() const
+double RimExtrudedCurveIntersection::lengthUp() const
 {
     return m_lengthUp;
 }
@@ -862,7 +862,7 @@ double RimIntersection::lengthUp() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-double RimIntersection::lengthDown() const
+double RimExtrudedCurveIntersection::lengthDown() const
 {
     return m_lengthDown;
 }
@@ -870,7 +870,7 @@ double RimIntersection::lengthDown() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::setLengthDown( double lengthDown )
+void RimExtrudedCurveIntersection::setLengthDown( double lengthDown )
 {
     m_lengthDown = lengthDown;
 }
@@ -878,7 +878,7 @@ void RimIntersection::setLengthDown( double lengthDown )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-double RimIntersection::extentLength()
+double RimExtrudedCurveIntersection::extentLength()
 {
     return m_extentLength();
 }
@@ -886,7 +886,7 @@ double RimIntersection::extentLength()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::recomputeSimulationWellBranchData()
+void RimExtrudedCurveIntersection::recomputeSimulationWellBranchData()
 {
     if ( type() == CS_SIMULATION_WELL )
     {
@@ -900,7 +900,7 @@ void RimIntersection::recomputeSimulationWellBranchData()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RimIntersection::hasDefiningPoints() const
+bool RimExtrudedCurveIntersection::hasDefiningPoints() const
 {
     return type == CS_POLYLINE || type == CS_AZIMUTHLINE;
 }
@@ -908,7 +908,7 @@ bool RimIntersection::hasDefiningPoints() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::setLengthUp( double lengthUp )
+void RimExtrudedCurveIntersection::setLengthUp( double lengthUp )
 {
     m_lengthUp = lengthUp;
 }
@@ -916,7 +916,7 @@ void RimIntersection::setLengthUp( double lengthUp )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
+void RimExtrudedCurveIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
 {
     m_crossSectionPartMgr = nullptr;
 
@@ -938,7 +938,7 @@ void RimIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-double RimIntersection::azimuthInRadians( cvf::Vec3d vec )
+double RimExtrudedCurveIntersection::azimuthInRadians( cvf::Vec3d vec )
 {
     return cvf::GeometryTools::getAngle( -cvf::Vec3d::Z_AXIS, cvf::Vec3d::Y_AXIS, vec );
 }

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h

@@ -47,7 +47,7 @@ class PdmUiPushButtonEditorAttribute;
 //
 //
 //==================================================================================================
-class RimIntersection : public RimIntersectionHandle
+class RimExtrudedCurveIntersection : public RimIntersectionHandle
 {
     CAF_PDM_HEADER_INIT;
 
@@ -68,8 +68,8 @@ public:
     };
 
 public:
-    RimIntersection();
+    RimExtrudedCurveIntersection();
-    ~RimIntersection() override;
+    ~RimExtrudedCurveIntersection() override;
 
     caf::PdmField<caf::AppEnum<CrossSectionEnum>>    type;
     caf::PdmField<caf::AppEnum<CrossSectionDirEnum>> direction;

ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -23,7 +23,7 @@
 #include "Rim2dIntersectionViewCollection.h"
 #include "Rim3dView.h"
 #include "RimCase.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimSimWellInView.h"
 
@@ -77,7 +77,7 @@ void RimIntersectionCollection::applySingleColorEffect()
 {
     if ( !this->isActive() ) return;
 
-    for ( RimIntersection* cs : m_intersections )
+    for ( RimExtrudedCurveIntersection* cs : m_intersections )
     {
         if ( cs->isActive() )
         {
@@ -101,7 +101,7 @@ void RimIntersectionCollection::updateCellResultColor( size_t timeStepIndex )
 {
     if ( !this->isActive() ) return;
 
-    for ( RimIntersection* cs : m_intersections )
+    for ( RimExtrudedCurveIntersection* cs : m_intersections )
     {
         if ( cs->isActive() )
         {
@@ -127,7 +127,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView&           view,
 {
     if ( !isActive() ) return;
 
-    for ( RimIntersection* cs : m_intersections )
+    for ( RimExtrudedCurveIntersection* cs : m_intersections )
     {
         if ( cs->isActive() )
         {
@@ -159,7 +159,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView&           view,
 //--------------------------------------------------------------------------------------------------
 void RimIntersectionCollection::rebuildGeometry()
 {
-    for ( RimIntersection* intersection : m_intersections )
+    for ( RimExtrudedCurveIntersection* intersection : m_intersections )
     {
         intersection->rebuildGeometry();
     }
@@ -173,7 +173,7 @@ void RimIntersectionCollection::rebuildGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimIntersection*> RimIntersectionCollection::intersections() const
+std::vector<RimExtrudedCurveIntersection*> RimIntersectionCollection::intersections() const
 {
     return m_intersections.childObjects();
 }
@@ -200,7 +200,7 @@ void RimIntersectionCollection::recomputeSimWellBranchData()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersectionCollection::appendIntersectionAndUpdate( RimIntersection* intersection, bool allowActiveViewChange )
+void RimIntersectionCollection::appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange )
 {
     m_intersections.push_back( intersection );
 
@@ -220,7 +220,7 @@ void RimIntersectionCollection::appendIntersectionAndUpdate( RimIntersection* in
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersectionCollection::appendIntersectionNoUpdate( RimIntersection* intersection )
+void RimIntersectionCollection::appendIntersectionNoUpdate( RimExtrudedCurveIntersection* intersection )
 {
     m_intersections.push_back( intersection );
 }
@@ -240,7 +240,7 @@ void RimIntersectionCollection::syncronize2dIntersectionViews()
 //--------------------------------------------------------------------------------------------------
 void RimIntersectionCollection::scheduleCreateDisplayModelAndRedraw2dIntersectionViews()
 {
-    for ( RimIntersection* isection : m_intersections )
+    for ( RimExtrudedCurveIntersection* isection : m_intersections )
     {
         if ( isection->correspondingIntersectionView() )
         {
@@ -302,9 +302,9 @@ bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell( const Ri
 {
     if ( !isActive() ) return false;
 
-    for ( RimIntersection* cs : m_intersections )
+    for ( RimExtrudedCurveIntersection* cs : m_intersections )
     {
-        if ( cs->isActive() && cs->type() == RimIntersection::CS_SIMULATION_WELL && cs->simulationWell() == simWell )
+        if ( cs->isActive() && cs->type() == RimExtrudedCurveIntersection::CS_SIMULATION_WELL && cs->simulationWell() == simWell )
         {
             return true;
         }

ApplicationCode/ProjectDataModel/RimIntersectionCollection.h

@@ -24,7 +24,7 @@
 #include "cafPdmObject.h"
 
 class Rim3dView;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class RimIntersectionBox;
 class RimEclipseCellColors;
 class RimSimWellInView;
@@ -52,8 +52,8 @@ public:
 
     caf::PdmField<bool> isActive;
 
-    void appendIntersectionAndUpdate( RimIntersection* intersection, bool allowActiveViewChange = true );
+    void appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange = true );
-    void appendIntersectionNoUpdate( RimIntersection* intersection );
+    void appendIntersectionNoUpdate( RimExtrudedCurveIntersection* intersection );
 
     void appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox );
     void appendIntersectionBoxNoUpdate( RimIntersectionBox* intersectionBox );
@@ -73,7 +73,7 @@ public:
     void appendPartsToModel( Rim3dView& view, cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
     void rebuildGeometry();
 
-    std::vector<RimIntersection*>    intersections() const;
+    std::vector<RimExtrudedCurveIntersection*>    intersections() const;
     std::vector<RimIntersectionBox*> intersectionBoxes() const;
 
 protected:
@@ -83,6 +83,6 @@ protected:
     caf::PdmFieldHandle* objectToggleField() override;
 
 private:
-    caf::PdmChildArrayField<RimIntersection*>    m_intersections;
+    caf::PdmChildArrayField<RimExtrudedCurveIntersection*>    m_intersections;
     caf::PdmChildArrayField<RimIntersectionBox*> m_intersectionBoxes;
 };

ApplicationCode/ProjectDataModel/RimIntersectionResultDefinition.cpp

@@ -25,7 +25,7 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGridView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
@@ -287,7 +287,7 @@ void RimIntersectionResultDefinition::update2dIntersectionViews()
 {
     // Update 2D Intersection views
 
-    std::vector<RimIntersection*> intersections;
+    std::vector<RimExtrudedCurveIntersection*> intersections;
     this->objectsWithReferringPtrFieldsOfType( intersections );
 
     for ( auto intersection : intersections )

ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp

@@ -25,7 +25,7 @@
 
 #include "RiaCompletionTypeCalculationScheduler.h"
 #include "RifTextDataTableFormatter.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimPlotCurve.h"
 #include "RimWellPath.h"
 #include "RimWellPathFracture.h"
@@ -83,7 +83,7 @@ void RimModeledWellPath::updateWellPathVisualization()
         fracture->loadDataAndUpdate();
     }
 
-    std::vector<RimIntersection*> refferingIntersections;
+    std::vector<RimExtrudedCurveIntersection*> refferingIntersections;
     this->objectsWithReferringPtrFieldsOfType( refferingIntersections );
 
     for ( auto intersection : refferingIntersections )

ApplicationCode/ProjectDataModel/RimSimWellInView.cpp

@@ -31,7 +31,7 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimPropertyFilterCollection.h"
 #include "RimSimWellFracture.h"

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -39,7 +39,7 @@
 #include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimProject.h"
 #include "RimSimWellInViewCollection.h"
 #include "RimViewLinker.h"

ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp

@@ -32,7 +32,7 @@
 #include "Rim3dView.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 //#include "cvfTrace.h"
 

ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp

@@ -31,7 +31,7 @@
 #include "Rim3dView.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 
 //#include "cvfTrace.h"
 

ApplicationCode/UserInterface/RiuResultTextBuilder.cpp

@@ -34,7 +34,7 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
 #include "RimFormationNames.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimReservoirCellResultsStorage.h"
 

ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp

@@ -36,7 +36,7 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimProject.h"
 
 #include "Riu3dSelectionManager.h"

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -57,7 +57,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimGeoMechView.h"
-#include "RimIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimLegendConfig.h"

ApplicationCode/UserInterface/RiuViewerCommands.h

@@ -29,7 +29,7 @@ class RicDefaultPickEventHandler;
 class Ric3dViewPickEventHandler;
 class RimEclipseView;
 class RimGeoMechView;
-class RimIntersection;
+class RimExtrudedCurveIntersection;
 class Rim3dView;
 class RiuViewer;
 class RivIntersectionBoxSourceInfo;