From 63ff8ec58b115224297dec668bb2c55b9950a540 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Oct 2021 12:10:24 +0200 Subject: [PATCH] #8115 3D View : Simplify objects at top level --- .../ProjectDataModel/GeoMech/RimGeoMechView.cpp | 5 ++--- .../ProjectDataModel/RimEclipseView.cpp | 8 +++----- .../ProjectDataModel/RimGridView.cpp | 12 +++++------- .../RimSimWellInViewCollection.cpp | 15 +++++++++++++++ .../ProjectDataModel/RimSimWellInViewCollection.h | 2 ++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp index c4f6ee4094..7777e39ba5 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp @@ -968,15 +968,14 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin uiTreeOrdering.add( cellResult() ); uiTreeOrdering.add( m_tensorResults() ); + uiTreeOrdering.add( m_cellFilterCollection() ); + uiTreeOrdering.add( m_propertyFilterCollection() ); addRequiredUiTreeObjects( uiTreeOrdering ); uiTreeOrdering.add( m_intersectionCollection() ); if ( surfaceInViewCollection() ) uiTreeOrdering.add( surfaceInViewCollection() ); - uiTreeOrdering.add( m_cellFilterCollection() ); - uiTreeOrdering.add( m_propertyFilterCollection() ); - uiTreeOrdering.skipRemainingChildren( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index 977f12765f..f0f69e79b1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -1933,8 +1933,10 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin uiTreeOrdering.add( cellResult() ); uiTreeOrdering.add( cellEdgeResult() ); - uiTreeOrdering.add( elementVectorResult() ); + uiTreeOrdering.add( cellFilterCollection() ); + uiTreeOrdering.add( m_propertyFilterCollection() ); + uiTreeOrdering.add( elementVectorResult() ); if ( m_streamlineCollection->shouldBeAvailable() ) uiTreeOrdering.add( &m_streamlineCollection ); addRequiredUiTreeObjects( uiTreeOrdering ); @@ -1958,16 +1960,12 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin } } - uiTreeOrdering.add( m_virtualPerforationResult ); - uiTreeOrdering.add( faultCollection() ); uiTreeOrdering.add( annotationCollection() ); uiTreeOrdering.add( intersectionCollection() ); if ( surfaceInViewCollection() ) uiTreeOrdering.add( surfaceInViewCollection() ); - uiTreeOrdering.add( cellFilterCollection() ); - uiTreeOrdering.add( m_propertyFilterCollection() ); uiTreeOrdering.skipRemainingChildren( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp index 0c71654322..ab65326468 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp @@ -515,15 +515,13 @@ void RimGridView::clearReservoirCellVisibilities() //-------------------------------------------------------------------------------------------------- void RimGridView::addRequiredUiTreeObjects( caf::PdmUiTreeOrdering& uiTreeOrdering ) { + RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection(); + if ( wellPathCollection ) { - RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection(); - if ( wellPathCollection ) + const RimWellMeasurementCollection* measurementCollection = wellPathCollection->measurementCollection(); + if ( !measurementCollection->measurements().empty() ) { - const RimWellMeasurementCollection* measurementCollection = wellPathCollection->measurementCollection(); - if ( !measurementCollection->measurements().empty() ) - { - uiTreeOrdering.add( &m_wellMeasurementCollection ); - } + uiTreeOrdering.add( &m_wellMeasurementCollection ); } } } diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index f029b836bb..f87fc208aa 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -37,6 +37,7 @@ #include "RimSimWellFractureCollection.h" #include "RimSimWellInView.h" #include "RimSimWellInViewTools.h" +#include "RimVirtualPerforationResults.h" #include "RimWellAllocationPlot.h" #include "RimWellDiskConfig.h" @@ -50,6 +51,7 @@ #include "cafPdmUiCheckBoxTristateEditor.h" #include "cafPdmUiListEditor.h" #include "cafPdmUiPushButtonEditor.h" +#include "cafPdmUiTreeOrdering.h" #include @@ -591,6 +593,19 @@ QList return options; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSimWellInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, + QString uiConfigName /*= "" */ ) +{ + if ( m_reservoirView && m_reservoirView->virtualPerforationResult() ) + { + auto uiTree = m_reservoirView->virtualPerforationResult()->uiTreeOrdering( uiConfigName ); + uiTreeOrdering.appendChild( uiTree ); + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h index 83489f0df2..44eb6ead02 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h @@ -171,6 +171,8 @@ protected: QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) override; + void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; + caf::PdmFieldHandle* objectToggleField() override; private: