Refactor: improve api for views and oil fields.

ApplicationLibCode/Application/RiaApplication.cpp

@@ -690,9 +690,7 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
     }
 
     {
-        std::vector<Rim3dView*> views;
+        std::vector<Rim3dView*> views = m_project->allViews();
-        m_project->allViews( views );
-
         for ( auto view : views )
         {
             if ( auto eclipseView = dynamic_cast<RimEclipseView*>( view ) )

ApplicationLibCode/Commands/CompletionCommands/RicNewValveTemplateFeature.cpp

@@ -50,9 +50,7 @@ void RicNewValveTemplateFeature::selectValveTemplateAndUpdate( RimValveTemplate*
 
     RimProject* project = RimProject::current();
 
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = project->allVisibleViews();
-    project->allVisibleViews( views );
-
     for ( Rim3dView* view : views )
     {
         if ( dynamic_cast<RimEclipseView*>( view ) )

ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp

@@ -74,9 +74,7 @@ QList<caf::PdmOptionItemInfo> RicHoloLensExportToFolderUi::calculateValueOptions
 
     if ( fieldNeedingOptions == &m_viewForExport )
     {
-        std::vector<RimGridView*> visibleViews;
+        std::vector<RimGridView*> visibleViews = RimProject::current()->allVisibleGridViews();
-        RimProject::current()->allVisibleGridViews( visibleViews );
-
         for ( RimGridView* v : visibleViews )
         {
             RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName( v, &options );

ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp

@@ -277,10 +277,8 @@ caf::PdmScriptResponse RicExportContourMapToTextFeature::execute()
     RimProject* proj = app->project();
     CAF_ASSERT( proj );
 
-    std::vector<Rim3dView*> allViews;
+    std::vector<Rim3dView*> allViews = proj->allViews();
-    proj->allViews( allViews );
+    Rim3dView*              myView   = nullptr;
-
-    Rim3dView* myView = nullptr;
     for ( auto view : allViews )
     {
         if ( m_viewId == view->id() )

ApplicationLibCode/Commands/RicWellMeasurementImportTools.cpp

@@ -102,8 +102,7 @@ void RicWellMeasurementImportTools::importWellMeasurementsFromFiles( const QStri
     auto proj = RimProject::current();
     if ( proj )
     {
-        std::vector<Rim3dView*> views;
+        std::vector<Rim3dView*> views = proj->allViews();
-        proj->allViews( views );
         for ( auto& view : views )
         {
             RimGridView* gridView = dynamic_cast<RimGridView*>( view );

ApplicationLibCode/Commands/SeismicCommands/RicNewSeismicViewFeature.cpp

@@ -85,8 +85,7 @@ RimSeismicView* RicNewSeismicViewFeature::createInitialViewIfNeeded( RimSeismicD
 {
     auto proj = RimProject::current();
 
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allViews();
-    proj->allViews( views );
     if ( !views.empty() ) return nullptr;
 
     return createSeismicView( seisData );

ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp

@@ -44,15 +44,13 @@ bool RicLinkVisibleViewsFeature::isCommandEnabled() const
     RimProject* proj = RimProject::current();
     if ( !proj ) return false;
 
-    std::vector<Rim3dView*> visibleViews;
-    proj->allVisibleViews( visibleViews );
-
     std::vector<Rim3dView*> linkedviews;
     if ( proj->viewLinkerCollection() && proj->viewLinkerCollection()->viewLinker() )
     {
         linkedviews = proj->viewLinkerCollection()->viewLinker()->allViews();
     }
 
+    std::vector<Rim3dView*> visibleViews = proj->allVisibleViews();
     if ( visibleViews.size() >= 2 && ( linkedviews.size() < visibleViews.size() ) )
     {
         return !findLinkableVisibleViews().empty();
@@ -88,9 +86,7 @@ std::vector<Rim3dView*> RicLinkVisibleViewsFeature::findLinkableVisibleViews()
 
     std::vector<Rim3dView*> views;
 
-    std::vector<Rim3dView*> candidates;
+    std::vector<Rim3dView*> candidates = proj->allVisibleViews();
-    proj->allVisibleViews( candidates );
-
     for ( auto gridView : candidates )
     {
         if ( gridView && !gridView->assosiatedViewLinker() ) views.push_back( gridView );

ApplicationLibCode/Commands/WellPathCommands/RicNewPolylineTargetFeature.cpp

@@ -133,8 +133,7 @@ void RicNewPolylineTargetFeature::onActionTriggered( bool isChecked )
         }
         else
         {
-            std::vector<RimGridView*> gridViews;
+            std::vector<RimGridView*> gridViews = RimProject::current()->allVisibleGridViews();
-            RimProject::current()->allVisibleGridViews( gridViews );
             if ( !gridViews.empty() )
             {
                 auto minPos = gridViews.front()->ownerCase()->allCellsBoundingBox().min();

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp

@@ -132,9 +132,7 @@ std::vector<Rim3dView*> RimAnnotationCollectionBase::viewsContainingAnnotations(
     RimProject* project = RimProject::current();
     if ( !project ) return {};
 
-    std::vector<Rim3dView*> views;
+    return project->allViews();
-    project->allViews( views );
-    return views;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp

@@ -316,8 +316,7 @@ void RimFractureTemplateCollection::onChildDeleted( caf::PdmChildArrayFieldHandl
         proj->scheduleCreateDisplayModelAndRedrawAllViews();
     }
 
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allVisibleViews();
-    proj->allVisibleViews( views );
     for ( Rim3dView* visibleView : views )
     {
         if ( dynamic_cast<RimEclipseView*>( visibleView ) )

ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonCollection.cpp

@@ -189,8 +189,7 @@ void RimPolygonCollection::updateViewTreeItems()
     RimProject* proj = RimProject::current();
 
     // Make sure the tree items are synchronized
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allViews();
-    proj->allViews( views );
     for ( auto view : views )
     {
         view->updateViewTreeItems( RiaDefines::ItemIn3dView::POLYGON );

ApplicationLibCode/ProjectDataModel/Rim3dView.cpp

@@ -197,9 +197,7 @@ Rim3dView::~Rim3dView()
 
     if ( auto proj = RimProject::current() )
     {
-        std::vector<Rim3dView*> allViews;
+        std::vector<Rim3dView*> allViews = proj->allViews();
-        proj->allViews( allViews );
-
         for ( auto v : allViews )
         {
             if ( v->activeComparisonView() == this )
@@ -591,8 +589,7 @@ std::vector<Rim3dView*> Rim3dView::validComparisonViews() const
 {
     auto isIntersectionView = []( const Rim3dView* view ) { return dynamic_cast<const Rim2dIntersectionView*>( view ) != nullptr; };
 
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = RimProject::current()->allViews();
-    RimProject::current()->allViews( views );
 
     std::vector<Rim3dView*> validComparisonViews;
     for ( auto view : views )

ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp

@@ -344,9 +344,6 @@ QList<caf::PdmOptionItemInfo> RimGridCalculation::calculateValueOptions( const c
     {
         options.push_back( caf::PdmOptionItemInfo( "Disabled", nullptr ) );
 
-        std::vector<Rim3dView*> views;
-        RimProject::current()->allViews( views );
-
         RimEclipseCase* firstEclipseCase = nullptr;
         if ( !inputCases().empty() )
         {
@@ -361,6 +358,7 @@ QList<caf::PdmOptionItemInfo> RimGridCalculation::calculateValueOptions( const c
 
         if ( firstEclipseCase )
         {
+            std::vector<Rim3dView*> views = RimProject::current()->allViews();
             for ( auto* view : views )
             {
                 auto eclipseView = dynamic_cast<RimEclipseView*>( view );

ApplicationLibCode/ProjectDataModel/RimProject.cpp

@@ -737,16 +737,17 @@ RimSummaryCaseMainCollection* RimProject::firstSummaryCaseMainCollection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimProject::allNotLinkedViews( std::vector<Rim3dView*>& views )
+std::vector<Rim3dView*> RimProject::allNotLinkedViews() const
 {
-    std::vector<RimCase*> cases = allGridCases();
-
     std::vector<Rim3dView*> alreadyLinkedViews;
     if ( viewLinkerCollection->viewLinker() )
     {
         alreadyLinkedViews = viewLinkerCollection->viewLinker()->allViews();
     }
 
+    std::vector<Rim3dView*> views;
+
+    std::vector<RimCase*> cases = allGridCases();
     for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
     {
         RimCase* rimCase = cases[caseIdx];
@@ -773,15 +774,18 @@ void RimProject::allNotLinkedViews( std::vector<Rim3dView*>& views )
             }
         }
     }
+
+    return views;
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimProject::allViews( std::vector<Rim3dView*>& views ) const
+std::vector<Rim3dView*> RimProject::allViews() const
 {
-    std::vector<RimCase*> cases = allGridCases();
+    std::vector<Rim3dView*> views;
 
+    std::vector<RimCase*> cases = allGridCases();
     for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
     {
         RimCase* rimCase = cases[caseIdx];
@@ -808,15 +812,18 @@ void RimProject::allViews( std::vector<Rim3dView*>& views ) const
             views.push_back( seisview );
         }
     }
+
+    return views;
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimProject::allVisibleViews( std::vector<Rim3dView*>& views ) const
+std::vector<Rim3dView*> RimProject::allVisibleViews() const
 {
-    std::vector<RimCase*> cases = allGridCases();
+    std::vector<Rim3dView*> views;
 
+    std::vector<RimCase*> cases = allGridCases();
     for ( size_t caseIdx = 0; caseIdx < cases.size(); caseIdx++ )
     {
         RimCase* rimCase = cases[caseIdx];
@@ -831,20 +838,24 @@ void RimProject::allVisibleViews( std::vector<Rim3dView*>& views ) const
             }
         }
     }
+
+    return views;
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimProject::allVisibleGridViews( std::vector<RimGridView*>& views ) const
+std::vector<RimGridView*> RimProject::allVisibleGridViews() const
 {
-    std::vector<Rim3dView*> visibleViews;
+    std::vector<RimGridView*> views;
-    allVisibleViews( visibleViews );
+    std::vector<Rim3dView*>   visibleViews = allVisibleViews();
     for ( Rim3dView* view : visibleViews )
     {
         RimGridView* gridView = dynamic_cast<RimGridView*>( view );
         if ( gridView ) views.push_back( gridView );
     }
+
+    return views;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -878,13 +889,9 @@ void RimProject::scheduleCreateDisplayModelAndRedrawAllViews()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimProject::allOilFields( std::vector<RimOilField*>& allOilFields ) const
+std::vector<RimOilField*> RimProject::allOilFields() const
 {
-    allOilFields.clear();
+    return oilFields.childrenByType();
-    for ( const auto& oilField : oilFields )
-    {
-        allOilFields.push_back( oilField );
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1176,8 +1183,7 @@ std::vector<RimTextAnnotation*> RimProject::textAnnotations() const
     }
 
     // 'Local' text annotations
-    std::vector<RimGridView*> visibleViews;
+    std::vector<RimGridView*> visibleViews = allVisibleGridViews();
-    allVisibleGridViews( visibleViews );
     for ( const auto& view : visibleViews )
     {
         std::vector<RimAnnotationInViewCollection*> annotationColls = view->descendantsIncludingThisOfType<RimAnnotationInViewCollection>();
@@ -1263,9 +1269,7 @@ std::vector<RimGeoMechCase*> RimProject::geoMechCases() const
 std::vector<RimFractureTemplateCollection*> RimProject::allFractureTemplateCollections() const
 {
     std::vector<RimFractureTemplateCollection*> templColls;
-    std::vector<RimOilField*>                   rimOilFields;
+    std::vector<RimOilField*>                   rimOilFields = allOilFields();
-
-    allOilFields( rimOilFields );
     for ( RimOilField* oilField : rimOilFields )
     {
         templColls.push_back( oilField->fractureDefinitionCollection() );
@@ -1295,9 +1299,7 @@ std::vector<RimFractureTemplate*> RimProject::allFractureTemplates() const
 std::vector<RimValveTemplateCollection*> RimProject::allValveTemplateCollections() const
 {
     std::vector<RimValveTemplateCollection*> templColls;
-    std::vector<RimOilField*>                rimOilFields;
+    std::vector<RimOilField*>                rimOilFields = allOilFields();
-
-    allOilFields( rimOilFields );
     for ( RimOilField* oilField : rimOilFields )
     {
         templColls.push_back( oilField->valveTemplateCollection() );

ApplicationLibCode/ProjectDataModel/RimProject.h

@@ -137,18 +137,18 @@ public:
     std::vector<RimSummaryCaseCollection*> summaryGroups() const;
     RimSummaryCaseMainCollection*          firstSummaryCaseMainCollection() const;
 
-    void allViews( std::vector<Rim3dView*>& views ) const;
+    [[nodiscard]] std::vector<Rim3dView*>   allViews() const;
-    void allVisibleViews( std::vector<Rim3dView*>& views ) const;
+    [[nodiscard]] std::vector<Rim3dView*>   allVisibleViews() const;
-    void allVisibleGridViews( std::vector<RimGridView*>& views ) const;
+    [[nodiscard]] std::vector<RimGridView*> allVisibleGridViews() const;
-    void allNotLinkedViews( std::vector<Rim3dView*>& views );
+    [[nodiscard]] std::vector<Rim3dView*>   allNotLinkedViews() const;
 
     void scheduleCreateDisplayModelAndRedrawAllViews();
 
     void computeUtmAreaOfInterest();
 
-    void               allOilFields( std::vector<RimOilField*>& allOilFields ) const;
+    [[nodiscard]] std::vector<RimOilField*> allOilFields() const;
-    RimOilField*       activeOilField();
+    RimOilField*                            activeOilField();
-    const RimOilField* activeOilField() const;
+    const RimOilField*                      activeOilField() const;
 
     void actionsBasedOnSelection( QMenu& contextMenu );
 

ApplicationLibCode/ProjectDataModel/RimViewController.cpp

@@ -108,9 +108,8 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions( const ca
 
     if ( fieldNeedingOptions == &m_managedView )
     {
-        RimProject*             proj = RimProject::current();
+        RimProject*             proj  = RimProject::current();
-        std::vector<Rim3dView*> views;
+        std::vector<Rim3dView*> views = proj->allNotLinkedViews();
-        proj->allNotLinkedViews( views );
 
         // Add currently linked view to list
         if ( managedView() )

ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicDataCollection.cpp

@@ -109,10 +109,8 @@ void RimSeismicDataCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* ch
 //--------------------------------------------------------------------------------------------------
 void RimSeismicDataCollection::updateViews()
 {
-    RimProject*               proj = RimProject::current();
+    RimProject*               proj  = RimProject::current();
-    std::vector<RimGridView*> views;
+    std::vector<RimGridView*> views = proj->allVisibleGridViews();
-    proj->allVisibleGridViews( views );
-
     for ( auto view : views )
     {
         view->scheduleCreateDisplayModelAndRedraw();
@@ -127,8 +125,7 @@ void RimSeismicDataCollection::updateTreeForAllViews()
     RimProject* proj = RimProject::current();
     if ( proj != nullptr )
     {
-        std::vector<RimGridView*> views;
+        std::vector<RimGridView*> views = proj->allVisibleGridViews();
-        proj->allVisibleGridViews( views );
         for ( auto view : views )
         {
             view->updateAllRequiredEditors();

ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp

@@ -132,8 +132,7 @@ void RimStimPlanModelTemplateCollection::onChildDeleted( caf::PdmChildArrayField
         proj->scheduleCreateDisplayModelAndRedrawAllViews();
     }
 
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allVisibleViews();
-    proj->allVisibleViews( views );
     for ( Rim3dView* visibleView : views )
     {
         if ( dynamic_cast<RimEclipseView*>( visibleView ) )

ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp

@@ -298,8 +298,7 @@ void RimSurfaceCollection::updateViews( const std::vector<RimSurface*>& surfsToR
     RimProject* proj = RimProject::current();
 
     // Make sure the tree items are synchronized
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allViews();
-    proj->allViews( views );
     for ( auto view : views )
     {
         view->updateViewTreeItems( RiaDefines::ItemIn3dView::SURFACE );
@@ -347,9 +346,8 @@ void RimSurfaceCollection::updateViews( const std::vector<RimSurface*>& surfsToR
 //--------------------------------------------------------------------------------------------------
 void RimSurfaceCollection::updateViews()
 {
-    RimProject*             proj = RimProject::current();
+    RimProject*             proj  = RimProject::current();
-    std::vector<Rim3dView*> views;
+    std::vector<Rim3dView*> views = proj->allViews();
-    proj->allViews( views );
 
     // Make sure the tree items are synchronized
 

ApplicationLibCode/UserInterface/RiuSelectionChangedHandler.cpp

@@ -325,8 +325,7 @@ void RiuSelectionChangedHandler::scheduleUpdateForAllVisibleViews() const
     RimProject* proj = RimProject::current();
     if ( proj )
     {
-        std::vector<Rim3dView*> visibleViews;
+        std::vector<Rim3dView*> visibleViews = proj->allVisibleViews();
-        proj->allVisibleViews( visibleViews );
 
         for ( size_t i = 0; i < visibleViews.size(); i++ )
         {

ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp

@@ -552,10 +552,8 @@ QList<caf::PdmOptionItemInfo>
 {
     QList<caf::PdmOptionItemInfo> options;
 
-    RimProject*               proj = RimProject::current();
+    RimProject*               proj      = RimProject::current();
-    std::vector<RimOilField*> oilFields;
+    std::vector<RimOilField*> oilFields = proj->allOilFields();
-
-    proj->allOilFields( oilFields );
     for ( RimOilField* oilField : oilFields )
     {
         RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection();