Rename of class names and files related to linked views

ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp

@@ -23,10 +23,10 @@
 
 #include "RicLinkVisibleViewsFeatureUi.h"
 
-#include "RimLinkedViews.h"
+#include "RimLinkedView.h"
-#include "RimManagedViewConfig.h"
 #include "RimProject.h"
 #include "RimView.h"
+#include "RimViewLinker.h"
 
 #include "RiuMainWindow.h"
 
@@ -78,7 +78,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
     if (propertyDialog.exec() != QDialog::Accepted) return;
 
     RimView* masterView = featureUi.masterView();
-    RimLinkedViews* linkedViews = new RimLinkedViews;
+    RimViewLinker* linkedViews = new RimViewLinker;
     linkedViews->setMainView(masterView);
 
     for (size_t i = 0; i < views.size(); i++)
@@ -86,10 +86,10 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
         RimView* rimView = views[i];
         if (rimView == masterView) continue;
 
-        RimManagedViewConfig* viewConfig = new RimManagedViewConfig;
+        RimLinkedView* viewConfig = new RimLinkedView;
         viewConfig->setManagedView(rimView);
 
-        linkedViews->viewConfigs.push_back(viewConfig);
+        linkedViews->linkedViews.push_back(viewConfig);
 
         viewConfig->initAfterReadRecursively();
         viewConfig->updateViewChanged();
@@ -126,7 +126,7 @@ void RicLinkVisibleViewsFeature::allLinkedViews(std::vector<RimView*>& views)
     RimProject* proj = RiaApplication::instance()->project();
     for (size_t i = 0; i < proj->linkedViews().size(); i++)
     {
-        RimLinkedViews* linkedViews = proj->linkedViews()[i];
+        RimViewLinker* linkedViews = proj->linkedViews()[i];
         linkedViews->allViews(views);
     }
 }

ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.cpp

@@ -22,8 +22,8 @@
 #include "RiaApplication.h"
 
 #include "RimCase.h"
-#include "RimLinkedViews.h"
 #include "RimView.h"
+#include "RimViewLinker.h"
 
 CAF_PDM_SOURCE_INIT(RicLinkVisibleViewsFeatureUi, "RicLinkVisibleViewsFeatureUi");
 
@@ -91,7 +91,7 @@ QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOption
             }
 
 
-            optionList.push_back(caf::PdmOptionItemInfo(RimLinkedViews::displayNameForView(m_allViews[i]), 
+            optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(m_allViews[i]), 
                 QVariant::fromValue(caf::PdmPointer<PdmObjectHandle>(m_allViews[i])),
                 false,
                 icon));

ApplicationCode/Commands/RicShowAllLinkedViewsFeature.cpp

@@ -19,9 +19,9 @@
 
 #include "RicShowAllLinkedViewsFeature.h"
 
-#include "RimLinkedViews.h"
+#include "RimLinkedView.h"
-#include "RimManagedViewConfig.h"
 #include "RimView.h"
+#include "RimViewLinker.h"
 
 #include "cafSelectionManager.h"
 
@@ -42,14 +42,14 @@ bool RicShowAllLinkedViewsFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicShowAllLinkedViewsFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimLinkedViews*> linkedViews;
+    std::vector<RimViewLinker*> linkedViews;
     caf::SelectionManager::instance()->objectsByType(&linkedViews);
 
-    std::vector<RimManagedViewConfig*> managedViews;
+    std::vector<RimLinkedView*> managedViews;
     caf::SelectionManager::instance()->objectsByType(&managedViews);
     for (size_t i = 0; i < managedViews.size(); i++)
     {
-        RimLinkedViews* rimLinked = NULL;
+        RimViewLinker* rimLinked = NULL;
         managedViews[i]->firstAnchestorOrThisOfType(rimLinked);
 
         linkedViews.push_back(rimLinked);

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -59,13 +59,13 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.h
 ${CEE_CURRENT_LIST_DIR}RimView.h
 ${CEE_CURRENT_LIST_DIR}RimCase.h
 ${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.h
-${CEE_CURRENT_LIST_DIR}RimManagedViewConfig.h
+${CEE_CURRENT_LIST_DIR}RimLinkedView.h
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrace.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.h
-${CEE_CURRENT_LIST_DIR}RimLinkedViews.h
+${CEE_CURRENT_LIST_DIR}RimViewLinker.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
 )
 
@@ -124,13 +124,13 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.cpp
 ${CEE_CURRENT_LIST_DIR}RimView.cpp
 ${CEE_CURRENT_LIST_DIR}RimCase.cpp
 ${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.cpp
-${CEE_CURRENT_LIST_DIR}RimManagedViewConfig.cpp
+${CEE_CURRENT_LIST_DIR}RimLinkedView.cpp
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrace.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.cpp
-${CEE_CURRENT_LIST_DIR}RimLinkedViews.cpp
+${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
 )
 

ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp

@@ -31,8 +31,8 @@
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
-#include "RimLinkedViews.h"
 #include "RimProject.h"
+#include "RimViewLinker.h"
 
 #include "cafPdmUiEditorHandle.h"
 
@@ -159,10 +159,10 @@ void RimCellRangeFilterCollection::updateDisplayModeNotifyManagedViews()
     RimProject* proj = NULL;
     view->firstAnchestorOrThisOfType(proj);
 
-    RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(view);
+    RimViewLinker* viewLinker = proj->findViewLinkerFromView(view);
-    if (linkedViews)
+    if (viewLinker)
     {
-        linkedViews->updateRangeFilters();
+        viewLinker->updateRangeFilters();
     }
 }
 

ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp

@@ -23,8 +23,8 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
-#include "RimLinkedViews.h"
 #include "RimProject.h"
+#include "RimViewLinker.h"
 
 #include "cafPdmUiEditorHandle.h"
 
@@ -149,9 +149,9 @@ void RimEclipsePropertyFilterCollection::updateDisplayModelNotifyManagedViews()
     RimProject* proj = NULL;
     view->firstAnchestorOrThisOfType(proj);
 
-    RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(view);
+    RimViewLinker* viewLinker = proj->findViewLinkerFromView(view);
-    if (linkedViews)
+    if (viewLinker)
     {
-        linkedViews->updatePropertyFilters();
+        viewLinker->updatePropertyFilters();
     }
 }

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -30,11 +30,11 @@
 #include "RimEclipseView.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimView.h"
+#include "RimProject.h"
+#include "RimViewLinker.h"
+#include "RimWellLogPlotCurve.h"
 
 #include "cafPdmUiListEditor.h"
-#include "RimProject.h"
-#include "RimLinkedViews.h"
-#include "RimWellLogPlotCurve.h"
 
 CAF_PDM_SOURCE_INIT(RimEclipseResultDefinition, "ResultDefinition");
 
@@ -159,10 +159,10 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
                 RimProject* proj = NULL;
                 view->firstAnchestorOrThisOfType(proj);
 
-                RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(view);
+                RimViewLinker* viewLinker = proj->findViewLinkerFromView(view);
-                if (linkedViews)
+                if (viewLinker)
                 {
-                    linkedViews->updateCellResult();
+                    viewLinker->updateCellResult();
                 }
             }
         }

ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp

@@ -23,9 +23,9 @@
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechView.h"
 #include "RimProject.h"
+#include "RimViewLinker.h"
 
 #include "cvfAssert.h"
-#include "RimLinkedViews.h"
 
 
 CAF_PDM_SOURCE_INIT(RimGeoMechPropertyFilterCollection, "GeoMechPropertyFilters");
@@ -151,9 +151,9 @@ void RimGeoMechPropertyFilterCollection::updateDisplayModelNotifyManagedViews()
     RimProject* proj = NULL;
     view->firstAnchestorOrThisOfType(proj);
 
-    RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(view);
+    RimViewLinker* viewLinker = proj->findViewLinkerFromView(view);
-    if (linkedViews)
+    if (viewLinker)
     {
-        linkedViews->updatePropertyFilters();
+        viewLinker->updatePropertyFilters();
     }
 }

ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp

@@ -30,13 +30,13 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechView.h"
+#include "RimProject.h"
+#include "RimViewLinker.h"
+#include "RimWellLogPlotCurve.h"
 
 #include "RiuMainWindow.h"
 
 #include "cafPdmUiListEditor.h"
