diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp index 4391a2a9b2..368c9007e4 100644 --- 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 ); diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp index d43a101734..9674d2e0ae 100644 --- 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 selectedIntersections(); +static std::vector selectedIntersections(); static std::vector selectedIntersectionBoxes(); static SelectionComposition selectionComposition(); static RimCase* commonGridCase( std::vector selectedItems ); @@ -83,7 +83,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::onActionTriggered( bool isChec copyIntersectionBoxesToOtherViews( *gridCase, coll->intersectionBoxes() ); } - std::vector selIntersections = selectedIntersections(); + std::vector selIntersections = selectedIntersections(); std::vector 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 intersections ) + std::vector 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( + RimExtrudedCurveIntersection* copy = dynamic_cast( intersection->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); CVF_ASSERT( copy ); @@ -179,9 +179,9 @@ RimIntersectionCollection* selectedIntersectionCollection() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector selectedIntersections() +std::vector selectedIntersections() { - return caf::selectedObjectsByType(); + return caf::selectedObjectsByType(); } //-------------------------------------------------------------------------------------------------- @@ -204,7 +204,7 @@ SelectionComposition selectionComposition() if ( gridCase && gridCase->gridViews().size() > 1 ) { RimIntersectionCollection* selColl = selectedIntersectionCollection(); - std::vector selIntersections = selectedIntersections(); + std::vector selIntersections = selectedIntersections(); std::vector selIntersectionBoxes = selectedIntersectionBoxes(); if ( selColl ) diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.h b/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.h index 8edbe2f828..aae8b75c58 100644 --- 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 intersections ); + void copyIntersectionsToOtherViews( RimCase& gridCase, std::vector intersections ); void copyIntersectionBoxesToOtherViews( RimCase& gridCase, std::vector intersectionBoxes ); }; diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp index 4bacece25b..53c0b5d9fb 100644 --- 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; diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp index 7682be9c44..29c5e9b64c 100644 --- 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 ); diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp index 92fda7cef7..666e75a801 100644 --- 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 ); diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp index d81b0f79c3..7feaf80588 100644 --- 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 ); diff --git a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp b/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp index ad0385a416..bcf505c861 100644 --- 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 objects = selectedIntersections(); + std::set objects = selectedIntersections(); return !objects.empty(); } @@ -50,7 +50,7 @@ bool RicNewIntersectionViewFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicNewIntersectionViewFeature::onActionTriggered( bool isChecked ) { - std::set intersections = selectedIntersections(); + std::set 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 RicNewIntersectionViewFeature::selectedIntersections() +std::set RicNewIntersectionViewFeature::selectedIntersections() { - std::set objects; + std::set objects; Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance(); RiuSelectionItem* selItem = riuSelManager->selectedItem( Riu3dSelectionManager::RUI_TEMPORARY ); @@ -111,7 +111,7 @@ std::set RicNewIntersectionViewFeature::selectedIntersections( RiuGeneralSelectionItem* generalSelectionItem = static_cast( selItem ); if ( generalSelectionItem ) { - RimIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); + RimExtrudedCurveIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); if ( intersection ) { objects.insert( intersection ); @@ -123,7 +123,7 @@ std::set RicNewIntersectionViewFeature::selectedIntersections( } { - std::vector selectedObjects = caf::selectedObjectsByType(); + std::vector selectedObjects = caf::selectedObjectsByType(); for ( auto obj : selectedObjects ) { objects.insert( obj ); diff --git a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h b/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h index 38a08a690d..b2ca78e288 100644 --- a/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h +++ b/ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.h @@ -22,7 +22,7 @@ #include -class RimIntersection; +class RimExtrudedCurveIntersection; //================================================================================================== /// @@ -37,5 +37,5 @@ protected: void setupActionLook( QAction* actionToSetup ) override; private: - static std::set selectedIntersections(); + static std::set selectedIntersections(); }; diff --git a/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp b/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp index b51f3d7d4b..697f4e5108 100644 --- 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" diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp index 815d7f2f80..cc00caf58e 100644 --- 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( pdmObject ) ) + else if ( dynamic_cast( pdmObject ) ) { return true; } diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp b/ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp index 70a22b75d1..28446c1740 100644 --- 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> intersectionObjects; + std::vector> intersectionObjects; objectGroup.objectsByType( &intersectionObjects ); std::vector> intersectionBoxObjects; @@ -81,12 +81,12 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked ) if ( objectGroup.objects.size() == 0 ) return; - std::vector> intersectionObjects; + std::vector> intersectionObjects; objectGroup.objectsByType( &intersectionObjects ); for ( size_t i = 0; i < intersectionObjects.size(); i++ ) { - RimIntersection* intersection = dynamic_cast( + RimExtrudedCurveIntersection* intersection = dynamic_cast( 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( objectHandle ); + RimExtrudedCurveIntersection* intersection = dynamic_cast( objectHandle ); if ( intersection ) { intersection->firstAncestorOrThisOfType( intersectionCollection ); diff --git a/ApplicationCode/Commands/RicDeleteItemFeature.cpp b/ApplicationCode/Commands/RicDeleteItemFeature.cpp index 4df62dd07e..61008e542c 100644 --- 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( uiItem ) ) return true; if ( dynamic_cast( uiItem ) ) return true; - if ( dynamic_cast( uiItem ) ) return true; + if ( dynamic_cast( uiItem ) ) return true; if ( dynamic_cast( uiItem ) ) return true; if ( dynamic_cast( uiItem ) ) return true; if ( dynamic_cast( uiItem ) ) return true; diff --git a/ApplicationCode/Commands/RicHideIntersectionFeature.cpp b/ApplicationCode/Commands/RicHideIntersectionFeature.cpp index 77aa94c2de..5615f6f1c2 100644 --- 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( selItem ); if ( !generalSelectionItem ) return false; - RimIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); + RimExtrudedCurveIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); if ( intersection ) { return true; @@ -65,7 +65,7 @@ void RicHideIntersectionFeature::onActionTriggered( bool isChecked ) RiuGeneralSelectionItem* generalSelectionItem = static_cast( selItem ); if ( !generalSelectionItem ) return; - RimIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); + RimExtrudedCurveIntersection* intersection = dynamic_cast( generalSelectionItem->m_object ); if ( intersection ) { intersection->setActive( false ); diff --git a/ApplicationCode/Commands/RicSelectColorResult.cpp b/ApplicationCode/Commands/RicSelectColorResult.cpp index 6c7773e4b4..21633e0ba3 100644 --- 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" diff --git a/ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp b/ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp index 8cb36013b0..418f6e98f1 100644 --- 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 selection; + std::vector selection; caf::SelectionManager::instance()->objectsByType( &selection ); if ( selection.size() == 1 ) { { - RimIntersection* intersection = selection[0]; + RimExtrudedCurveIntersection* intersection = selection[0]; RimGridView* gridView = nullptr; intersection->firstAncestorOrThisOfTypeAsserted( gridView ); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp index bdd35c6ef2..8c7a57a26f 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp +++ b/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 displayCoordTransform( const RimIntersection* intersection ) +cvf::ref displayCoordTransform( const RimExtrudedCurveIntersection* intersection ) { Rim3dView* rimView = nullptr; intersection->firstAncestorOrThisOfType( rimView ); @@ -58,7 +58,7 @@ cvf::ref 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>& 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; } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h index 15564dc3b8..1ee7ee26be 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h +++ b/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>& 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 m_hexGrid; const std::vector> m_polyLines; cvf::Vec3d m_extrusionDirection; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 5131120b7a..226246853b 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp +++ b/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 || - m_rimCrossSection->type == RimIntersection::CS_AZIMUTHLINE ) + if ( m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_POLYLINE || + m_rimCrossSection->type == RimExtrudedCurveIntersection::CS_AZIMUTHLINE ) { { cvf::ref 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 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(); } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h index f53a136961..56c5ccb4c9 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h +++ b/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 m_rimCrossSection; + caf::PdmPointer m_rimCrossSection; cvf::ref m_crossSectionGenerator; diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp index 7906d36dbe..7d7b5e8e9e 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp @@ -56,7 +56,7 @@ std::array RivIntersectionSourceInfo::triangle( int triangleIdx ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimIntersection* RivIntersectionSourceInfo::crossSection() const +RimExtrudedCurveIntersection* RivIntersectionSourceInfo::crossSection() const { return m_crossSectionGeometryGenerator->crossSection(); } diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h index 81a4bc1d7d..7ee45403c2 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h @@ -24,7 +24,7 @@ #include class RivIntersectionGeometryGenerator; -class RimIntersection; +class RimExtrudedCurveIntersection; class RivIntersectionSourceInfo : public cvf::Object { @@ -33,7 +33,7 @@ public: const std::vector& triangleToCellIndex() const; std::array triangle( int triangleIdx ) const; - RimIntersection* crossSection() const; + RimExtrudedCurveIntersection* crossSection() const; private: cvf::cref m_crossSectionGeometryGenerator; diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index cc64bf80c1..1919767031 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/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 diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp index 6b8dfac02e..02840986b3 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/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 ); diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h index 83ceb7c7ad..3e205318a9 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h +++ b/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 ); - RimIntersection* intersection() const; + void setIntersection( RimExtrudedCurveIntersection* intersection ); + RimExtrudedCurveIntersection* intersection() const; bool isUsingFormationNames() const override; void scheduleGeometryRegen( RivCellSetEnum geometryType ) override; @@ -117,7 +117,7 @@ private: caf::PdmChildField m_legendConfig; caf::PdmChildField m_ternaryLegendConfig; - caf::PdmPtrField m_intersection; + caf::PdmPtrField m_intersection; cvf::ref m_flatIntersectionPartMgr; cvf::ref m_flatSimWellPipePartMgr; diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp index d3f92ec2b1..56e29c08d7 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp +++ b/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 allOrderedIntersectionsInCase; + std::vector allOrderedIntersectionsInCase; parentCase->descendantsIncludingThisOfType( allOrderedIntersectionsInCase ); - std::set currentIntersections( allOrderedIntersectionsInCase.begin(), + std::set 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 intersectionToViewMap; + std::map 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() ) diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp index a39aefdb61..6992384c4a 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.cpp +++ b/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" ); diff --git a/ApplicationCode/ProjectDataModel/RimCase.h b/ApplicationCode/ProjectDataModel/RimCase.h index 0ba4f03854..43e98a1839 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.h +++ b/ApplicationCode/ProjectDataModel/RimCase.h @@ -34,7 +34,7 @@ class RimGridView; class RimFormationNames; class RimTimeStepFilter; class Rim2dIntersectionView; -class RimIntersection; +class RimExtrudedCurveIntersection; class Rim2dIntersectionViewCollection; namespace cvf diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index b0cad9a0db..5b25c7811a 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/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( uiItem ) ) + else if ( dynamic_cast( uiItem ) ) { menuBuilder << "RicPasteIntersectionsFeature"; menuBuilder.addSeparator(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 07fe6da384..12cd686276 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/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 intersections = m_crossSectionCollection->intersections(); + std::vector intersections = m_crossSectionCollection->intersections(); for ( auto intersection : intersections ) { if ( intersection && intersection->correspondingIntersectionView() ) diff --git a/ApplicationCode/ProjectDataModel/RimIntersection.cpp b/ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp similarity index 89% rename from ApplicationCode/ProjectDataModel/RimIntersection.cpp rename to ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp index 39d8abfa38..c91bd0ed27 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersection.cpp +++ b/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::setUp() +void caf::AppEnum::setUp() { - addItem( RimIntersection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path" ); - addItem( RimIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well" ); - addItem( RimIntersection::CS_POLYLINE, "CS_POLYLINE", "Polyline" ); - addItem( RimIntersection::CS_AZIMUTHLINE, "CS_AZIMUTHLINE", "Azimuth and Dip" ); - setDefault( RimIntersection::CS_WELL_PATH ); + addItem( RimExtrudedCurveIntersection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path" ); + addItem( RimExtrudedCurveIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well" ); + addItem( RimExtrudedCurveIntersection::CS_POLYLINE, "CS_POLYLINE", "Polyline" ); + addItem( RimExtrudedCurveIntersection::CS_AZIMUTHLINE, "CS_AZIMUTHLINE", "Azimuth and Dip" ); + setDefault( RimExtrudedCurveIntersection::CS_WELL_PATH ); } template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - addItem( RimIntersection::CS_VERTICAL, "CS_VERTICAL", "Vertical" ); - addItem( RimIntersection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal" ); - addItem( RimIntersection::CS_TWO_POINTS, "CS_TWO_POINTS", "Defined by Two Points" ); - setDefault( RimIntersection::CS_VERTICAL ); + addItem( RimExtrudedCurveIntersection::CS_VERTICAL, "CS_VERTICAL", "Vertical" ); + addItem( RimExtrudedCurveIntersection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal" ); + addItem( RimExtrudedCurveIntersection::CS_TWO_POINTS, "CS_TWO_POINTS", "Defined by Two Points" ); + 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 RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, +QList RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) { QList options; @@ -361,7 +361,7 @@ QList 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> RimIntersection::polyLines( cvf::Vec3d* flattenedPolylineStartPoint ) const +std::vector> RimExtrudedCurveIntersection::polyLines( cvf::Vec3d* flattenedPolylineStartPoint ) const { if ( flattenedPolylineStartPoint ) *flattenedPolylineStartPoint = cvf::Vec3d::ZERO; @@ -492,7 +492,7 @@ std::vector> 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 RimIntersection::polyLinesForExtrusionDirection() const +std::vector RimExtrudedCurveIntersection::polyLinesForExtrusionDirection() const { return m_customExtrusionPoints; } @@ -518,7 +518,7 @@ std::vector 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& polyLine ) const +void RimExtrudedCurveIntersection::addExtents( std::vector& polyLine ) const { size_t lineVxCount = polyLine.size(); @@ -596,7 +596,7 @@ void RimIntersection::addExtents( std::vector& 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 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> 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 ); } diff --git a/ApplicationCode/ProjectDataModel/RimIntersection.h b/ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h similarity index 97% rename from ApplicationCode/ProjectDataModel/RimIntersection.h rename to ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h index 9313f3cdfd..bd322851ed 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersection.h +++ b/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(); - ~RimIntersection() override; + RimExtrudedCurveIntersection(); + ~RimExtrudedCurveIntersection() override; caf::PdmField> type; caf::PdmField> direction; diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp b/ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp index 7cb98c8d59..d2d8bbb03b 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp +++ b/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 RimIntersectionCollection::intersections() const +std::vector 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; } diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionCollection.h b/ApplicationCode/ProjectDataModel/RimIntersectionCollection.h index 6d4bd1765b..371535c9e0 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionCollection.h +++ b/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 isActive; - void appendIntersectionAndUpdate( RimIntersection* intersection, bool allowActiveViewChange = true ); - void appendIntersectionNoUpdate( RimIntersection* intersection ); + void appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange = true ); + 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 intersections() const; + std::vector intersections() const; std::vector intersectionBoxes() const; protected: @@ -83,6 +83,6 @@ protected: caf::PdmFieldHandle* objectToggleField() override; private: - caf::PdmChildArrayField m_intersections; + caf::PdmChildArrayField m_intersections; caf::PdmChildArrayField m_intersectionBoxes; }; diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimIntersectionResultDefinition.cpp index 00336dc753..dc48989547 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionResultDefinition.cpp +++ b/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 intersections; + std::vector intersections; this->objectsWithReferringPtrFieldsOfType( intersections ); for ( auto intersection : intersections ) diff --git a/ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp b/ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp index c765564a02..48b2f338cc 100644 --- a/ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp +++ b/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 refferingIntersections; + std::vector refferingIntersections; this->objectsWithReferringPtrFieldsOfType( refferingIntersections ); for ( auto intersection : refferingIntersections ) diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp index 1b3f80635d..d2efb91512 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index 8705c65ce4..7fce944adc 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp index 711bafe254..20710bdbc2 100644 --- a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp index 22b1587175..4aad4410b4 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index 4ab6eb99ab..a5de76332e 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index e32fa9e576..8388f5346c 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 382bbd952c..73a349bd65 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/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" diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.h b/ApplicationCode/UserInterface/RiuViewerCommands.h index ac250fa4aa..d511d3b54c 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.h +++ b/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;