#7307 Janitor : Hide empty visualization folders in a 3D view

ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp

@@ -1876,11 +1876,10 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
     uiTreeOrdering.add( cellEdgeResult() );
     uiTreeOrdering.add( elementVectorResult() );
     uiTreeOrdering.add( faultResultSettings() );
-    uiTreeOrdering.add( &m_intersectionResultDefCollection );
+
-    uiTreeOrdering.add( &m_surfaceResultDefCollection );
+    addRequiredUiTreeObjects( uiTreeOrdering );
 
     uiTreeOrdering.add( wellCollection() );
-    uiTreeOrdering.add( &m_wellMeasurementCollection );
 
     {
         bool showFractureColors = false;

ApplicationLibCode/ProjectDataModel/RimGeoMechView.cpp

@@ -959,9 +959,8 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
 
     uiTreeOrdering.add( cellResult() );
     uiTreeOrdering.add( m_tensorResults() );
-    uiTreeOrdering.add( &m_intersectionResultDefCollection );
+
-    uiTreeOrdering.add( &m_surfaceResultDefCollection );
+    addRequiredUiTreeObjects( uiTreeOrdering );
-    uiTreeOrdering.add( &m_wellMeasurementCollection );
 
     uiTreeOrdering.add( m_intersectionCollection() );
     if ( surfaceInViewCollection() ) uiTreeOrdering.add( surfaceInViewCollection() );

ApplicationLibCode/ProjectDataModel/RimGridView.cpp

@@ -25,19 +25,24 @@
 #include "RimEclipseResultDefinition.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGridCollection.h"
+#include "RimIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimPropertyFilterCollection.h"
 #include "RimSurfaceCollection.h"
+#include "RimSurfaceInView.h"
 #include "RimSurfaceInViewCollection.h"
 #include "RimTextAnnotation.h"
+#include "RimTools.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
 #include "RimViewNameConfig.h"
+#include "RimWellMeasurementCollection.h"
 #include "RimWellMeasurementInViewCollection.h"
+#include "RimWellPathCollection.h"
 
 #include "Riu3DMainWindowTools.h"
 #include "Riu3dSelectionManager.h"
@@ -50,6 +55,8 @@
 #include "cvfPart.h"
 #include "cvfScene.h"
 
+#include "cafPdmUiTreeOrdering.h"
+
 #include <set>
 
 CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimGridView, "GenericGridView" ); // Do not use. Abstract class
@@ -508,6 +515,44 @@ void RimGridView::clearReservoirCellVisibilities()
     m_currentReservoirCellVisibility = nullptr;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimGridView::addRequiredUiTreeObjects( caf::PdmUiTreeOrdering& uiTreeOrdering )
+{
+    {
+        std::vector<RimIntersection*> intersections;
+
+        this->descendantsIncludingThisOfType( intersections );
+        if ( !intersections.empty() )
+        {
+            uiTreeOrdering.add( &m_intersectionResultDefCollection );
+        }
+    }
+
+    {
+        std::vector<RimSurfaceInView*> surfaces;
+
+        this->descendantsIncludingThisOfType( surfaces );
+        if ( !surfaces.empty() )
+        {
+            uiTreeOrdering.add( &m_surfaceResultDefCollection );
+        }
+    }
+
+    {
+        RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+        if ( wellPathCollection )
+        {
+            const RimWellMeasurementCollection* measurementCollection = wellPathCollection->measurementCollection();
+            if ( !measurementCollection->measurements().empty() )
+            {
+                uiTreeOrdering.add( &m_wellMeasurementCollection );
+            }
+        }
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimGridView.h

@@ -79,6 +79,7 @@ protected:
     void               selectOverlayInfoConfig() override;
     RimGridCollection* gridCollection() const;
     void               clearReservoirCellVisibilities();
+    void               addRequiredUiTreeObjects( caf::PdmUiTreeOrdering& uiTreeOrdering );
 
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     void initAfterRead() override;