Add surface collection to RimTools

ApplicationLibCode/ProjectDataModel/RimGridView.cpp

@@ -27,7 +27,6 @@
 #include "RimIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
-#include "RimOilField.h"
 #include "RimProject.h"
 #include "RimPropertyFilterCollection.h"
 #include "RimSeismicSectionCollection.h"
@@ -468,8 +467,7 @@ void RimGridView::updateWellMeasurements()
 //--------------------------------------------------------------------------------------------------
 void RimGridView::updateSurfacesInViewTreeItems()
 {
-    RimProject*           proj     = RimProject::current();
-    RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
+    RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
 
     if ( surfColl && surfColl->containsSurface() )
     {

ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp

@@ -19,11 +19,10 @@
 #include "RimSurfaceIntersectionBand.h"
 
 #include "RimAnnotationLineAppearance.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimSurface.h"
 #include "RimSurfaceCollection.h"
 #include "RimSurfaceIntersectionCurve.h"
+#include "RimTools.h"
 
 #include "cafPdmUiDoubleSliderEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
@@ -194,7 +193,7 @@ QList<caf::PdmOptionItemInfo> RimSurfaceIntersectionBand::calculateValueOptions(
 
     if ( fieldNeedingOptions == &m_surfaces )
     {
-        RimSurfaceCollection* surfColl = RimProject::current()->activeOilField()->surfaceCollection();
+        RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
 
         RimSurfaceIntersectionCurve::appendOptionItemsForSources( 0, surfColl, false, options );
     }

ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp

@@ -20,10 +20,9 @@
 
 #include "RimAnnotationLineAppearance.h"
 #include "RimEnsembleSurface.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimSurface.h"
 #include "RimSurfaceCollection.h"
+#include "RimTools.h"
 
 #include "cafPdmUiTreeSelectionEditor.h"
 
@@ -93,7 +92,7 @@ QList<caf::PdmOptionItemInfo> RimSurfaceIntersectionCurve::calculateValueOptions
 
     if ( fieldNeedingOptions == &m_surface1 )
     {
-        RimSurfaceCollection* surfColl = RimProject::current()->activeOilField()->surfaceCollection();
+        RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
 
         appendOptionItemsForSources( 0, surfColl, true, options );
     }

ApplicationLibCode/ProjectDataModel/RimTools.cpp

@@ -30,6 +30,7 @@
 #include "RimSeismicData.h"
 #include "RimSeismicDataCollection.h"
 #include "RimSeismicDifferenceData.h"
+#include "RimSurfaceCollection.h"
 #include "RimWellLogFile.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
@@ -467,6 +468,15 @@ RimWellPath* RimTools::firstWellPath()
     return nullptr;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimSurfaceCollection* RimTools::surfaceCollection()
+{
+    RimProject* proj = RimProject::current();
+    return proj->activeOilField()->surfaceCollection();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimTools.h

@@ -37,6 +37,7 @@ class PdmOptionItemInfo;
 class RimWellPathCollection;
 class RimCase;
 class RimWellPath;
+class RimSurfaceCollection;
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -66,6 +67,8 @@ public:
     static RimWellPathCollection* wellPathCollection();
     static RimWellPath*           firstWellPath();
 
+    static RimSurfaceCollection* surfaceCollection();
+
     static void timeStepsForCase( RimCase* gridCase, QList<caf::PdmOptionItemInfo>* options );
 
 private:

ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicView.cpp

@@ -24,8 +24,6 @@
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
 #include "RimLegendConfig.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSeismicDataInterface.h"
 #include "RimSeismicSection.h"
@@ -469,8 +467,7 @@ void RimSeismicView::updateGridBoxData()
 //--------------------------------------------------------------------------------------------------
 void RimSeismicView::updateSurfacesInViewTreeItems()
 {
-    RimProject*           proj     = RimProject::current();
-    RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
+    RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
 
     if ( surfColl && surfColl->containsSurface() )
     {