-#include "RimProject.h"
-#include "RimLinkedViews.h"
-#include "RimWellLogPlotCurve.h"
 
 namespace caf {
 
@@ -198,10 +198,10 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
                     RimProject* proj = NULL;
                     view->firstAnchestorOrThisOfType(proj);
 
-                    RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(view);
+                    RimViewLinker* viewLinker = proj->findViewLinkerFromView(view);
-                    if (linkedViews)
+                    if (viewLinker)
                     {
-                        linkedViews->updateCellResult();
+                        viewLinker->updateCellResult();
                     }
                 }
             }

ApplicationCode/ProjectDataModel/RimLinkedView.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimManagedViewConfig.h"
+#include "RimLinkedView.h"
 
 #include "RiaApplication.h"
 
@@ -27,20 +27,20 @@
 #include "RimEclipseView.h"
 #include "RimGeoMechPropertyFilterCollection.h"
 #include "RimGeoMechView.h"
-#include "RimLinkedViews.h"
 #include "RimProject.h"
 #include "RimView.h"
+#include "RimViewLinker.h"
 
 #include "RiuViewer.h"
 
 #include "cafPdmUiTreeOrdering.h"
 
 
-CAF_PDM_SOURCE_INIT(RimManagedViewConfig, "RimManagedViewConfig");
+CAF_PDM_SOURCE_INIT(RimLinkedView, "RimManagedViewConfig");
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimManagedViewConfig::RimManagedViewConfig(void)
+RimLinkedView::RimLinkedView(void)
 {
     CAF_PDM_InitObject("View Config", ":/ReservoirView.png", "", "");
 
@@ -61,14 +61,14 @@ RimManagedViewConfig::RimManagedViewConfig(void)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimManagedViewConfig::~RimManagedViewConfig(void)
+RimLinkedView::~RimLinkedView(void)
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
+QList<caf::PdmOptionItemInfo> RimLinkedView::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
 {
     QList<caf::PdmOptionItemInfo> optionList;
 
@@ -84,7 +84,7 @@ QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const
             views.push_back(this->managedView());
         }
 
-        RimLinkedViews* linkedViews = NULL;
+        RimViewLinker* linkedViews = NULL;
         this->firstAnchestorOrThisOfType(linkedViews);
 
         for (size_t i = 0; i< views.size(); i++)
@@ -99,7 +99,7 @@ QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const
                     icon = rimCase->uiCapability()->uiIcon();
                 }
 
-                optionList.push_back(caf::PdmOptionItemInfo(RimLinkedViews::displayNameForView(views[i]),
+                optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(views[i]),
                     QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(views[i])),
                     false,
                     icon));
@@ -118,7 +118,7 @@ QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
+void RimLinkedView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
 {
     uiTreeOrdering.setForgetRemainingFields(true);
 }
@@ -126,11 +126,11 @@ void RimManagedViewConfig::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOr
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimLinkedView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (changedField == &syncCamera && syncCamera())
     {
-        RimLinkedViews* linkedViews = NULL;
+        RimViewLinker* linkedViews = NULL;
         this->firstAnchestorOrThisOfType(linkedViews);
         linkedViews->updateScaleZ(linkedViews->mainView(), linkedViews->mainView()->scaleZ());
 
@@ -143,14 +143,14 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
     {
         if (m_managedView)
         {
-            RimLinkedViews* linkedViews = NULL;
+            RimViewLinker* linkedViews = NULL;
             this->firstAnchestorOrThisOfType(linkedViews);
             linkedViews->updateTimeStep(m_managedView, m_managedView->currentTimeStep());
         }
     }
     else if (changedField == &syncCellResult && syncCellResult())
     {
-        RimLinkedViews* linkedViews = NULL;
+        RimViewLinker* linkedViews = NULL;
         this->firstAnchestorOrThisOfType(linkedViews);
         linkedViews->updateCellResult();
     }
@@ -168,7 +168,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
 
         if (m_managedView)
         {
-            RimLinkedViews* linkedViews = NULL;
+            RimViewLinker* linkedViews = NULL;
             this->firstAnchestorOrThisOfType(linkedViews);
 
             if (syncCellResult())
@@ -180,7 +180,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
                 m_managedView->notifyCameraHasChanged();
             }
 
-            name = RimLinkedViews::displayNameForView(m_managedView);
+            name = RimViewLinker::displayNameForView(m_managedView);
         }
 
         PdmObjectHandle* prevValue = oldValue.value<caf::PdmPointer<PdmObjectHandle> >().rawPtr();
