diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 223eb84f17..bad93553a7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1739,6 +1739,8 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin uiTreeOrdering.add( cellEdgeResult() ); uiTreeOrdering.add( faultResultSettings() ); uiTreeOrdering.add( &m_intersectionResultDefCollection ); + uiTreeOrdering.add( &m_surfaceResultDefCollection ); + uiTreeOrdering.add( wellCollection() ); uiTreeOrdering.add( &m_wellMeasurementCollection ); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index 5bc5582631..bc43a441ee 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -914,6 +914,7 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin uiTreeOrdering.add( cellResult() ); uiTreeOrdering.add( m_tensorResults() ); uiTreeOrdering.add( &m_intersectionResultDefCollection ); + uiTreeOrdering.add( &m_surfaceResultDefCollection ); uiTreeOrdering.add( &m_wellMeasurementCollection ); uiTreeOrdering.add( m_intersectionCollection() ); diff --git a/ApplicationCode/ProjectDataModel/RimGridView.cpp b/ApplicationCode/ProjectDataModel/RimGridView.cpp index f69d007875..abe316dd9e 100644 --- a/ApplicationCode/ProjectDataModel/RimGridView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGridView.cpp @@ -87,6 +87,15 @@ RimGridView::RimGridView() m_intersectionResultDefCollection.uiCapability()->setUiTreeHidden( true ); m_intersectionResultDefCollection = new RimIntersectionResultsDefinitionCollection; + CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection, + "ReservoirSurfaceResultDefColl", + "Separate Surface Results", + "", + "", + "" ); + m_surfaceResultDefCollection.uiCapability()->setUiTreeHidden( true ); + m_surfaceResultDefCollection = new RimIntersectionResultsDefinitionCollection; + CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection", "", "", "" ); m_gridCollection.uiCapability()->setUiHidden( true ); m_gridCollection = new RimGridCollection(); @@ -208,6 +217,14 @@ RimIntersectionResultsDefinitionCollection* RimGridView::separateIntersectionRes return m_intersectionResultDefCollection; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimIntersectionResultsDefinitionCollection* RimGridView::separateSurfaceResultsCollection() const +{ + return m_surfaceResultDefCollection; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimGridView.h b/ApplicationCode/ProjectDataModel/RimGridView.h index 1637b3990a..f0603f489e 100644 --- a/ApplicationCode/ProjectDataModel/RimGridView.h +++ b/ApplicationCode/ProjectDataModel/RimGridView.h @@ -50,6 +50,7 @@ public: RimIntersectionCollection* intersectionCollection() const; RimSurfaceInViewCollection* surfaceInViewCollection() const; RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const; + RimIntersectionResultsDefinitionCollection* separateSurfaceResultsCollection() const; RimAnnotationInViewCollection* annotationCollection() const; RimWellMeasurementInViewCollection* measurementCollection() const; @@ -96,6 +97,7 @@ protected: caf::PdmChildField m_intersectionCollection; caf::PdmChildField m_intersectionResultDefCollection; + caf::PdmChildField m_surfaceResultDefCollection; caf::PdmChildField m_overlayInfoConfig; caf::PdmChildField m_rangeFilterCollection; diff --git a/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp b/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp index 5b36e1d93c..7219a72810 100644 --- a/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp +++ b/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp @@ -61,11 +61,6 @@ QString RimSurfaceInView::name() const return ""; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSurfaceInView::loadDataAndUpdate() {} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.h b/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.h index 0a74e13401..e8f7ff1fe2 100644 --- a/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.h +++ b/ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInView.h @@ -36,8 +36,6 @@ public: RimSurfaceInView(); ~RimSurfaceInView() override; - void loadDataAndUpdate(); - QString name() const; RimSurface* surface() const; void setSurface( RimSurface* surf );