#815 More renaming CrossSection -> Intersection

ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake

@@ -6,16 +6,16 @@ endif()
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h
-${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewSimWellIntersectionFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.h
-${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewPolylineIntersectionFeature.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewSimWellIntersectionFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewPolylineIntersectionFeature.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicNewPolylineCrossSectionFeature.h"
+#include "RicNewPolylineIntersectionFeature.h"
 
 #include "RiaApplication.h"
 
@@ -36,12 +36,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicNewPolylineCrossSectionFeature, "RicNewPolylineCrossSectionFeature");
+CAF_CMD_SOURCE_INIT(RicNewPolylineIntersectionFeature, "RicNewPolylineIntersectionFeature");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicNewPolylineCrossSectionFeature::RicNewPolylineCrossSectionFeature()
+RicNewPolylineIntersectionFeature::RicNewPolylineIntersectionFeature()
 {
 }
 
@@ -49,7 +49,7 @@ RicNewPolylineCrossSectionFeature::RicNewPolylineCrossSectionFeature()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicNewPolylineCrossSectionFeature::isCommandEnabled()
+bool RicNewPolylineIntersectionFeature::isCommandEnabled()
 {
     return true;
 }
@@ -57,19 +57,19 @@ bool RicNewPolylineCrossSectionFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewPolylineCrossSectionFeature::onActionTriggered(bool isChecked)
+void RicNewPolylineIntersectionFeature::onActionTriggered(bool isChecked)
 {
     RimView* activeView = RiaApplication::instance()->activeReservoirView();
     if (!activeView) return;
    
-    RicNewPolylineCrossSectionFeatureCmd* cmd = new RicNewPolylineCrossSectionFeatureCmd(activeView->crossSectionCollection);
+    RicNewPolylineIntersectionFeatureCmd* cmd = new RicNewPolylineIntersectionFeatureCmd(activeView->crossSectionCollection);
     caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewPolylineCrossSectionFeature::setupActionLook(QAction* actionToSetup)
+void RicNewPolylineIntersectionFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
     actionToSetup->setText("New Polyline Intersection");
@@ -78,7 +78,7 @@ void RicNewPolylineCrossSectionFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
+bool RicNewPolylineIntersectionFeature::handleEvent(cvf::Object* eventObject)
 {
     std::vector<RimIntersection*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
@@ -109,7 +109,7 @@ bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicNewPolylineCrossSectionFeatureCmd::RicNewPolylineCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection)
+RicNewPolylineIntersectionFeatureCmd::RicNewPolylineIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection)
     : CmdExecuteCommand(NULL),
     m_crossSectionCollection(crossSectionCollection)
 {
@@ -118,14 +118,14 @@ RicNewPolylineCrossSectionFeatureCmd::RicNewPolylineCrossSectionFeatureCmd(RimIn
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicNewPolylineCrossSectionFeatureCmd::~RicNewPolylineCrossSectionFeatureCmd()
+RicNewPolylineIntersectionFeatureCmd::~RicNewPolylineIntersectionFeatureCmd()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QString RicNewPolylineCrossSectionFeatureCmd::name()
+QString RicNewPolylineIntersectionFeatureCmd::name()
 {
     return "Start Polyline Intersection";
 }
@@ -133,7 +133,7 @@ QString RicNewPolylineCrossSectionFeatureCmd::name()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewPolylineCrossSectionFeatureCmd::redo()
+void RicNewPolylineIntersectionFeatureCmd::redo()
 {
     CVF_ASSERT(m_crossSectionCollection);
 
@@ -152,6 +152,6 @@ void RicNewPolylineCrossSectionFeatureCmd::redo()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewPolylineCrossSectionFeatureCmd::undo()
+void RicNewPolylineIntersectionFeatureCmd::undo()
 {
 }

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.h

@@ -34,11 +34,11 @@ class RimIntersectionCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicNewPolylineCrossSectionFeatureCmd : public caf::CmdExecuteCommand
+class RicNewPolylineIntersectionFeatureCmd : public caf::CmdExecuteCommand
 {
 public:
-    RicNewPolylineCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection);
+    RicNewPolylineIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection);
-    virtual ~RicNewPolylineCrossSectionFeatureCmd();
+    virtual ~RicNewPolylineIntersectionFeatureCmd();
 
     virtual QString name();
     virtual void redo();
@@ -53,12 +53,12 @@ private:
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicNewPolylineCrossSectionFeature : public caf::CmdFeature, public RicViewerEventInterface
+class RicNewPolylineIntersectionFeature : public caf::CmdFeature, public RicViewerEventInterface
 {
     CAF_CMD_HEADER_INIT;
 
 public:
-    RicNewPolylineCrossSectionFeature();
+    RicNewPolylineIntersectionFeature();
 
 protected:
     // Overrides

ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicNewSimWellCrossSectionFeature.h"
+#include "RicNewSimWellIntersectionFeature.h"
 
 #include "RimIntersection.h"
 #include "RimIntersectionCollection.h"
@@ -31,12 +31,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicNewSimWellCrossSectionFeature, "RicNewSimWellCrossSectionFeature");
+CAF_CMD_SOURCE_INIT(RicNewSimWellIntersectionFeature, "RicNewSimWellIntersectionFeature");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicNewSimWellCrossSectionFeature::isCommandEnabled()
+bool RicNewSimWellIntersectionFeature::isCommandEnabled()
 {
     return true;
 }
@@ -44,7 +44,7 @@ bool RicNewSimWellCrossSectionFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewSimWellCrossSectionFeature::onActionTriggered(bool isChecked)
+void RicNewSimWellIntersectionFeature::onActionTriggered(bool isChecked)
 {
     std::vector<RimEclipseWell*> collection;
     caf::SelectionManager::instance()->objectsByType(&collection);
@@ -56,14 +56,14 @@ void RicNewSimWellCrossSectionFeature::onActionTriggered(bool isChecked)
     eclWell->firstAnchestorOrThisOfType(eclView);
     CVF_ASSERT(eclView);
 
-    RicNewSimWellCrossSectionCmd* cmd = new RicNewSimWellCrossSectionCmd(eclView->crossSectionCollection, eclWell);
+    RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd(eclView->crossSectionCollection, eclWell);
     caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewSimWellCrossSectionFeature::setupActionLook(QAction* actionToSetup)
+void RicNewSimWellIntersectionFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
     actionToSetup->setText("New Intersection");
@@ -72,7 +72,7 @@ void RicNewSimWellCrossSectionFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicNewSimWellCrossSectionCmd::RicNewSimWellCrossSectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell)
+RicNewSimWellIntersectionCmd::RicNewSimWellIntersectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell)
     : CmdExecuteCommand(NULL),
     m_crossSectionCollection(crossSectionCollection),
     m_wellPath(simWell)
@@ -82,14 +82,14 @@ RicNewSimWellCrossSectionCmd::RicNewSimWellCrossSectionCmd(RimIntersectionCollec
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RicNewSimWellCrossSectionCmd::~RicNewSimWellCrossSectionCmd()
+RicNewSimWellIntersectionCmd::~RicNewSimWellIntersectionCmd()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QString RicNewSimWellCrossSectionCmd::name()
+QString RicNewSimWellIntersectionCmd::name()
 {
     return "Create Intersection From Well";
 }
@@ -97,7 +97,7 @@ QString RicNewSimWellCrossSectionCmd::name()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewSimWellCrossSectionCmd::redo()
+void RicNewSimWellIntersectionCmd::redo()
 {
     CVF_ASSERT(m_crossSectionCollection);
     CVF_ASSERT(m_wellPath);
@@ -113,6 +113,6 @@ void RicNewSimWellCrossSectionCmd::redo()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewSimWellCrossSectionCmd::undo()
+void RicNewSimWellIntersectionCmd::undo()
 {
 }

ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.h

@@ -30,11 +30,11 @@ class RimEclipseWell;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicNewSimWellCrossSectionCmd : public caf::CmdExecuteCommand
+class RicNewSimWellIntersectionCmd : public caf::CmdExecuteCommand
 {
 public:
-    RicNewSimWellCrossSectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell);
+    RicNewSimWellIntersectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell);
-    virtual ~RicNewSimWellCrossSectionCmd();
+    virtual ~RicNewSimWellIntersectionCmd();
 
     virtual QString name();
     virtual void redo();
@@ -50,7 +50,7 @@ private:
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicNewSimWellCrossSectionFeature : public caf::CmdFeature
+class RicNewSimWellIntersectionFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -321,7 +321,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         }
         else if (dynamic_cast<RimEclipseWell*>(uiItem))
         {
-            commandIds << "RicNewSimWellCrossSectionFeature";
+            commandIds << "RicNewSimWellIntersectionFeature";
         }
         else if(dynamic_cast<RimFormationNames*>(uiItem))
         {

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -95,7 +95,7 @@ RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer)
       m_currentCellIndex(-1)  
 {
     {
-        caf::CmdFeature* cmdFeature = caf::CmdFeatureManager::instance()->getCommandFeature("RicNewPolylineCrossSectionFeature");
+        caf::CmdFeature* cmdFeature = caf::CmdFeatureManager::instance()->getCommandFeature("RicNewPolylineIntersectionFeature");
         CVF_ASSERT(cmdFeature);
 
         m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(cmdFeature));
@@ -267,7 +267,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
             {
                 caf::SelectionManager::instance()->setSelectedItem(well);
 
-                commandIds << "RicNewSimWellCrossSectionFeature";
+                commandIds << "RicNewSimWellIntersectionFeature";
             }
         }
 
@@ -282,7 +282,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
         commandIds << "RicSetMasterViewFeature";
     }
 
-    commandIds << "RicNewPolylineCrossSectionFeature";
+    commandIds << "RicNewPolylineIntersectionFeature";
 
     RimContextCommandBuilder::appendCommandsToMenu(commandIds, &menu);