@@ -202,7 +202,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
                 geoView->setOverridePropertyFilterCollection(NULL);
             }
 
-            RimLinkedViews* linkedViews = NULL;
+            RimViewLinker* linkedViews = NULL;
             this->firstAnchestorOrThisOfType(linkedViews);
             linkedViews->configureOverrides();
         }
@@ -217,7 +217,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::initAfterRead()
+void RimLinkedView::initAfterRead()
 {
     configureOverrides();
     updateDisplayNameAndIcon();
@@ -227,7 +227,7 @@ void RimManagedViewConfig::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseView* RimManagedViewConfig::managedEclipseView()
+RimEclipseView* RimLinkedView::managedEclipseView()
 {
     RimView* rimView = m_managedView;
 
@@ -237,7 +237,7 @@ RimEclipseView* RimManagedViewConfig::managedEclipseView()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimGeoMechView* RimManagedViewConfig::managedGeoView()
+RimGeoMechView* RimLinkedView::managedGeoView()
 {
     RimView* rimView = m_managedView;
 
@@ -247,7 +247,7 @@ RimGeoMechView* RimManagedViewConfig::managedGeoView()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::configureOverridesUpdateDisplayModel()
+void RimLinkedView::configureOverridesUpdateDisplayModel()
 {
     configureOverrides();
 
@@ -272,9 +272,9 @@ void RimManagedViewConfig::configureOverridesUpdateDisplayModel()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::configureOverrides()
+void RimLinkedView::configureOverrides()
 {
-    RimLinkedViews* linkedViews = NULL;
+    RimViewLinker* linkedViews = NULL;
     this->firstAnchestorOrThisOfType(linkedViews);
 
     RimView* masterView = linkedViews->mainView();
@@ -332,9 +332,9 @@ void RimManagedViewConfig::configureOverrides()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::updateViewChanged()
+void RimLinkedView::updateViewChanged()
 {
-    RimLinkedViews* linkedViews = NULL;
+    RimViewLinker* linkedViews = NULL;
     firstAnchestorOrThisOfType(linkedViews);
     CVF_ASSERT(linkedViews);
 
@@ -374,11 +374,11 @@ void RimManagedViewConfig::updateViewChanged()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::updateDisplayNameAndIcon()
+void RimLinkedView::updateDisplayNameAndIcon()
 {
     if (m_managedView)
     {
-        name = RimLinkedViews::displayNameForView(m_managedView);
+        name = RimViewLinker::displayNameForView(m_managedView);
     }
     else
     {
@@ -400,7 +400,7 @@ void RimManagedViewConfig::updateDisplayNameAndIcon()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimView* RimManagedViewConfig::managedView()
+RimView* RimLinkedView::managedView()
 {
     return m_managedView;
 }
@@ -408,7 +408,7 @@ RimView* RimManagedViewConfig::managedView()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::setManagedView(RimView* view)
+void RimLinkedView::setManagedView(RimView* view)
 {
     m_managedView = view;
 }
@@ -416,7 +416,7 @@ void RimManagedViewConfig::setManagedView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimManagedViewConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimLinkedView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&m_managedView);
 

ApplicationCode/ProjectDataModel/RimLinkedView.h

@@ -31,13 +31,13 @@ class RimGeoMechView;
 ///  
 ///  
 //==================================================================================================
-class RimManagedViewConfig : public caf::PdmObject
+class RimLinkedView : public caf::PdmObject
 {
      CAF_PDM_HEADER_INIT;
 
 public:
-    RimManagedViewConfig(void);
+    RimLinkedView(void);
-    virtual ~RimManagedViewConfig(void);
+    virtual ~RimLinkedView(void);
 
     caf::PdmField<QString>      name;
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -40,16 +40,16 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechModels.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimManagedViewConfig.h"
+#include "RimLinkedView.h"
+#include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimScriptCollection.h"
+#include "RimViewLinker.h"
+#include "RimWellLogPlot.h"
+#include "RimWellLogPlotCollection.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathImport.h"
-#include "RimMainPlotCollection.h"
-#include "RimWellLogPlotCollection.h"
-#include "RimWellLogPlot.h"
-#include "RimLinkedViews.h"
 
 #include "RiuMainWindow.h"
 
@@ -475,7 +475,7 @@ void RimProject::allNotLinkedViews(std::vector<RimView*>& views)
     std::vector<RimView*> alreadyLinkedViews;
     for (size_t i = 0; i < linkedViews().size(); i++)
     {
-        RimLinkedViews* viewLinker = linkedViews()[i];
+        RimViewLinker* viewLinker = linkedViews()[i];
         viewLinker->allViews(alreadyLinkedViews);
     }
 
@@ -791,13 +791,13 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
             commandIds << "RicAddScriptPathFeature";
             commandIds << "RicDeleteScriptPathFeature";
         }
-        else if (dynamic_cast<RimManagedViewConfig*>(uiItem))
+        else if (dynamic_cast<RimLinkedView*>(uiItem))
         {
             commandIds << "RicShowAllLinkedViewsFeature";
             commandIds << "Separator";
             commandIds << "RicDeleteItemFeature";
         }
-        else if (dynamic_cast<RimLinkedViews*>(uiItem))
+        else if (dynamic_cast<RimViewLinker*>(uiItem))
         {
             commandIds << "RicShowAllLinkedViewsFeature";
             commandIds << "Separator";
@@ -962,16 +962,16 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimLinkedViews* RimProject::findLinkedViewsGroupForView(RimView* view)
+RimViewLinker* RimProject::findViewLinkerFromView(RimView* view)
 {
     for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        RimLinkedViews* group = linkedViews[i];
+        RimViewLinker* group = linkedViews[i];
         if (view == group->mainView()) return group;
 
-        for (size_t j = 0; j < group->viewConfigs.size(); j++)
+        for (size_t j = 0; j < group->linkedViews.size(); j++)
         {
-            RimManagedViewConfig* viewConfig = group->viewConfigs[j];
+            RimLinkedView* viewConfig = group->linkedViews[j];
             if (viewConfig->managedView() == view) return group;
         }
     }

ApplicationCode/ProjectDataModel/RimProject.h

@@ -33,7 +33,7 @@ class RimCase;
 class RimCommandObject;
 class RimEclipseCase;
 class RimIdenticalGridCaseGroup;
-class RimLinkedViews;
+class RimViewLinker;
 class RimMainPlotCollection;
 class RimOilField;
 class RimScriptCollection;
@@ -65,7 +65,7 @@ public:
     caf::PdmChildField<RimScriptCollection*>            scriptCollection;
     caf::PdmChildField<RimWellPathImport*>              wellPathImport;
     caf::PdmChildField<RimMainPlotCollection*>          mainPlotCollection;
-    caf::PdmChildArrayField<RimLinkedViews*>            linkedViews;
+    caf::PdmChildArrayField<RimViewLinker*>            linkedViews;
     caf::PdmChildArrayField<RimCommandObject*>          commandObjects;
     caf::PdmField<QString>                              treeViewState;
     caf::PdmField<QString>                              currentModelIndexPath;
@@ -92,7 +92,7 @@ public:
 
     void            actionsBasedOnSelection(QMenu& contextMenu);
 
-    RimLinkedViews* findLinkedViewsGroupForView(RimView* view);
+    RimViewLinker*  findViewLinkerFromView(RimView* view);
     void            recreateMainPlotCollection();
 
 protected:

ApplicationCode/ProjectDataModel/RimView.cpp

@@ -9,10 +9,10 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimLinkedViews.h"
+#include "RimLinkedView.h"
-#include "RimManagedViewConfig.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+#include "RimViewLinker.h"
 #include "RimWellPathCollection.h"
 
 #include "RiuMainWindow.h"
@@ -439,13 +439,13 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
 
             RimProject* proj = NULL;
             this->firstAnchestorOrThisOfType(proj);
-            RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(this);
+            RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
-            if (linkedViews)
+            if (viewLinker)
             {
-                RimManagedViewConfig* viewConf = linkedViews->viewConfigForView(this);
+                RimLinkedView* linkedView = viewLinker->linkedViewFromView(this);
-                if (!viewConf || viewConf->syncCamera())
+                if (!linkedView || linkedView->syncCamera())
                 {
-                    linkedViews->updateScaleZ(this, scaleZ);
+                    viewLinker->updateScaleZ(this, scaleZ);
                 }
             }
 
@@ -477,10 +477,10 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
 
             RimProject* proj = NULL;
             this->firstAnchestorOrThisOfType(proj);
-            RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(this);
+            RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
-            if (linkedViews)
+            if (viewLinker)
             {
-                linkedViews->updateTimeStep(this, m_currentTimeStep);
+                viewLinker->updateTimeStep(this, m_currentTimeStep);
             }
         }
     }
@@ -578,15 +578,15 @@ void RimView::notifyCameraHasChanged()
 
     RimProject* proj = NULL;
     this->firstAnchestorOrThisOfType(proj);
-    RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(this);
+    RimViewLinker* viewLinker = proj->findViewLinkerFromView(this);
-    if (linkedViews)
+    if (viewLinker)
     {
-        RimManagedViewConfig* viewConf = linkedViews->viewConfigForView(this);
+        RimLinkedView* linkedView = viewLinker->linkedViewFromView(this);
 
         // There is no view config for a master view, but all views for sync must be updated
-        if (!viewConf || viewConf->syncCamera())
+        if (!linkedView || linkedView->syncCamera())
         {
-            linkedViews->allViewsForCameraSync(this, viewsToUpdate);
+            viewLinker->allViewsForCameraSync(this, viewsToUpdate);
         }
     }
 

ApplicationCode/ProjectDataModel/RimViewLinker.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimLinkedViews.h"
+#include "RimViewLinker.h"
 
 #include "RiaApplication.h"
 
@@ -28,7 +28,7 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"
-#include "RimManagedViewConfig.h"
+#include "RimLinkedView.h"
 #include "RimProject.h"
 #include "RimView.h"
 
@@ -41,11 +41,11 @@
 
 
 
-CAF_PDM_SOURCE_INIT(RimLinkedViews, "RimLinkedViews");
+CAF_PDM_SOURCE_INIT(RimViewLinker, "RimLinkedViews");
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimLinkedViews::RimLinkedViews(void)
+RimViewLinker::RimViewLinker(void)
 {
     CAF_PDM_InitObject("Linked Views", ":/Reservoir1View.png", "", "");
 
@@ -56,24 +56,24 @@ RimLinkedViews::RimLinkedViews(void)
     m_mainView.uiCapability()->setUiChildrenHidden(true);
     m_mainView.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitFieldNoDefault(&viewConfigs, "ManagedViews", "Managed Views", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&linkedViews, "ManagedViews", "Managed Views", "", "", "");
-    viewConfigs.uiCapability()->setUiHidden(true);
+    linkedViews.uiCapability()->setUiHidden(true);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimLinkedViews::~RimLinkedViews(void)
+RimViewLinker::~RimViewLinker(void)
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
+void RimViewLinker::updateTimeStep(RimView* sourceView, int timeStep)
 {
-    RimManagedViewConfig* sourceViewConfig = viewConfigForView(sourceView);
+    RimLinkedView* sourceLinkedView = linkedViewFromView(sourceView);
-    if (sourceViewConfig && !sourceViewConfig->syncTimeStep())
+    if (sourceLinkedView && !sourceLinkedView->syncTimeStep())
     {
         return;
     }
@@ -84,9 +84,9 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
         m_mainView->viewer()->animationControl()->setCurrentFrameOnly(timeStep);
     }
 
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+        RimLinkedView* managedViewConfig = linkedViews[i];
         if (managedViewConfig->managedView() && managedViewConfig->managedView() != sourceView)
         {
             if (managedViewConfig->syncTimeStep() && managedViewConfig->managedView()->viewer())
@@ -101,7 +101,7 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::updateCellResult()
+void RimViewLinker::updateCellResult()
 {
     RimView* rimView = m_mainView;
     RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
@@ -109,9 +109,9 @@ void RimLinkedViews::updateCellResult()
     {
         RimEclipseResultDefinition* eclipseCellResultDefinition = masterEclipseView->cellResult();
 
-        for (size_t i = 0; i < viewConfigs.size(); i++)
+        for (size_t i = 0; i < linkedViews.size(); i++)
         {
-            RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+            RimLinkedView* managedViewConfig = linkedViews[i];
             if (managedViewConfig->managedView())
             {
                 if (managedViewConfig->syncCellResult())
@@ -134,9 +134,9 @@ void RimLinkedViews::updateCellResult()
     {
         RimGeoMechResultDefinition* geoMechResultDefinition = masterGeoView->cellResult();
 
-        for (size_t i = 0; i < viewConfigs.size(); i++)
+        for (size_t i = 0; i < linkedViews.size(); i++)
         {
-            RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+            RimLinkedView* managedViewConfig = linkedViews[i];
             if (managedViewConfig->managedView())
             {
                 if (managedViewConfig->syncCellResult())
@@ -157,11 +157,11 @@ void RimLinkedViews::updateCellResult()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::updateRangeFilters()
+void RimViewLinker::updateRangeFilters()
 {
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+        RimLinkedView* managedViewConfig = linkedViews[i];
         if (managedViewConfig->managedView())
         {
             if (managedViewConfig->syncRangeFilters())
@@ -192,11 +192,11 @@ void RimLinkedViews::updateRangeFilters()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::updatePropertyFilters()
+void RimViewLinker::updatePropertyFilters()
 {
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+        RimLinkedView* managedViewConfig = linkedViews[i];
         if (managedViewConfig->managedView())
         {
             if (managedViewConfig->syncPropertyFilters())
@@ -225,11 +225,11 @@ void RimLinkedViews::updatePropertyFilters()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::configureOverrides()
+void RimViewLinker::configureOverrides()
 {
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        RimManagedViewConfig* managedViewConfig = viewConfigs[i];
+        RimLinkedView* managedViewConfig = linkedViews[i];
         managedViewConfig->configureOverrides();
     }
 }
@@ -237,18 +237,18 @@ void RimLinkedViews::configureOverrides()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::allViewsForCameraSync(RimView* source, std::vector<RimView*>& views)
+void RimViewLinker::allViewsForCameraSync(RimView* source, std::vector<RimView*>& views)
 {
     if (source != m_mainView())
     {
         views.push_back(m_mainView());
     }
 
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        if (viewConfigs[i]->syncCamera && viewConfigs[i]->managedView() && source != viewConfigs[i]->managedView())
+        if (linkedViews[i]->syncCamera && linkedViews[i]->managedView() && source != linkedViews[i]->managedView())
         {
-            views.push_back(viewConfigs[i]->managedView());
+            views.push_back(linkedViews[i]->managedView());
         }
     }
 }
@@ -256,7 +256,7 @@ void RimLinkedViews::allViewsForCameraSync(RimView* source, std::vector<RimView*
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::applyAllOperations()
+void RimViewLinker::applyAllOperations()
 {
     configureOverrides();
 
@@ -270,7 +270,7 @@ void RimLinkedViews::applyAllOperations()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QString RimLinkedViews::displayNameForView(RimView* view)
+QString RimViewLinker::displayNameForView(RimView* view)
 {
     QString displayName = "None";
 
@@ -288,11 +288,11 @@ QString RimLinkedViews::displayNameForView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
+void RimViewLinker::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
 {
-    for (size_t cIdx = 0; cIdx < viewConfigs.size(); ++cIdx)
+    for (size_t cIdx = 0; cIdx < linkedViews.size(); ++cIdx)
     {
-        PdmObjectHandle* childObject = viewConfigs[cIdx];
+        PdmObjectHandle* childObject = linkedViews[cIdx];
         if (childObject)
         {
             uiTreeOrdering.add(childObject);
@@ -305,11 +305,11 @@ void RimLinkedViews::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimManagedViewConfig* RimLinkedViews::viewConfigForView(RimView* view)
+RimLinkedView* RimViewLinker::linkedViewFromView(RimView* view)
 {
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        if (viewConfigs[i]->managedView() == view) return viewConfigs[i];
+        if (linkedViews[i]->managedView() == view) return linkedViews[i];
     }
 
     return NULL;
@@ -318,7 +318,7 @@ RimManagedViewConfig* RimLinkedViews::viewConfigForView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::setMainView(RimView* view)
+void RimViewLinker::setMainView(RimView* view)
 {
     m_mainView = view;
 
@@ -328,7 +328,7 @@ void RimLinkedViews::setMainView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimView* RimLinkedViews::mainView()
+RimView* RimViewLinker::mainView()
 {
     return m_mainView;
 }
@@ -336,15 +336,15 @@ RimView* RimLinkedViews::mainView()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::allViews(std::vector<RimView*>& views)
+void RimViewLinker::allViews(std::vector<RimView*>& views)
 {
     views.push_back(m_mainView());
 
-    for (size_t i = 0; i < viewConfigs.size(); i++)
+    for (size_t i = 0; i < linkedViews.size(); i++)
     {
-        if (viewConfigs[i]->managedView())
+        if (linkedViews[i]->managedView())
         {
-            views.push_back(viewConfigs[i]->managedView());
+            views.push_back(linkedViews[i]->managedView());
         }
     }
 }
@@ -352,7 +352,7 @@ void RimLinkedViews::allViews(std::vector<RimView*>& views)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::initAfterRead()
+void RimViewLinker::initAfterRead()
 {
     m_name = displayNameForView(m_mainView);
 
@@ -371,7 +371,7 @@ void RimLinkedViews::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::updateScaleZ(RimView* source, double scaleZ)
+void RimViewLinker::updateScaleZ(RimView* source, double scaleZ)
 {
     std::vector<RimView*> views;
     allViewsForCameraSync(source, views);

ApplicationCode/ProjectDataModel/RimViewLinker.h

@@ -26,7 +26,7 @@
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"
 
-class RimManagedViewConfig;
+class RimLinkedView;
 class RiuViewer;
 class RimView;
 
@@ -34,18 +34,18 @@ class RimView;
 ///  
 ///  
 //==================================================================================================
-class RimLinkedViews : public caf::PdmObject
+class RimViewLinker : public caf::PdmObject
 {
      CAF_PDM_HEADER_INIT;
 
 public:
-    RimLinkedViews(void);
+    RimViewLinker(void);
-    virtual ~RimLinkedViews(void);
+    virtual ~RimViewLinker(void);
 
     void     setMainView(RimView* view);
     RimView* mainView();
 
-    caf::PdmChildArrayField<RimManagedViewConfig*> viewConfigs;
+    caf::PdmChildArrayField<RimLinkedView*> linkedViews;
 
     void applyAllOperations();
 
@@ -63,7 +63,7 @@ public:
 
 public:
     static QString  displayNameForView(RimView* view);
-    RimManagedViewConfig* viewConfigForView(RimView* view);
+    RimLinkedView*  linkedViewFromView(RimView* view);
 
 protected:
     virtual caf::PdmFieldHandle*            userDescriptionField()  { return &m_name; }
@@ -73,5 +73,4 @@ protected:
 private:
     caf::PdmPtrField<RimView*>  m_mainView;
     caf::PdmField<QString>      m_name;
-
 };

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -23,9 +23,9 @@
 #include "RiaApplication.h"
 #include "RiaBaseDefs.h"
 
-#include "RimLinkedViews.h"
 #include "RimProject.h"
 #include "RimView.h"
+#include "RimViewLinker.h"
 
 #include "RiuCadNavigation.h"
 #include "RiuGeoQuestNavigation.h"
@@ -261,10 +261,10 @@ void RiuViewer::slotSetCurrentFrame(int frameIndex)
     {
         RimProject* proj = NULL;
         m_reservoirView->firstAnchestorOrThisOfType(proj);
-        RimLinkedViews* linkedViews = proj->findLinkedViewsGroupForView(m_reservoirView);
+        RimViewLinker* viewLinker = proj->findViewLinkerFromView(m_reservoirView);
-        if (linkedViews)
+        if (viewLinker)
         {
-            linkedViews->updateTimeStep(m_reservoirView, frameIndex);
+            viewLinker->updateTimeStep(m_reservoirView, frameIndex);
         }
     }
 }