(#395) Hide master view in property view, use view icons in tree view

ApplicationCode/ProjectDataModel/RimLinkedViews.cpp

@@ -46,12 +46,14 @@ CAF_PDM_SOURCE_INIT(RimLinkedViews, "RimLinkedViews");
 //--------------------------------------------------------------------------------------------------
 RimLinkedViews::RimLinkedViews(void)
 {
-    CAF_PDM_InitObject("Linked Views", ":/chain.png", "", "");
+    CAF_PDM_InitObject("Linked Views", "", "", "");
 
-    CAF_PDM_InitField(&name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
+    CAF_PDM_InitField(&m_name, "Name", QString("View Group Name"), "View Group Name", "", "", "");
+    m_name.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitFieldNoDefault(&mainView, "MainView", "Main View", "", "", "");
-    mainView.uiCapability()->setUiChildrenHidden(true);
+    CAF_PDM_InitFieldNoDefault(&m_mainView, "MainView", "Main View", "", "", "");
+    m_mainView.uiCapability()->setUiChildrenHidden(true);
+    m_mainView.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&viewConfigs, "ManagedViews", "Managed Views", "", "", "");
     viewConfigs.uiCapability()->setUiHidden(true);
@@ -75,13 +77,13 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
         return;
     }
 
-    if (sourceView && sourceView != mainView)
+    if (sourceView && sourceView != m_mainView)
     {
-        mainView->viewer()->setCurrentFrame(timeStep);
+        m_mainView->viewer()->setCurrentFrame(timeStep);
     }
     else
     {
-        mainView->viewer()->setCurrentFrame(timeStep);
+        m_mainView->viewer()->setCurrentFrame(timeStep);
     }
 
     for (size_t i = 0; i < viewConfigs.size(); i++)
@@ -102,7 +104,7 @@ void RimLinkedViews::updateTimeStep(RimView* sourceView, int timeStep)
 //--------------------------------------------------------------------------------------------------
 void RimLinkedViews::updateCellResult()
 {
-    RimView* rimView = mainView;
+    RimView* rimView = m_mainView;
     RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
     if (masterEclipseView && masterEclipseView->cellResult())
     {
@@ -238,7 +240,7 @@ void RimLinkedViews::configureOverrides()
 //--------------------------------------------------------------------------------------------------
 void RimLinkedViews::allViewsForCameraSync(std::vector<RimView*>& views)
 {
-    views.push_back(mainView());
+    views.push_back(m_mainView());
 
     for (size_t i = 0; i < viewConfigs.size(); i++)
     {
@@ -257,7 +259,7 @@ void RimLinkedViews::applyAllOperations()
     configureOverrides();
 
     updateCellResult();
-    updateTimeStep(NULL, mainView->currentTimeStep());
+    updateTimeStep(NULL, m_mainView->currentTimeStep());
     updateRangeFilters();
     updatePropertyFilters();
 }
@@ -269,7 +271,7 @@ QList<caf::PdmOptionItemInfo> RimLinkedViews::calculateValueOptions(const caf::P
 {
     QList<caf::PdmOptionItemInfo> optionList;
 
-    if (fieldNeedingOptions == &mainView)
+    if (fieldNeedingOptions == &m_mainView)
     {
         RimProject* proj = RiaApplication::instance()->project();
         std::vector<RimView*> views;
@@ -335,14 +337,20 @@ RimManagedViewConfig* RimLinkedViews::viewConfigForView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimLinkedViews::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimLinkedViews::setMainView(RimView* view)
 {
-    if (changedField == &mainView)
-    {
-        for (size_t i = 0; i < viewConfigs.size(); i++)
-        {
-            viewConfigs[i]->updateViewChanged();
-            viewConfigs[i]->updateConnectedEditors();
-        }
-    }
+    m_mainView = view;
+
+    m_name = displayNameForView(view);
+
+    this->uiCapability()->setUiIcon(view->uiCapability()->uiIcon());
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimView* RimLinkedViews::mainView()
+{
+    return m_mainView;
+}
+

ApplicationCode/ProjectDataModel/RimLinkedViews.h

@@ -42,8 +42,8 @@ public:
     RimLinkedViews(void);
     virtual ~RimLinkedViews(void);
 
-    caf::PdmPtrField<RimView*> mainView;
-    caf::PdmField<QString> name;
+    void     setMainView(RimView* view);
+    RimView* mainView();
 
     caf::PdmChildArrayField<RimManagedViewConfig*> viewConfigs;
 
@@ -64,8 +64,12 @@ public:
     RimManagedViewConfig* viewConfigForView(RimView* view);
 
 protected:
-    virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
     virtual QList<caf::PdmOptionItemInfo>   calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
-    virtual caf::PdmFieldHandle*            userDescriptionField()  { return &name; }
+    virtual caf::PdmFieldHandle*            userDescriptionField()  { return &m_name; }
     virtual void                            defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
+
+private:
+    caf::PdmPtrField<RimView*>  m_mainView;
+    caf::PdmField<QString>      m_name;
+
 };

ApplicationCode/ProjectDataModel/RimManagedViewConfig.cpp

@@ -48,8 +48,8 @@ RimManagedViewConfig::RimManagedViewConfig(void)
     CAF_PDM_InitField(&name, "Name", defaultName, "Managed View Name", "", "", "");
     name.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitFieldNoDefault(&managedView, "ManagedView", "Managed View", "", "", "");
-    managedView.uiCapability()->setUiChildrenHidden(true);
+    CAF_PDM_InitFieldNoDefault(&m_managedView, "ManagedView", "Managed View", "", "", "");
+    m_managedView.uiCapability()->setUiChildrenHidden(true);
 
     CAF_PDM_InitField(&syncCamera,          "SyncCamera", true,         "Sync Camera", "", "", "");
     CAF_PDM_InitField(&syncTimeStep,        "SyncTimeStep", true,       "Sync Time Step", "", "", "");
@@ -72,7 +72,7 @@ QList<caf::PdmOptionItemInfo> RimManagedViewConfig::calculateValueOptions(const
 {
     QList<caf::PdmOptionItemInfo> optionList;
 
-    if (fieldNeedingOptions == &managedView)
+    if (fieldNeedingOptions == &m_managedView)
     {
         RimProject* proj = RiaApplication::instance()->project();
         std::vector<RimView*> views;
@@ -113,15 +113,15 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
 {
     if (changedField == &syncCamera && syncCamera())
     {
-        if (managedView && managedView->viewer()) managedView->viewer()->update();
+        if (m_managedView && m_managedView->viewer()) m_managedView->viewer()->update();
     }
     else if (changedField == &syncTimeStep && syncTimeStep())
     {
-        if (managedView)
+        if (m_managedView)
         {
             RimLinkedViews* linkedViews = NULL;
             this->firstAnchestorOrThisOfType(linkedViews);
-            linkedViews->updateTimeStep(managedView, managedView->currentTimeStep());
+            linkedViews->updateTimeStep(m_managedView, m_managedView->currentTimeStep());
         }
     }
     else if (changedField == &syncCellResult && syncCellResult())
@@ -138,11 +138,11 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
     {
         configureOverridesUpdateDisplayModel();
     }
-    else if (changedField == &managedView)
+    else if (changedField == &m_managedView)
     {
         configureOverridesUpdateDisplayModel();
 
-        if (managedView)
+        if (m_managedView)
         {
             if (syncCellResult())
             {
@@ -151,7 +151,7 @@ void RimManagedViewConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedFi
                 linkedViews->updateCellResult();
             }
 
-            name = RimLinkedViews::displayNameForView(managedView);
+            name = RimLinkedViews::displayNameForView(m_managedView);
         }
 
         PdmObjectHandle* prevValue = oldValue.value<caf::PdmPointer<PdmObjectHandle> >().rawPtr();
@@ -200,7 +200,7 @@ void RimManagedViewConfig::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 RimEclipseView* RimManagedViewConfig::managedEclipseView()
 {
-    RimView* rimView = managedView;
+    RimView* rimView = m_managedView;
 
     return dynamic_cast<RimEclipseView*>(rimView);
 }
@@ -210,7 +210,7 @@ RimEclipseView* RimManagedViewConfig::managedEclipseView()
 //--------------------------------------------------------------------------------------------------
 RimGeoMechView* RimManagedViewConfig::managedGeoView()
 {
-    RimView* rimView = managedView;
+    RimView* rimView = m_managedView;
 
     return dynamic_cast<RimGeoMechView*>(rimView);
 }
@@ -222,9 +222,9 @@ void RimManagedViewConfig::configureOverridesUpdateDisplayModel()
 {
     configureOverrides();
 
-    if (managedView)
+    if (m_managedView)
     {
-        managedView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews();
+        m_managedView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews();
     }
 
     RimEclipseView* eclipseView = managedEclipseView();
@@ -250,15 +250,15 @@ void RimManagedViewConfig::configureOverrides()
 
     RimView* masterView = linkedViews->mainView();
 
-    if (managedView)
+    if (m_managedView)
     {
         if (syncRangeFilters)
         {
-            managedView->setOverrideRangeFilterCollection(masterView->rangeFilterCollection());
+            m_managedView->setOverrideRangeFilterCollection(masterView->rangeFilterCollection());
         }
         else
         {
-            managedView->setOverrideRangeFilterCollection(NULL);
+            m_managedView->setOverrideRangeFilterCollection(NULL);
         }
 
         RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(masterView);
@@ -342,9 +342,9 @@ void RimManagedViewConfig::updateViewChanged()
 //--------------------------------------------------------------------------------------------------
 void RimManagedViewConfig::updateDisplayName()
 {
-    if (managedView)
+    if (m_managedView)
     {
-        name = RimLinkedViews::displayNameForView(managedView);
+        name = RimLinkedViews::displayNameForView(m_managedView);
     }
     else
     {
@@ -352,3 +352,21 @@ void RimManagedViewConfig::updateDisplayName()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimView* RimManagedViewConfig::managedView()
+{
+    return m_managedView;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimManagedViewConfig::setManagedView(RimView* view)
+{
+    m_managedView = view;
+
+    this->uiCapability()->setUiIcon(view->uiCapability()->uiIcon());
+}
+

ApplicationCode/ProjectDataModel/RimManagedViewConfig.h

@@ -41,8 +41,9 @@ public:
 
     caf::PdmField<QString>      name;
 
-    caf::PdmPtrField<RimView*>  managedView;
-    
+    RimView*                    managedView();
+    void                        setManagedView(RimView* view);
+
     caf::PdmField<bool>         syncCamera;
     caf::PdmField<bool>         syncTimeStep;
     caf::PdmField<bool>         syncCellResult;
@@ -66,4 +67,6 @@ private:
 
     RimEclipseView* managedEclipseView();
     RimGeoMechView* managedGeoView();
+
+    caf::PdmPtrField<RimView*>  m_managedView;
 };