#3807 Rename RimContourMapView to RimEclipseContourMapView

2025-02-25 18:55:39 -06:00 · 2019-01-11 13:56:35 +01:00
parent 31c67e29e4
commit f3c188ef56
26 changed files with 110 additions and 110 deletions
--- a/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationIn3dViewFeature.cpp
+++ b/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationIn3dViewFeature.cpp
@@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimAnnotationInViewCollection.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimCase.h"
 #include "RimGridView.h"
 #include "RimTextAnnotation.h"
@@ -54,7 +54,7 @@ void RicCreateTextAnnotationIn3dViewFeature::onActionTriggered(bool isChecked)

 {
    RimGridView* activeView = RiaApplication::instance()->activeGridView();
-    RimContourMapView * contMapView = dynamic_cast<RimContourMapView*>(activeView);
+    RimEclipseContourMapView * contMapView = dynamic_cast<RimEclipseContourMapView*>(activeView);

    if ( activeView )
    {
--- a/ApplicationCode/Commands/RicContourMapPickEventHandler.cpp
+++ b/ApplicationCode/Commands/RicContourMapPickEventHandler.cpp
@@ -18,7 +18,7 @@

 #include "RicContourMapPickEventHandler.h"
 #include "RimEclipseContourMapProjection.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseCellColors.h"
 #include "Rim3dView.h"

@@ -58,7 +58,7 @@ bool RicContourMapPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventO
        {
            RiuMainWindow::instance()->selectAsCurrentItem(contourMap);

-            RimContourMapView* view = nullptr;
+            RimEclipseContourMapView* view = nullptr;
            contourMap->firstAncestorOrThisOfTypeAsserted(view);

            cvf::Vec2d pickedPoint;
--- a/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
+++ b/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
@@ -20,7 +20,7 @@

 #include "Rim3dView.h"
 #include "RimCellEdgeColors.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimContourMapViewCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
@@ -58,9 +58,9 @@ bool RicNewContourMapViewFeature::isCommandEnabled()
 void RicNewContourMapViewFeature::onActionTriggered(bool isChecked)
 {
    RimEclipseView*    reservoirView      = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
-    RimContourMapView* existingContourMap = caf::SelectionManager::instance()->selectedItemOfType<RimContourMapView>();
+    RimEclipseContourMapView* existingContourMap = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseContourMapView>();
    RimEclipseCase*    eclipseCase        = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseCase>();
-    RimContourMapView* contourMap         = nullptr;
+    RimEclipseContourMapView* contourMap         = nullptr;

    // Find case to insert into
    if (existingContourMap)
@@ -99,7 +99,7 @@ void RicNewContourMapViewFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicNewContourMapViewFeature::setupActionLook(QAction* actionToSetup)
 {
-    RimContourMapView* contourMap  = caf::SelectionManager::instance()->selectedItemOfType<RimContourMapView>();
+    RimEclipseContourMapView* contourMap  = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseContourMapView>();
    RimEclipseView*    eclipseView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
    if (contourMap)
    {
@@ -119,10 +119,10 @@ void RicNewContourMapViewFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFromExistingContourMap(RimEclipseCase*    eclipseCase,
-                                                                                         RimContourMapView* existingContourMap)
+RimEclipseContourMapView* RicNewContourMapViewFeature::create2dContourMapFromExistingContourMap(RimEclipseCase*    eclipseCase,
+                                                                                         RimEclipseContourMapView* existingContourMap)
 {
-    RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(
+    RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(
        existingContourMap->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
    CVF_ASSERT(contourMap);

@@ -145,11 +145,11 @@ RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFromExistingCo
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFrom3dView(RimEclipseCase*       eclipseCase,
+RimEclipseContourMapView* RicNewContourMapViewFeature::create2dContourMapFrom3dView(RimEclipseCase*       eclipseCase,
                                                                             const RimEclipseView* sourceView)
 {
-    RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
-        RimContourMapView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
+    RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
+        RimEclipseContourMapView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
    CVF_ASSERT(contourMap);

    contourMap->setEclipseCase(eclipseCase);
@@ -180,9 +180,9 @@ RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFrom3dView(Rim
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimContourMapView* RicNewContourMapViewFeature::create2dContourMap(RimEclipseCase* eclipseCase)
+RimEclipseContourMapView* RicNewContourMapViewFeature::create2dContourMap(RimEclipseCase* eclipseCase)
 {
-    RimContourMapView* contourMap = new RimContourMapView();
+    RimEclipseContourMapView* contourMap = new RimEclipseContourMapView();
    contourMap->setEclipseCase(eclipseCase);

    // Set default values
--- a/ApplicationCode/Commands/RicNewContourMapViewFeature.h
+++ b/ApplicationCode/Commands/RicNewContourMapViewFeature.h
@@ -22,7 +22,7 @@
 #include "cafCmdFeature.h"

 class RimEclipseCase;
-class RimContourMapView;
+class RimEclipseContourMapView;
 class RimEclipseView;

 //==================================================================================================
@@ -38,8 +38,8 @@ protected:
    void onActionTriggered( bool isChecked ) override;
    void setupActionLook( QAction* actionToSetup ) override;

-    static RimContourMapView* create2dContourMapFromExistingContourMap(RimEclipseCase* eclipseCase, RimContourMapView* existingContourMap);
-    static RimContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
-    static RimContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);
+    static RimEclipseContourMapView* create2dContourMapFromExistingContourMap(RimEclipseCase* eclipseCase, RimEclipseContourMapView* existingContourMap);
+    static RimEclipseContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
+    static RimEclipseContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);

 };
--- a/ApplicationCode/Commands/RicNewViewFeature.cpp
+++ b/ApplicationCode/Commands/RicNewViewFeature.cpp
@@ -19,7 +19,7 @@

 #include "RicNewViewFeature.h"

-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
@@ -161,7 +161,7 @@ RimEclipseView* RicNewViewFeature::selectedEclipseView()

    for (RimEclipseView* view : selection)
    {
-        if (dynamic_cast<RimContourMapView*>(view) == nullptr)
+        if (dynamic_cast<RimEclipseContourMapView*>(view) == nullptr)
        {
            return view;
        }
--- a/ApplicationCode/Commands/RicTogglePerspectiveViewFeature.cpp
+++ b/ApplicationCode/Commands/RicTogglePerspectiveViewFeature.cpp
@@ -20,7 +20,7 @@
 #include "RicTogglePerspectiveViewFeature.h"

 #include "RiuViewer.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "Rim3dView.h"
 #include "RimGridView.h"
 #include "RiuMainWindow.h"
@@ -37,7 +37,7 @@ bool RicTogglePerspectiveViewFeature::isCommandEnabled()
 {
    this->action(); // Retrieve the action to update the looks
    RimGridView* activeGridView = RiaApplication::instance()->activeGridView();
-    RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(activeGridView);
+    RimEclipseContourMapView* view2d = dynamic_cast<RimEclipseContourMapView*>(activeGridView);
    return !view2d && activeGridView && RiaApplication::instance()->activeReservoirView()->viewer();
 }

--- a/ApplicationCode/Commands/ViewLink/RicLinkViewFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicLinkViewFeature.cpp
@@ -24,7 +24,7 @@
 #include "RicLinkVisibleViewsFeature.h"

 #include "Rim3dView.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimGridView.h"
 #include "RimProject.h"
 #include "RimViewLinkerCollection.h"
@@ -43,7 +43,7 @@ bool RicLinkViewFeature::isCommandEnabled()
 {
    std::vector<caf::PdmUiItem*> allSelectedItems;
    std::vector<RimGridView*> selectedGridViews;
-    std::vector<RimContourMapView*> selectedContourMaps;
+    std::vector<RimEclipseContourMapView*> selectedContourMaps;

    caf::SelectionManager::instance()->selectedItems(allSelectedItems);
    caf::SelectionManager::instance()->objectsByType(&selectedGridViews);
--- a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
@@ -23,7 +23,7 @@

 #include "RicLinkVisibleViewsFeatureUi.h"

-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimGridView.h"
 #include "RimProject.h"
 #include "RimViewController.h"
@@ -151,7 +151,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimGridView*>& views)
    std::vector<RimGridView*> masterCandidates;
    for (RimGridView* view : views)
    {
-        if (dynamic_cast<RimContourMapView*>(view) == nullptr)
+        if (dynamic_cast<RimEclipseContourMapView*>(view) == nullptr)
        {
            masterCandidates.push_back(view);
        }
--- a/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
@@ -22,7 +22,7 @@
 #include "RiaApplication.h"
 #include "RiaOptionItemFactory.h"

-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimCase.h"
 #include "RimGridView.h"
 #include "RimViewLinker.h"
@@ -83,7 +83,7 @@ std::vector<RimGridView*> RicLinkVisibleViewsFeatureUi::masterViewCandidates() c
    // Set Active view as master view if the active view isn't a contour map.
    for (size_t i = 0; i < m_allViews.size(); i++)
    {
-        RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(m_allViews[i]);
+        RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(m_allViews[i]);
        if (contourMap == nullptr)
        {
            masterCandidates.push_back(m_allViews[i]);
--- a/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
+++ b/ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
@@ -21,7 +21,7 @@

 #include "RiaApplication.h"

-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimGridView.h"
 #include "RimProject.h"
 #include "RimViewController.h"
@@ -55,7 +55,7 @@ bool RicSetMasterViewFeature::isCommandEnabled()
        return false;
    }

-    if (dynamic_cast<RimContourMapView*>(activeView) != nullptr)
+    if (dynamic_cast<RimEclipseContourMapView*>(activeView) != nullptr)
    {
        return false;
    }