#8099 Result Mapping: Move result definitions into sub folders

ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp

@@ -27,6 +27,7 @@
 #include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
+#include "RimEclipseFaultColors.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseView.h"
 #include "RimFaultInView.h"
@@ -317,6 +318,14 @@ void RimFaultInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
     {
         uiTreeOrdering.add( &m_faultRASettings );
     }
+
+    RimEclipseView* eclipseView = nullptr;
+    this->firstAncestorOfType( eclipseView );
+    if ( eclipseView )
+    {
+        auto uiTree = eclipseView->faultResultSettings()->uiTreeOrdering();
+        uiTreeOrdering.appendChild( uiTree );
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp

@@ -1934,7 +1934,6 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
     uiTreeOrdering.add( cellResult() );
     uiTreeOrdering.add( cellEdgeResult() );
     uiTreeOrdering.add( elementVectorResult() );
-    uiTreeOrdering.add( faultResultSettings() );
 
     if ( m_streamlineCollection->shouldBeAvailable() ) uiTreeOrdering.add( &m_streamlineCollection );
 

ApplicationLibCode/ProjectDataModel/RimGridView.cpp

@@ -520,26 +520,6 @@ void RimGridView::clearReservoirCellVisibilities()
 //--------------------------------------------------------------------------------------------------
 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 )

ApplicationLibCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -25,6 +25,9 @@
 #include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
+#include "RimIntersectionResultDefinition.h"
+#include "RimIntersectionResultsDefinitionCollection.h"
 #include "RimSimWellInView.h"
 
 #include "Riu3DMainWindowTools.h"
@@ -32,7 +35,7 @@
 #include "RivBoxIntersectionPartMgr.h"
 #include "RivExtrudedCurveIntersectionPartMgr.h"
 
-#include "RimIntersectionResultDefinition.h"
+#include "cafPdmUiTreeOrdering.h"
 #include "cvfModelBasicList.h"
 
 CAF_PDM_SOURCE_INIT( RimIntersectionCollection, "CrossSectionCollection" );
@@ -71,6 +74,22 @@ caf::PdmFieldHandle* RimIntersectionCollection::objectToggleField()
     return &isActive;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimIntersectionCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
+                                                      QString                 uiConfigName /*= "" */ )
+{
+    RimGridView* gridView = nullptr;
+    this->firstAncestorOfType( gridView );
+    if ( gridView )
+    {
+        auto uiTree = gridView->separateIntersectionResultsCollection()->uiTreeOrdering();
+
+        uiTreeOrdering.appendChild( uiTree );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimIntersectionCollection.h

@@ -83,6 +83,7 @@ public:
 protected:
     void                 fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     caf::PdmFieldHandle* objectToggleField() override;
+    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
 
 private:
     caf::PdmChildArrayField<RimExtrudedCurveIntersection*> m_intersections;

ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp

@@ -21,6 +21,7 @@
 #include "RimEnsembleSurface.h"
 #include "RimGridView.h"
 #include "RimIntersectionResultDefinition.h"
+#include "RimIntersectionResultsDefinitionCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimSurface.h"
@@ -30,6 +31,7 @@
 
 #include "RivSurfacePartMgr.h"
 
+#include "cafPdmUiTreeOrdering.h"
 #include "cvfModelBasicList.h"
 
 CAF_PDM_SOURCE_INIT( RimSurfaceInViewCollection, "SurfaceInViewCollection" );
@@ -78,6 +80,26 @@ caf::PdmFieldHandle* RimSurfaceInViewCollection::userDescriptionField()
     return &m_collectionName;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSurfaceInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
+                                                       QString                 uiConfigName /*= ""*/ )
+{
+    RimGridView* gridView = nullptr;
+    this->firstAncestorOfType( gridView );
+
+    RimSurfaceInViewCollection* surfViewColl = nullptr;
+    this->firstAncestorOfType( surfViewColl );
+
+    if ( gridView && !surfViewColl )
+    {
+        auto uiTree = gridView->separateSurfaceResultsCollection()->uiTreeOrdering();
+
+        uiTreeOrdering.appendChild( uiTree );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h

@@ -72,6 +72,9 @@ protected:
     void                 initAfterRead() override;
     caf::PdmFieldHandle* userDescriptionField() override;
 
+
+    void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
+
 private:
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;