#815 Renamed RimCrossSection -> RimIntersection

ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp

@@ -19,7 +19,7 @@
 
 #include "RicAppendCrossSectionFeature.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 
 #include "cafCmdExecCommandManager.h"
@@ -97,7 +97,7 @@ void RicAppendCrossSectionFeatureCmd::redo()
 {
     CVF_ASSERT(m_crossSectionCollection);
 
-    RimCrossSection* crossSection = new RimCrossSection();
+    RimIntersection* crossSection = new RimIntersection();
     crossSection->name = QString("Intersection");
     m_crossSectionCollection->appendCrossSection(crossSection);
 }

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp

@@ -22,7 +22,7 @@
 #include "RiaApplication.h"
 
 #include "RimCase.h"
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 #include "RimView.h"
 
@@ -80,7 +80,7 @@ void RicNewPolylineCrossSectionFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
 {
-    std::vector<RimCrossSection*> selection;
+    std::vector<RimIntersection*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
 
     if (selection.size() == 1)
@@ -88,7 +88,7 @@ bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
         RicViewerEventObject* polylineUiEvent = dynamic_cast<RicViewerEventObject*>(eventObject);
         if (polylineUiEvent)
         {
-            RimCrossSection* crossSection = selection[0];
+            RimIntersection* crossSection = selection[0];
             if (crossSection->inputFromViewerEnabled())
             {
                 RimCase* rimCase = NULL;
@@ -137,9 +137,9 @@ void RicNewPolylineCrossSectionFeatureCmd::redo()
 {
     CVF_ASSERT(m_crossSectionCollection);
 
-    RimCrossSection* crossSection = new RimCrossSection();
+    RimIntersection* crossSection = new RimIntersection();
     crossSection->name = "Polyline";
-    crossSection->type = RimCrossSection::CS_POLYLINE;
+    crossSection->type = RimIntersection::CS_POLYLINE;
     crossSection->inputFromViewerEnabled = true;
 
     m_crossSectionCollection->appendCrossSection(crossSection);

ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellCrossSectionFeature.cpp

@@ -19,7 +19,7 @@
 
 #include "RicNewSimWellCrossSectionFeature.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 #include "RimEclipseView.h"
 #include "RimEclipseWell.h"
@@ -102,9 +102,9 @@ void RicNewSimWellCrossSectionCmd::redo()
     CVF_ASSERT(m_crossSectionCollection);
     CVF_ASSERT(m_wellPath);
 
-    RimCrossSection* crossSection = new RimCrossSection();
+    RimIntersection* crossSection = new RimIntersection();
     crossSection->name = m_wellPath->name;
-    crossSection->type = RimCrossSection::CS_SIMULATION_WELL;
+    crossSection->type = RimIntersection::CS_SIMULATION_WELL;
     crossSection->simulationWell = m_wellPath;
 
     m_crossSectionCollection->appendCrossSection(crossSection);

ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp

@@ -21,7 +21,7 @@
 
 #include "RiaApplication.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 #include "RimWellPath.h"
 #include "RimView.h"
@@ -111,9 +111,9 @@ void RicNewWellPathCrossSectionFeatureCmd::redo()
     CVF_ASSERT(m_crossSectionCollection);
     CVF_ASSERT(m_wellPath);
 
-    RimCrossSection* crossSection = new RimCrossSection();
+    RimIntersection* crossSection = new RimIntersection();
     crossSection->name = m_wellPath->name;
-    crossSection->type = RimCrossSection::CS_WELL_PATH;
+    crossSection->type = RimIntersection::CS_WELL_PATH;
     crossSection->wellPath = m_wellPath;
 
     m_crossSectionCollection->appendCrossSection(crossSection);

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp

@@ -22,7 +22,7 @@
 #include "RigMainGrid.h"
 #include "RigResultAccessor.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 
 #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
 
@@ -35,7 +35,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator(const RimCrossSection* crossSection,
+RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator(const RimIntersection* crossSection,
                                                                     std::vector<std::vector<cvf::Vec3d> > &polylines, 
                                                                     const cvf::Vec3d& extrusionDirection, 
                                                                     const RivIntersectionHexGridInterface* grid)
@@ -365,7 +365,7 @@ const std::vector<RivIntersectionVertexWeights>& RivIntersectionGeometryGenerato
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RimCrossSection* RivIntersectionGeometryGenerator::crossSection() const
+const RimIntersection* RivIntersectionGeometryGenerator::crossSection() const
 {
     return m_crossSection;
 }

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h

@@ -34,7 +34,7 @@
 class RigMainGrid;
 class RigActiveCellInfo;
 class RigResultAccessor;
-class RimCrossSection;
+class RimIntersection;
 
 namespace cvf
 {
@@ -46,7 +46,7 @@ namespace cvf
 class RivIntersectionGeometryGenerator : public cvf::Object
 {
 public:
-    RivIntersectionGeometryGenerator(const RimCrossSection* crossSection,
+    RivIntersectionGeometryGenerator(const RimIntersection* crossSection,
                                      std::vector<std::vector<cvf::Vec3d> > &polylines, 
                                      const cvf::Vec3d& extrusionDirection, 
                                      const RivIntersectionHexGridInterface* grid );
@@ -65,7 +65,7 @@ public:
     const std::vector<size_t>&           triangleToCellIndex() const;
     const std::vector<RivIntersectionVertexWeights>& triangleVxToCellCornerInterpolationWeights() const;
 
-    const RimCrossSection* crossSection() const;
+    const RimIntersection* crossSection() const;
 
 private:
     void                        calculateArrays();
@@ -83,6 +83,6 @@ private:
     std::vector<size_t>         m_triangleToCellIdxMap;
     std::vector<RivIntersectionVertexWeights> m_triVxToCellCornerWeights;
 
-    const RimCrossSection*      m_crossSection;
+    const RimIntersection*      m_crossSection;
 };
 

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp

@@ -27,7 +27,7 @@
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
@@ -55,7 +55,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr::RivIntersectionPartMgr(const RimCrossSection* rimCrossSection)
+RivIntersectionPartMgr::RivIntersectionPartMgr(const RimIntersection* rimCrossSection)
     : m_rimCrossSection(rimCrossSection),
     m_defaultColor(cvf::Color3::WHITE)
 {
@@ -338,7 +338,7 @@ void RivIntersectionPartMgr::generatePartGeometry()
     m_highlightLineAlongPolyline = NULL;
     m_highlightPointsForPolyline = NULL;
 
-    if (m_rimCrossSection->type == RimCrossSection::CS_POLYLINE)
+    if (m_rimCrossSection->type == RimIntersection::CS_POLYLINE)
     {
         {
             cvf::ref<cvf::DrawableGeo> polylineGeo = m_crossSectionGenerator->createLineAlongPolylineDrawable();
@@ -546,7 +546,7 @@ cvf::Vec3d RivIntersectionPartMgr::extrusionDirection(const std::vector<cvf::Vec
 
     cvf::Vec3d dir = cvf::Vec3d::Z_AXIS;
 
-    if (m_rimCrossSection->direction == RimCrossSection::CS_HORIZONTAL &&
+    if (m_rimCrossSection->direction == RimIntersection::CS_HORIZONTAL &&
         polyline.size() > 1)
     {
         // Use first and last point of polyline to approximate orientation of polyline

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h

@@ -37,7 +37,7 @@ namespace cvf
 class RigMainGrid;
 class RimEclipseCellColors;
 class RimCellEdgeColors;
-class RimCrossSection;
+class RimIntersection;
 
 //==================================================================================================
 ///
@@ -47,7 +47,7 @@ class RimCrossSection;
 class RivIntersectionPartMgr : public cvf::Object
 {
 public:
-    RivIntersectionPartMgr(const RimCrossSection* rimCrossSection);
+    RivIntersectionPartMgr(const RimIntersection* rimCrossSection);
 
     void applySingleColorEffect();
     void updateCellResultColor(size_t timeStepIndex);
@@ -76,7 +76,7 @@ private:
     cvf::ref<RivIntersectionHexGridInterface> createHexGridInterface();
 private:
 
-    const RimCrossSection*      m_rimCrossSection;
+    const RimIntersection*      m_rimCrossSection;
 
     cvf::Color3f                m_defaultColor;
 

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp

@@ -44,7 +44,7 @@ const std::vector<size_t>& RivIntersectionSourceInfo::triangleToCellIndex() cons
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RimCrossSection* RivIntersectionSourceInfo::crossSection() const
+const RimIntersection* RivIntersectionSourceInfo::crossSection() const
 {
     return m_crossSectionGeometryGenerator->crossSection();
 }

ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h

@@ -24,7 +24,7 @@
 #include "cvfArray.h"
 
 class RivIntersectionGeometryGenerator;
-class RimCrossSection;
+class RimIntersection;
 
 class RivIntersectionSourceInfo : public cvf::Object
 {
@@ -33,7 +33,7 @@ public:
 
     const std::vector<size_t>& triangleToCellIndex() const;
 
-    const RimCrossSection* crossSection() const;
+    const RimIntersection* crossSection() const;
 
 private:
     cvf::cref<RivIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -75,7 +75,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogFile.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h
-${CEE_CURRENT_LIST_DIR}RimCrossSection.h
+${CEE_CURRENT_LIST_DIR}RimIntersection.h
 ${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.h
 ${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.h
 ${CEE_CURRENT_LIST_DIR}RimGridCollection.h
@@ -166,7 +166,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp
-${CEE_CURRENT_LIST_DIR}RimCrossSection.cpp
+${CEE_CURRENT_LIST_DIR}RimIntersection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.cpp
 ${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -23,7 +23,7 @@
 #include "RimCaseCollection.h"
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCaseCollection.h"
@@ -303,7 +303,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         {
             commandIds << "RicAppendCrossSectionFeature";
         }
-        else if (dynamic_cast<RimCrossSection*>(uiItem))
+        else if (dynamic_cast<RimIntersection*>(uiItem))
         {
             commandIds << "RicAppendCrossSectionFeature";
             commandIds << "Separator";

ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp

@@ -19,7 +19,7 @@
 
 #include "RimCrossSectionCollection.h"
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimEclipseWell.h"
 #include "RimView.h"
 
@@ -67,7 +67,7 @@ void RimCrossSectionCollection::applySingleColorEffect()
 {
     for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
     {
-        RimCrossSection* cs = m_crossSections[csIdx];
+        RimIntersection* cs = m_crossSections[csIdx];
         if (cs->isActive)
         {
             cs->crossSectionPartMgr()->applySingleColorEffect();
@@ -82,7 +82,7 @@ void RimCrossSectionCollection::updateCellResultColor(size_t timeStepIndex)
 {
     for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
     {
-        RimCrossSection* cs = m_crossSections[csIdx];
+        RimIntersection* cs = m_crossSections[csIdx];
         if (cs->isActive)
         {
             cs->crossSectionPartMgr()->updateCellResultColor(timeStepIndex);
@@ -99,7 +99,7 @@ void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, c
 
     for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
     {
-        RimCrossSection* cs = m_crossSections[csIdx];
+        RimIntersection* cs = m_crossSections[csIdx];
         if (cs->isActive)
         {
             cs->crossSectionPartMgr()->appendNativeCrossSectionFacesToModel(model, scaleTransform);
@@ -116,7 +116,7 @@ void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, c
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSectionCollection::appendCrossSection(RimCrossSection* crossSection)
+void RimCrossSectionCollection::appendCrossSection(RimIntersection* crossSection)
 {
     m_crossSections.push_back(crossSection);
 
@@ -156,10 +156,10 @@ bool RimCrossSectionCollection::hasActiveCrossSectionForSimulationWell(RimEclips
 
     for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
     {
-        RimCrossSection* cs = m_crossSections[csIdx];
+        RimIntersection* cs = m_crossSections[csIdx];
 
         if (cs->isActive &&
-            cs->type() == RimCrossSection::CS_SIMULATION_WELL &&
+            cs->type() == RimIntersection::CS_SIMULATION_WELL &&
             cs->simulationWell() == eclipseWell)
         {
             return true;

ApplicationCode/ProjectDataModel/RimCrossSectionCollection.h

@@ -23,7 +23,7 @@
 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
 
-class RimCrossSection;
+class RimIntersection;
 class RimEclipseCellColors;
 class RimEclipseWell;
 
@@ -47,7 +47,7 @@ public:
 
     caf::PdmField<bool> isActive;
 
-    void appendCrossSection(RimCrossSection* crossSection);
+    void appendCrossSection(RimIntersection* crossSection);
 
     bool hasActiveCrossSectionForSimulationWell(RimEclipseWell* eclipseWell) const;
 
@@ -62,5 +62,5 @@ protected:
     virtual caf::PdmFieldHandle*    objectToggleField();
 
 private:
-    caf::PdmChildArrayField<RimCrossSection*> m_crossSections;
+    caf::PdmChildArrayField<RimIntersection*> m_crossSections;
 };

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -32,7 +32,7 @@
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimCrossSectionCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"

ApplicationCode/ProjectDataModel/RimIntersection.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 
 #include "RiaApplication.h"
 
@@ -44,31 +44,31 @@
 namespace caf {
 
 template<>
-void caf::AppEnum< RimCrossSection::CrossSectionEnum >::setUp()
+void caf::AppEnum< RimIntersection::CrossSectionEnum >::setUp()
 {
-    addItem(RimCrossSection::CS_WELL_PATH,       "CS_WELL_PATH",       "Well Path");
+    addItem(RimIntersection::CS_WELL_PATH,       "CS_WELL_PATH",       "Well Path");
-    addItem(RimCrossSection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well");
+    addItem(RimIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well");
-    addItem(RimCrossSection::CS_POLYLINE,        "CS_POLYLINE",        "Polyline");
+    addItem(RimIntersection::CS_POLYLINE,        "CS_POLYLINE",        "Polyline");
-    setDefault(RimCrossSection::CS_WELL_PATH);
+    setDefault(RimIntersection::CS_WELL_PATH);
 }
 
 template<>
-void caf::AppEnum< RimCrossSection::CrossSectionDirEnum >::setUp()
+void caf::AppEnum< RimIntersection::CrossSectionDirEnum >::setUp()
 {
-    addItem(RimCrossSection::CS_VERTICAL,   "CS_VERTICAL",      "Vertical");
+    addItem(RimIntersection::CS_VERTICAL,   "CS_VERTICAL",      "Vertical");
-    addItem(RimCrossSection::CS_HORIZONTAL, "CS_HORIZONTAL",    "Horizontal");
+    addItem(RimIntersection::CS_HORIZONTAL, "CS_HORIZONTAL",    "Horizontal");
-    setDefault(RimCrossSection::CS_VERTICAL);
+    setDefault(RimIntersection::CS_VERTICAL);
 }
 
 } 
 
 
-CAF_PDM_SOURCE_INIT(RimCrossSection, "CrossSection");
+CAF_PDM_SOURCE_INIT(RimIntersection, "CrossSection");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCrossSection::RimCrossSection()
+RimIntersection::RimIntersection()
 {
     CAF_PDM_InitObject("Intersection", ":/CrossSection16x16.png", "", "");
 
@@ -98,7 +98,7 @@ RimCrossSection::RimCrossSection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCrossSection::~RimCrossSection()
+RimIntersection::~RimIntersection()
 {
 
 }
@@ -106,7 +106,7 @@ RimCrossSection::~RimCrossSection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimIntersection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (changedField == &isActive ||
         changedField == &type ||
@@ -147,7 +147,7 @@ void RimCrossSection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimIntersection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&name);
     caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Intersecting Geometry");
@@ -195,7 +195,7 @@ void RimCrossSection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimCrossSection::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
+QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
 {
     QList<caf::PdmOptionItemInfo> options;
 
@@ -256,7 +256,7 @@ QList<caf::PdmOptionItemInfo> RimCrossSection::calculateValueOptions(const caf::
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimCrossSection::userDescriptionField()
+caf::PdmFieldHandle* RimIntersection::userDescriptionField()
 {
     return &name;
 }
@@ -264,7 +264,7 @@ caf::PdmFieldHandle* RimCrossSection::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimCrossSection::objectToggleField()
+caf::PdmFieldHandle* RimIntersection::objectToggleField()
 {
     return &isActive;
 }
@@ -272,7 +272,7 @@ caf::PdmFieldHandle* RimCrossSection::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWellCollection* RimCrossSection::simulationWellCollection()
+RimEclipseWellCollection* RimIntersection::simulationWellCollection()
 {
     RimEclipseView* eclipseView = NULL;
     firstAnchestorOrThisOfType(eclipseView);
@@ -288,7 +288,7 @@ RimEclipseWellCollection* RimCrossSection::simulationWellCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
+std::vector< std::vector <cvf::Vec3d> > RimIntersection::polyLines() const
 {
     std::vector< std::vector <cvf::Vec3d> > lines;
     if (type == CS_WELL_PATH)
@@ -336,7 +336,7 @@ std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr()
+RivIntersectionPartMgr* RimIntersection::crossSectionPartMgr()
 {
     if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivIntersectionPartMgr(this);
 
@@ -346,7 +346,7 @@ RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::updateWellCenterline() const
+void RimIntersection::updateWellCenterline() const
 {
     if (isActive() && type == CS_SIMULATION_WELL && simulationWell())
     {
@@ -366,7 +366,7 @@ void RimCrossSection::updateWellCenterline() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
+void RimIntersection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
 {
     size_t lineVxCount = polyLine.size();
     
@@ -422,7 +422,7 @@ void RimCrossSection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::updateWellExtentDefaultValue()
+void RimIntersection::updateWellExtentDefaultValue()
 {
     RimCase* ownerCase = NULL;
     firstAnchestorOrThisOfType(ownerCase);
@@ -440,7 +440,7 @@ void RimCrossSection::updateWellExtentDefaultValue()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::updateName()
+void RimIntersection::updateName()
 {
     if (type == CS_SIMULATION_WELL && simulationWell())
     {
@@ -460,7 +460,7 @@ void RimCrossSection::updateName()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
+void RimIntersection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
 {
     RimCase* ownerCase = NULL;
     firstAnchestorOrThisOfType(ownerCase);
@@ -506,7 +506,7 @@ void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
+void RimIntersection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
 {
     if (field == &inputFromViewerEnabled)
     {
@@ -534,7 +534,7 @@ void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QS
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::appendPointToPolyLine(const cvf::Vec3d& point)
+void RimIntersection::appendPointToPolyLine(const cvf::Vec3d& point)
 {
     m_userPolyline.v().push_back(point);
 
@@ -546,7 +546,7 @@ void RimCrossSection::appendPointToPolyLine(const cvf::Vec3d& point)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCrossSection::rebuildGeometryAndScheduleCreateDisplayModel()
+void RimIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
 {
     m_crossSectionPartMgr = NULL;
 

ApplicationCode/ProjectDataModel/RimIntersection.h

@@ -39,7 +39,7 @@ class RivIntersectionPartMgr;
 // 
 //
 //==================================================================================================
-class RimCrossSection : public caf::PdmObject
+class RimIntersection : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
@@ -58,8 +58,8 @@ public:
     };
 
 public:
-    RimCrossSection();
+    RimIntersection();
-    ~RimCrossSection();
+    ~RimIntersection();
 
     caf::PdmField<QString>                               name;
     caf::PdmField<bool>                                  isActive;

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -32,7 +32,7 @@
 
 #include "RimCellEdgeColors.h"
 #include "RimContextCommandBuilder.h"
-#include "RimCrossSection.h"
+#include "RimIntersection.h"
 #include "RimDefines.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
@@ -175,7 +175,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
             {
                 findCellAndGridIndex(crossSectionSourceInfo, firstPartTriangleIndex, &m_currentCellIndex, &m_currentGridIdx);
                 m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
-                m_currentCrossSection = const_cast<RimCrossSection*>(crossSectionSourceInfo->crossSection());
+                m_currentCrossSection = const_cast<RimIntersection*>(crossSectionSourceInfo->crossSection());
 
                 menu.addAction(QString("Hide intersection"), this, SLOT(slotHideIntersection()));
             }

ApplicationCode/UserInterface/RiuViewerCommands.h

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QPointer>
 
-class RimCrossSection;
+class RimIntersection;
 class RimEclipseView;
 class RimGeoMechView;
 class RimView;
@@ -76,7 +76,7 @@ private:
     cvf::StructGridInterface::FaceType m_currentFaceIndex;
 
     caf::PdmPointer<RimView> m_reservoirView;
-    caf::PdmPointer<RimCrossSection> m_currentCrossSection;
+    caf::PdmPointer<RimIntersection> m_currentCrossSection;
 
     QPointer<RiuViewer> m_viewer;