Rename RimIntersection to RimExtrudedCurveIntersection

2025-02-25 18:55:39 -06:00 · 2019-11-26 11:35:21 +01:00
parent bf8ed71641
commit 152d2bde17
44 changed files with 176 additions and 176 deletions
--- a/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp
+++ b/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 );

--- a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
+++ b/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 )
--- a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.h
+++ b/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 );
 };
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
+++ b/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;
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h
+++ b/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();
 };
--- a/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
+++ b/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"

--- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp
+++ b/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;
    }
--- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/RicDeleteItemFeature.cpp
+++ b/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;
--- a/ApplicationCode/Commands/RicHideIntersectionFeature.cpp
+++ b/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 );
--- a/ApplicationCode/Commands/RicSelectColorResult.cpp
+++ b/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"

--- a/ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp
+++ b/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 );