#3807 Rename RimContourMapView to RimEclipseContourMapView

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 )
     {

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;

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,
+RimEclipseContourMapView* RicNewContourMapViewFeature::create2dContourMapFromExistingContourMap(RimEclipseCase*    eclipseCase,
-                                                                                         RimContourMapView* existingContourMap)
+                                                                                         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(
+    RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(sourceView->xmlCapability()->copyAndCastByXmlSerialization(
-        RimContourMapView::classKeywordStatic(), sourceView->classKeyword(), caf::PdmDefaultObjectFactory::instance()));
+        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

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 RimEclipseContourMapView* create2dContourMapFromExistingContourMap(RimEclipseCase* eclipseCase, RimEclipseContourMapView* existingContourMap);
-    static RimContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
+    static RimEclipseContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
-    static RimContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);
+    static RimEclipseContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);
 
 };

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;
         }

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();
 }
 

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);

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);
         }

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]);

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;
     }

ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp

@@ -8,7 +8,7 @@
 #include "RivScalarMapperUtils.h"
 #include "RivPartPriority.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseContourMapProjection.h"
 
 #include "cafEffectGenerator.h"
@@ -28,7 +28,7 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivContourMapProjectionPartMgr::RivContourMapProjectionPartMgr(RimEclipseContourMapProjection* contourMapProjection, RimContourMapView* contourMap)
+RivContourMapProjectionPartMgr::RivContourMapProjectionPartMgr(RimEclipseContourMapProjection* contourMapProjection, RimEclipseContourMapView* contourMap)
 {
     m_contourMapProjection = contourMapProjection;
     m_parentContourMap = contourMap;

ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h

@@ -30,7 +30,7 @@
 #include "cvfObject.h"
 #include "cvfVector4.h"
 
-class RimContourMapView;
+class RimEclipseContourMapView;
 
 namespace cvf
 {
@@ -40,7 +40,7 @@ namespace cvf
 class RivContourMapProjectionPartMgr : public cvf::Object
 {
 public:
-    RivContourMapProjectionPartMgr(RimEclipseContourMapProjection* contourMapProjection, RimContourMapView* contourMap);
+    RivContourMapProjectionPartMgr(RimEclipseContourMapProjection* contourMapProjection, RimEclipseContourMapView* contourMap);
 
     void createProjectionGeometry();
     void appendProjectionToModel(cvf::ModelBasicList*              model,
@@ -60,7 +60,7 @@ private:
     cvf::ref<cvf::DrawableGeo>                           createPickPointVisDrawable(const caf::DisplayCoordTransform* displayCoordTransform) const;
 private:
     caf::PdmPointer<RimEclipseContourMapProjection>  m_contourMapProjection;
-    caf::PdmPointer<RimContourMapView>        m_parentContourMap;
+    caf::PdmPointer<RimEclipseContourMapView>        m_parentContourMap;
 
     std::vector<RimEclipseContourMapProjection::ContourPolygons> m_contourLinePolygons;
     std::vector<cvf::Vec4d>                               m_contourMapTriangles;

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -118,7 +118,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurveNameConfig.h
 ${CMAKE_CURRENT_LIST_DIR}/RimDataSourceSteppingTools.h
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurveCommonDataSource.h
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapProjection.h
-${CMAKE_CURRENT_LIST_DIR}/RimContourMapView.h
+${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapView.h
 ${CMAKE_CURRENT_LIST_DIR}/RimContourMapViewCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.h
 ${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.h
@@ -244,7 +244,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurveNameConfig.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimDataSourceSteppingTools.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurveCommonDataSource.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapProjection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimContourMapView.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimEclipseContourMapView.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimContourMapViewCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.cpp

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

@@ -37,7 +37,7 @@
 #include "RigMainGrid.h"
 #include "RigStatisticsDataCache.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseContourMapProjection.h"
 #include "Rim2dIntersectionView.h"
 #include "Rim2dIntersectionViewCollection.h"
@@ -176,7 +176,7 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData()
 {
     auto eclipseView = dynamic_cast<RimEclipseView*>(m_viewDef.p());
     auto geoMechView = dynamic_cast<RimGeoMechView*>(m_viewDef.p());
-    auto contourMap = dynamic_cast<RimContourMapView*>(eclipseView);
+    auto contourMap = dynamic_cast<RimEclipseContourMapView*>(eclipseView);
     
     if (contourMap) return histogramData(contourMap);
     else if (eclipseView) return histogramData(eclipseView);
@@ -278,7 +278,7 @@ void Rim3dOverlayInfoConfig::setIsActive(bool active)
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimContourMapView* contourMap)
+Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimEclipseContourMapView* contourMap)
 {
     HistogramData histData;
 
@@ -496,7 +496,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimEclipseView* eclipseView)
     {
         QString caseName = eclipseView->eclipseCase()->caseUserDescription();
 
-        RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(eclipseView);
+        RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(eclipseView);
         if (contourMap && contourMap->contourMapProjection())
         {
             QString totCellCount = QString::number(contourMap->contourMapProjection()->numberOfCells());
@@ -578,7 +578,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri
 {
     QString infoText;
 
-    RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(eclipseView);
+    RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(eclipseView);
 
     if (contourMap)
     {
@@ -823,7 +823,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
     caf::PdmUiGroup* visGroup = uiOrdering.addNewGroup("Visibility");
 
     RimEclipseView * eclipseView = dynamic_cast<RimEclipseView*>(m_viewDef.p());
-    RimContourMapView* contourMap = dynamic_cast<RimContourMapView*>(eclipseView);
+    RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(eclipseView);
     RimGeoMechView * geoMechView = dynamic_cast<RimGeoMechView*>(m_viewDef.p());
 
     visGroup->add(&m_showAnimProgress);

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h

@@ -30,7 +30,7 @@
 #include <cmath>
 #include <memory>
 
-class RimContourMapView;
+class RimEclipseContourMapView;
 class RimEclipseView;
 class RimGeoMechView;
 class RimGridView;
@@ -113,7 +113,7 @@ private:
 
     QString                                     timeStepText(RimEclipseView* eclipseView);
     QString                                     timeStepText(RimGeoMechView* geoMechView);
-    HistogramData                               histogramData(RimContourMapView* contourMap);
+    HistogramData                               histogramData(RimEclipseContourMapView* contourMap);
     HistogramData                               histogramData(RimEclipseView* eclipseView);
     HistogramData                               histogramData(RimGeoMechView* geoMechView);
     QString                                     caseInfoText(RimEclipseView* eclipseView);

ApplicationCode/ProjectDataModel/RimContourMapViewCollection.cpp

@@ -1,6 +1,6 @@
 #include "RimContourMapViewCollection.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimCase.h"
 
 CAF_PDM_SOURCE_INIT(RimContourMapViewCollection, "Eclipse2dViewCollection");
@@ -27,7 +27,7 @@ RimContourMapViewCollection::~RimContourMapViewCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimContourMapView*> RimContourMapViewCollection::views()
+std::vector<RimEclipseContourMapView*> RimContourMapViewCollection::views()
 {
     return m_contourMapViews.childObjects();
 }
@@ -35,7 +35,7 @@ std::vector<RimContourMapView*> RimContourMapViewCollection::views()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapViewCollection::push_back(RimContourMapView* contourMap)
+void RimContourMapViewCollection::push_back(RimEclipseContourMapView* contourMap)
 {
     m_contourMapViews.push_back(contourMap);
 }

ApplicationCode/ProjectDataModel/RimContourMapViewCollection.h

@@ -22,7 +22,7 @@
 #include "cafPdmField.h"
 #include "cafPdmChildArrayField.h"
 
-class RimContourMapView;
+class RimEclipseContourMapView;
 
 class RimContourMapViewCollection : public caf::PdmObject
 {
@@ -31,10 +31,10 @@ public:
     RimContourMapViewCollection();
     ~RimContourMapViewCollection() override;
 
-    std::vector<RimContourMapView*> views(); 
+    std::vector<RimEclipseContourMapView*> views(); 
-    void push_back(RimContourMapView* contourMap);
+    void push_back(RimEclipseContourMapView* contourMap);
 private:
-    caf::PdmChildArrayField<RimContourMapView*> m_contourMapViews;
+    caf::PdmChildArrayField<RimEclipseContourMapView*> m_contourMapViews;
 };
 
 

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -35,7 +35,7 @@
 #include "RigSimWellData.h"
 #include "RigVirtualPerforationTransmissibilities.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimContourMapViewCollection.h"
 #include "Rim2dIntersectionView.h"
 #include "Rim2dIntersectionViewCollection.h"
@@ -239,7 +239,7 @@ void RimEclipseCase::initAfterRead()
 
         riv->setEclipseCase(this);
     }
-    for (RimContourMapView* contourMap : m_contourMapCollection->views())
+    for (RimEclipseContourMapView* contourMap : m_contourMapCollection->views())
     {
         contourMap->setEclipseCase(this);
     }
@@ -866,7 +866,7 @@ std::vector<Rim3dView*> RimEclipseCase::allSpecialViews() const
         views.push_back(view);
     }
 
-    for (RimContourMapView* view : m_contourMapCollection->views())
+    for (RimEclipseContourMapView* view : m_contourMapCollection->views())
     {
         views.push_back(view);
     }
@@ -940,7 +940,7 @@ void RimEclipseCase::reloadDataAndUpdate()
             reservoirView->updateAnnotationItems();
         }
 
-        for (RimContourMapView* contourMap : m_contourMapCollection->views())
+        for (RimEclipseContourMapView* contourMap : m_contourMapCollection->views())
         {
             CVF_ASSERT(contourMap);
             contourMap->loadDataAndUpdate();

ApplicationCode/ProjectDataModel/RimEclipseCase.h

@@ -45,7 +45,7 @@ class RigMainGrid;
 class RimCaseCollection;
 class RimIdenticalGridCaseGroup;
 class RimReservoirCellResultsStorage;
-class RimContourMapView;
+class RimEclipseContourMapView;
 class RimContourMapViewCollection;
 class RimEclipseView;
 class RigVirtualPerforationTransmissibilities;

ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp

@@ -35,7 +35,7 @@
 #include "RivReservoirViewPartMgr.h"
 
 #include "RimCellRangeFilterCollection.h"
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
 #include "RimEclipseResultCase.h"
@@ -1868,9 +1868,9 @@ RimEclipseResultCase* RimEclipseContourMapProjection::eclipseCase() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimContourMapView* RimEclipseContourMapProjection::view() const
+RimEclipseContourMapView* RimEclipseContourMapProjection::view() const
 {
-    RimContourMapView* view = nullptr;
+    RimEclipseContourMapView* view = nullptr;
     firstAncestorOrThisOfTypeAsserted(view);
     return view;
 }

ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h

@@ -33,7 +33,7 @@
 
 class RigMainGrid;
 class RigResultAccessor;
-class RimContourMapView;
+class RimEclipseContourMapView;
 class RimEclipseResultCase;
 class RimEclipseResultDefinition;
 
@@ -180,7 +180,7 @@ private:
     cvf::Vec2ui                     calculateMapSize() const;
 
     RimEclipseResultCase*           eclipseCase() const;
-    RimContourMapView*              view() const;
+    RimEclipseContourMapView*              view() const;
 
     double                          gridEdgeOffset() const;
 

ApplicationCode/ProjectDataModel/RimEclipseContourMapView.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 
 #include "RivContourMapProjectionPartMgr.h"
 #include "RiuViewer.h"
@@ -41,14 +41,14 @@
 #include "cvfPart.h"
 #include "cvfScene.h"
 
-CAF_PDM_SOURCE_INIT(RimContourMapView, "RimContourMapView");
+CAF_PDM_SOURCE_INIT(RimEclipseContourMapView, "RimContourMapView");
 
 const cvf::Mat4d defaultViewMatrix(1, 0, 0, 0,
     0, 1, 0, 0,
     0, 0, 1, 1000,
     0, 0, 0, 1);
 
-RimContourMapView::RimContourMapView()
+RimEclipseContourMapView::RimEclipseContourMapView()
     : m_cameraPositionLastUpdate(cvf::Vec3d::UNDEFINED)
 {
     CAF_PDM_InitObject("Contour Map View", ":/2DMap16x16.png", "", "");
@@ -72,7 +72,7 @@ RimContourMapView::RimContourMapView()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEclipseContourMapProjection* RimContourMapView::contourMapProjection() const
+RimEclipseContourMapProjection* RimEclipseContourMapView::contourMapProjection() const
 {
     return m_contourMapProjection().p();
 }
@@ -80,7 +80,7 @@ RimEclipseContourMapProjection* RimContourMapView::contourMapProjection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RimContourMapView::createAutoName() const
+QString RimEclipseContourMapView::createAutoName() const
 {
     QStringList autoName;
 
@@ -124,7 +124,7 @@ QString RimContourMapView::createAutoName() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::setDefaultCustomName()
+void RimEclipseContourMapView::setDefaultCustomName()
 {
     nameConfig()->setCustomName("Contour Map");
     nameConfig()->hideCaseNameField(false);
@@ -136,7 +136,7 @@ void RimContourMapView::setDefaultCustomName()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::initAfterRead()
+void RimEclipseContourMapView::initAfterRead()
 {
     m_gridCollection->setActive(false); // This is also not added to the tree view, so cannot be enabled.
     disablePerspectiveProjectionField();
@@ -150,7 +150,7 @@ void RimContourMapView::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::createDisplayModel()
+void RimEclipseContourMapView::createDisplayModel()
 {
     RimEclipseView::createDisplayModel();
     
@@ -169,7 +169,7 @@ void RimContourMapView::createDisplayModel()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimEclipseContourMapView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer");
     viewGroup->add(this->userDescriptionField());
@@ -186,7 +186,7 @@ void RimContourMapView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
+void RimEclipseContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
 {
     uiTreeOrdering.add(m_overlayInfoConfig());
     uiTreeOrdering.add(m_contourMapProjection);
@@ -204,7 +204,7 @@ void RimContourMapView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateCurrentTimeStep()
+void RimEclipseContourMapView::updateCurrentTimeStep()
 {
     static_cast<RimEclipsePropertyFilterCollection*>(nativePropertyFilterCollection())->updateFromCurrentTimeStep();
     updateGeometry();
@@ -213,7 +213,7 @@ void RimContourMapView::updateCurrentTimeStep()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateCurrentTimeStepAndRedraw()
+void RimEclipseContourMapView::updateCurrentTimeStepAndRedraw()
 {
     m_contourMapProjection->clearGeometry();
     RimEclipseView::updateCurrentTimeStepAndRedraw();
@@ -222,7 +222,7 @@ void RimContourMapView::updateCurrentTimeStepAndRedraw()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateGeometry()
+void RimEclipseContourMapView::updateGeometry()
 {
     this->updateVisibleGeometriesAndCellColors();
 
@@ -247,7 +247,7 @@ void RimContourMapView::updateGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::setFaultVisParameters()
+void RimEclipseContourMapView::setFaultVisParameters()
 {
     faultCollection()->setShowFaultsOutsideFilter(false);
     faultCollection()->showOppositeFaultFaces = true;
@@ -259,7 +259,7 @@ void RimContourMapView::setFaultVisParameters()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::createContourMapGeometry()
+void RimEclipseContourMapView::createContourMapGeometry()
 {
     if (m_viewer && m_contourMapProjection->isChecked())
     {
@@ -270,7 +270,7 @@ void RimContourMapView::createContourMapGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::appendContourMapProjectionToModel()
+void RimEclipseContourMapView::appendContourMapProjectionToModel()
 {
     if (m_viewer && m_contourMapProjection->isChecked())
     {
@@ -295,7 +295,7 @@ void RimContourMapView::appendContourMapProjectionToModel()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::appendContourLinesToModel()
+void RimEclipseContourMapView::appendContourLinesToModel()
 {
     if (m_viewer && m_contourMapProjection->isChecked())
     {
@@ -320,7 +320,7 @@ void RimContourMapView::appendContourLinesToModel()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::appendPickPointVisToModel()
+void RimEclipseContourMapView::appendPickPointVisToModel()
 {
     if (m_viewer && m_contourMapProjection->isChecked())
     {
@@ -345,7 +345,7 @@ void RimContourMapView::appendPickPointVisToModel()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateLegends()
+void RimEclipseContourMapView::updateLegends()
 {
     if (m_viewer)
     {
@@ -371,7 +371,7 @@ void RimContourMapView::updateLegends()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateViewWidgetAfterCreation()
+void RimEclipseContourMapView::updateViewWidgetAfterCreation()
 {
     if (m_viewer)
     {
@@ -386,7 +386,7 @@ void RimContourMapView::updateViewWidgetAfterCreation()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updateViewFollowingRangeFilterUpdates()
+void RimEclipseContourMapView::updateViewFollowingRangeFilterUpdates()
 {
     m_contourMapProjection->setCheckState(true);
     scheduleCreateDisplayModelAndRedraw();
@@ -395,7 +395,7 @@ void RimContourMapView::updateViewFollowingRangeFilterUpdates()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::updatePickPointAndRedraw()
+void RimEclipseContourMapView::updatePickPointAndRedraw()
 {
     appendPickPointVisToModel();
     if (m_viewer)
@@ -407,7 +407,7 @@ void RimContourMapView::updatePickPointAndRedraw()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::onLoadDataAndUpdate()
+void RimEclipseContourMapView::onLoadDataAndUpdate()
 {
     RimEclipseView::onLoadDataAndUpdate();
     if (m_viewer)
@@ -419,7 +419,7 @@ void RimContourMapView::onLoadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimEclipseContourMapView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     RimEclipseView::fieldChangedByUi(changedField, oldValue, newValue);
 
@@ -442,7 +442,7 @@ void RimContourMapView::fieldChangedByUi(const caf::PdmFieldHandle* changedField
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimContourMapView::userDescriptionField()
+caf::PdmFieldHandle* RimEclipseContourMapView::userDescriptionField()
 {
     return nameConfig()->nameField();
 }
@@ -450,7 +450,7 @@ caf::PdmFieldHandle* RimContourMapView::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<RivCellSetEnum> RimContourMapView::allVisibleFaultGeometryTypes() const
+std::set<RivCellSetEnum> RimEclipseContourMapView::allVisibleFaultGeometryTypes() const
 {
     std::set<RivCellSetEnum> faultGeoTypes;
     // Normal eclipse views always shows faults for active and visible eclipse cells.
@@ -464,7 +464,7 @@ std::set<RivCellSetEnum> RimContourMapView::allVisibleFaultGeometryTypes() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QWidget* RimContourMapView::createViewWidget(QWidget* mainWindowParent)
+QWidget* RimEclipseContourMapView::createViewWidget(QWidget* mainWindowParent)
 {
     auto widget = Rim3dView::createViewWidget(mainWindowParent);
 
@@ -479,7 +479,7 @@ QWidget* RimContourMapView::createViewWidget(QWidget* mainWindowParent)
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimContourMapView::onViewNavigationChanged()
+void RimEclipseContourMapView::onViewNavigationChanged()
 {
     cvf::Vec3d currentCameraPosition = viewer()->mainCamera()->position();
     if (m_cameraPositionLastUpdate.isUndefined() || zoomChangeAboveTreshold(currentCameraPosition))
@@ -492,7 +492,7 @@ void RimContourMapView::onViewNavigationChanged()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RimContourMapView::zoomChangeAboveTreshold(const cvf::Vec3d& currentCameraPosition) const
+bool RimEclipseContourMapView::zoomChangeAboveTreshold(const cvf::Vec3d& currentCameraPosition) const
 {
     double distance = std::max(std::fabs(m_cameraPositionLastUpdate.z()), std::fabs(currentCameraPosition.z()));
     const double threshold = 0.05 * distance;

ApplicationCode/ProjectDataModel/RimEclipseContourMapView.h

@@ -25,11 +25,11 @@ class RimViewNameConfig;
 class RimScaleLegendConfig;
 class RivContourMapProjectionPartMgr;
 
-class RimContourMapView : public RimEclipseView
+class RimEclipseContourMapView : public RimEclipseView
 {
     CAF_PDM_HEADER_INIT;
 public:
-    RimContourMapView();
+    RimEclipseContourMapView();
     RimEclipseContourMapProjection*                     contourMapProjection() const;
 
     QString createAutoName() const override;

ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp

@@ -28,7 +28,7 @@
 #include "RigEclipseCaseData.h"
 #include "RigSimWellData.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
@@ -519,7 +519,7 @@ void RimSimWellInViewCollection::defineUiOrdering(QString uiConfigName, caf::Pdm
 {
     updateStateForVisibilityCheckboxes();
 
-    bool isContourMap = dynamic_cast<const RimContourMapView*>(m_reservoirView) != nullptr;
+    bool isContourMap = dynamic_cast<const RimEclipseContourMapView*>(m_reservoirView) != nullptr;
 
     caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Visibility");
     if (!isContourMap)

ApplicationCode/ProjectDataModel/RimViewController.cpp

@@ -28,7 +28,7 @@
 #include "RigGeoMechCaseData.h"
 #include "RigMainGrid.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "Rim3dView.h"
 #include "RimCase.h"
 #include "RimCellRangeFilter.h"
@@ -671,8 +671,8 @@ RimGridView* RimViewController::masterView() const
 //--------------------------------------------------------------------------------------------------
 bool RimViewController::isCameraControlPossible() const
 {
-    RimContourMapView* contourMapMasterView  = dynamic_cast<RimContourMapView*>(masterView());
+    RimEclipseContourMapView* contourMapMasterView  = dynamic_cast<RimEclipseContourMapView*>(masterView());
-    RimContourMapView* contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView());
+    RimEclipseContourMapView* contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView());
     return !(contourMapMasterView || contourMapManagedView);
 }
 
@@ -910,8 +910,8 @@ bool RimViewController::isRangeFilterMappingApplicable() const
 //--------------------------------------------------------------------------------------------------
 bool RimViewController::isCellResultControlAdvisable() const
 {
-    bool contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
+    bool contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
-    bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
+    bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
     return !isMasterAndDepViewDifferentType() && contourMapMasterView != contourMapManagedView;
 }
 
@@ -920,8 +920,8 @@ bool RimViewController::isCellResultControlAdvisable() const
 //--------------------------------------------------------------------------------------------------
 bool RimViewController::isRangeFilterControlAdvisable() const
 {
-    bool contourMapMasterView  = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
+    bool contourMapMasterView  = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
-    bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
+    bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
     return isRangeFilterControlPossible() && contourMapMasterView != contourMapManagedView;
 }
 
@@ -930,8 +930,8 @@ bool RimViewController::isRangeFilterControlAdvisable() const
 //--------------------------------------------------------------------------------------------------
 bool RimViewController::isPropertyFilterControlAdvisable() const
 {
-    bool contourMapMasterView = dynamic_cast<RimContourMapView*>(masterView()) != nullptr;
+    bool contourMapMasterView = dynamic_cast<RimEclipseContourMapView*>(masterView()) != nullptr;
-    bool contourMapManagedView = dynamic_cast<RimContourMapView*>(managedEclipseView()) != nullptr;
+    bool contourMapManagedView = dynamic_cast<RimEclipseContourMapView*>(managedEclipseView()) != nullptr;
     return isPropertyFilterControlPossible() && contourMapMasterView != contourMapManagedView;
 }
 

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -26,7 +26,7 @@
 #include "RiaRegressionTest.h"
 #include "RiaRegressionTestRunner.h"
 
-#include "RimContourMapView.h"
+#include "RimEclipseContourMapView.h"
 #include "Rim2dIntersectionView.h"
 #include "Rim3dView.h"
 #include "RimCellEdgeColors.h"
@@ -860,7 +860,7 @@ void RiuMainWindow::slotRefreshEditActions()
 void RiuMainWindow::slotRefreshViewActions()
 {
     RimGridView* gridView = RiaApplication::instance()->activeGridView();
-    RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(gridView);
+    RimEclipseContourMapView* view2d = dynamic_cast<RimEclipseContourMapView*>(gridView);
     bool enabled = gridView != nullptr && view2d == nullptr;
     m_viewFromNorth->setEnabled(enabled);
     m_viewFromSouth->setEnabled(enabled);
@@ -1596,7 +1596,7 @@ void RiuMainWindow::slotToggleFaultLabelsAction(bool showLabels)
 void RiuMainWindow::refreshDrawStyleActions()
 {
     RimGridView* gridView = RiaApplication::instance()->activeGridView();
-    RimContourMapView* view2d = dynamic_cast<RimContourMapView*>(gridView);
+    RimEclipseContourMapView* view2d = dynamic_cast<RimEclipseContourMapView*>(gridView);
     bool is2dMap = view2d != nullptr;
     bool is3dGridView = gridView != nullptr && !is2dMap;
 
@@ -1826,7 +1826,7 @@ void RiuMainWindow::slotScaleChanged(int scaleValue)
 void RiuMainWindow::updateScaleValue()
 {
     Rim3dView* view = RiaApplication::instance()->activeReservoirView();
-    bool isRegularReservoirView = view && dynamic_cast<RimContourMapView*>(view) == nullptr;
+    bool isRegularReservoirView = view && dynamic_cast<RimEclipseContourMapView*>(view) == nullptr;
     if (isRegularReservoirView)
     {
         m_scaleFactor->setEnabled(true);