Replace RimTools::wellPathCollection() with RimWellPathCollection::instance()

ApplicationLibCode/Application/RiaGuiApplication.cpp

@@ -85,7 +85,6 @@
 #include "RimSummaryPlot.h"
 #include "RimTextAnnotation.h"
 #include "RimTextAnnotationInView.h"
-#include "RimTools.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
 #include "RimWellLogLasFile.h"
@@ -1495,7 +1494,7 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences*
     {
         std::vector<RimViewWindow*> allViewWindows = project()->descendantsIncludingThisOfType<RimViewWindow>();
 
-        RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+        RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
 
         bool existingViewsWithDifferentMeshLines = false;
         bool existingViewsWithCustomColors       = false;

ApplicationLibCode/Application/Tools/RiaExtractionTools.cpp

@@ -25,7 +25,6 @@
 #include "RimEclipseCase.h"
 #include "RimMainPlotCollection.h"
 #include "RimSimWellInView.h"
-#include "RimTools.h"
 #include "RimWellLogPlotCollection.h"
 #include "RimWellPathCollection.h"
 
@@ -49,7 +48,7 @@ RigEclipseWellLogExtractor* RiaExtractionTools::findOrCreateWellLogExtractor( co
 {
     if ( !eclipseCase ) return nullptr;
 
-    if ( auto wellPathCollection = RimTools::wellPathCollection() )
+    if ( auto wellPathCollection = RimWellPathCollection::instance() )
     {
         auto wellPath = wellPathCollection->tryFindMatchingWellPath( wellName );
         return RiaExtractionTools::findOrCreateWellLogExtractor( wellPath, eclipseCase );

ApplicationLibCode/Commands/CompletionCommands/RicFishbonesCreateHelper.cpp

@@ -24,7 +24,6 @@
 #include "RimFishbones.h"
 #include "RimFishbonesCollection.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -98,7 +97,7 @@ void RicFishbonesCreateHelper::finalizeFishbonesCreation( RimFishbones* fishbone
 {
     RicNewFishbonesSubsFeature::adjustWellPathScaling( fishbonesCollection );
 
-    if ( auto wellPathCollection = RimTools::wellPathCollection() )
+    if ( auto wellPathCollection = RimWellPathCollection::instance() )
     {
         wellPathCollection->uiCapability()->updateConnectedEditors();
     }

ApplicationLibCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp

@@ -30,7 +30,6 @@
 #include "RimFishbones.h"
 #include "RimFishbonesCollection.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathCompletions.h"
@@ -170,7 +169,7 @@ bool RicNewFishbonesSubsFeature::isCommandEnabled() const
 void RicNewFishbonesSubsFeature::adjustWellPathScaling( RimFishbonesCollection* fishboneCollection )
 {
     CVF_ASSERT( fishboneCollection );
-    RimWellPathCollection* wellPathColl = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathColl = RimWellPathCollection::instance();
 
     if ( wellPathColl->wellPathRadiusScaleFactor > 0.05 )
     {

ApplicationLibCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp

@@ -24,7 +24,6 @@
 #include "RimPerforationCollection.h"
 #include "RimPerforationInterval.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -57,7 +56,7 @@ void RicNewPerforationIntervalAtMeasuredDepthFeature::onActionTriggered( bool is
 
     wellPath->perforationIntervalCollection()->appendPerforation( perforationInterval );
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
 
     wellPathCollection->uiCapability()->updateConnectedEditors();
     wellPathCollection->scheduleRedrawAffectedViews();

ApplicationLibCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp

@@ -25,7 +25,6 @@
 
 #include "RimPerforationCollection.h"
 #include "RimPerforationInterval.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathCompletions.h"
@@ -61,7 +60,7 @@ void RicNewPerforationIntervalFeature::onActionTriggered( bool isChecked )
 
     perforationCollection->appendPerforation( perforationInterval );
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
     if ( !wellPathCollection ) return;
 
     wellPathCollection->uiCapability()->updateConnectedEditors();

ApplicationLibCode/Commands/CompletionCommands/RicNewValveAtMeasuredDepthFeature.cpp

@@ -23,7 +23,6 @@
 #include "RimPerforationCollection.h"
 #include "RimPerforationInterval.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimValveCollection.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
@@ -79,7 +78,7 @@ void RicNewValveAtMeasuredDepthFeature::onActionTriggered( bool isChecked )
 
     if ( valve )
     {
-        RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+        RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
 
         wellPathCollection->uiCapability()->updateConnectedEditors();
         wellPathCollection->scheduleRedrawAffectedViews();

ApplicationLibCode/Commands/CompletionCommands/RicNewValveFeature.cpp

@@ -5,7 +5,6 @@
 
 #include "RimPerforationInterval.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimValveCollection.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
@@ -101,7 +100,7 @@ void RicNewValveFeature::onActionTriggered( bool isChecked )
 
     if ( valve )
     {
-        if ( auto wellPathCollection = RimTools::wellPathCollection() )
+        if ( auto wellPathCollection = RimWellPathCollection::instance() )
         {
             wellPathCollection->updateConnectedEditors();
             wellPathCollection->scheduleRedrawAffectedViews();

ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp

@@ -37,7 +37,6 @@
 #include "RimMeshFractureTemplate.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathCompletions.h"
@@ -207,8 +206,7 @@ std::vector<RimWellPath*> RicWellPathFractureTextReportFeatureImpl::wellPathsWit
 {
     std::vector<RimWellPath*> wellPaths;
 
-    auto* wellPathColl = RimTools::wellPathCollection();
-    if ( wellPathColl )
+    if ( auto* wellPathColl = RimWellPathCollection::instance() )
     {
         for ( const auto& wellPath : wellPathColl->allWellPaths() )
         {

ApplicationLibCode/Commands/EclipseCommands/EclipseWell/RicCreateWellPathFromSimulationWellFeature.cpp

@@ -27,7 +27,6 @@
 #include "RimProject.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathGeometryDef.h"
@@ -90,7 +89,7 @@ void RicCreateWellPathFromSimulationWellFeature::onActionTriggered( bool isCheck
     RimProject* project = RimProject::current();
     if ( !project ) return;
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
     if ( !wellPathCollection ) return;
 
     std::vector<RimWellPath*> newWellPaths;

ApplicationLibCode/Commands/FractureCommands/RicNewWellPathStimPlanModelAtPosFeature.cpp

@@ -23,7 +23,6 @@
 #include "RicNewStimPlanModelFeature.h"
 
 #include "RimEclipseView.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -44,7 +43,7 @@ void RicNewWellPathStimPlanModelAtPosFeature::onActionTriggered( bool isChecked
     RimWellPath* wellPath = wellPathItem->m_wellpath;
     if ( !wellPath ) return;
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
     if ( !wellPathCollection ) return;
 
     RimEclipseView* activeView  = dynamic_cast<RimEclipseView*>( RiaApplication::instance()->activeGridView() );

ApplicationLibCode/Commands/RicWellMeasurementImportTools.cpp

@@ -23,7 +23,6 @@
 #include "Rim3dView.h"
 #include "RimGridView.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellMeasurement.h"
 #include "RimWellMeasurementCollection.h"
 #include "RimWellMeasurementFilePath.h"
@@ -168,5 +167,5 @@ RimWellPathCollection* RicWellMeasurementImportTools::selectedWellPathCollection
         return caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPathCollection>();
     }
 
-    return RimTools::wellPathCollection();
+    return RimWellPathCollection::instance();
 }

ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp

@@ -34,7 +34,6 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellBoreStabilityPlot.h"
 #include "RimWellLogChannel.h"
 #include "RimWellLogExtractionCurve.h"
@@ -357,7 +356,7 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore
         curve->updateCurveName();
     }
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
 
     const RimWellMeasurementCollection* measurementCollection = wellPathCollection->measurementCollection();
     for ( QString wbsMeasurementKind : RimWellMeasurement::measurementKindsForWellBoreStability() )

ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp

@@ -23,7 +23,6 @@
 #include "RicWellLogPlotCurveFeatureImpl.h"
 #include "RicWellLogTools.h"
 
-#include "RimTools.h"
 #include "RimWellLogChannel.h"
 #include "RimWellLogLasFile.h"
 #include "RimWellLogLasFileCurve.h"
@@ -93,7 +92,7 @@ void RicNewWellLogFileCurveFeature::setupActionLook( QAction* actionToSetup )
 //--------------------------------------------------------------------------------------------------
 bool RicNewWellLogFileCurveFeature::wellLogsAvailable()
 {
-    auto wellPathCollection = RimTools::wellPathCollection();
+    auto wellPathCollection = RimWellPathCollection::instance();
     if ( wellPathCollection )
     {
         for ( auto wellPath : wellPathCollection->allWellPaths() )

ApplicationLibCode/Commands/WellLogCommands/RicNewWellMeasurementCurveFeature.cpp

@@ -20,7 +20,6 @@
 #include "RicWellLogPlotCurveFeatureImpl.h"
 #include "RicWellLogTools.h"
 
-#include "RimTools.h"
 #include "RimWellLogTrack.h"
 #include "RimWellMeasurement.h"
 #include "RimWellMeasurementCollection.h"
@@ -54,8 +53,7 @@ void RicNewWellMeasurementCurveFeature::onActionTriggered( bool isChecked )
     {
         RimWellPath* wellPath = nullptr;
 
-        RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
-        if ( wellPathCollection )
+        if ( auto wellPathCollection = RimWellPathCollection::instance() )
         {
             const RimWellMeasurementCollection* measurementCollection = wellPathCollection->measurementCollection();
 

ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLaterals.cpp

@@ -24,7 +24,6 @@
 
 #include "RimModeledWellPath.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathCompletions.h"
 #include "RimWellPathGeometryDef.h"
@@ -140,8 +139,7 @@ void RicCreateMultipleWellPathLaterals::slotAppendFractures()
     auto sourceLocationOfFirstWellTarget = sourceLateral->geometryDefinition()->firstActiveTarget()->targetPointXYZ();
     auto sourceTieInMeasuredDepth        = sourceLateral->wellPathTieIn()->tieInMeasuredDepth();
 
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
-    if ( wellPathCollection )
+    if ( auto wellPathCollection = RimWellPathCollection::instance() )
     {
         for ( auto measuredDepth : m_ui->locationConfig()->locations() )
         {

ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp

@@ -24,7 +24,6 @@
 #include "Well/RigWellPath.h"
 
 #include "RimModeledWellPath.h"
-#include "RimTools.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathTieIn.h"
 
@@ -61,7 +60,7 @@ void RicCreateMultipleWellPathLateralsUi::setTopLevelWellPath( RimWellPath* well
 {
     m_topLevelWellPath = wellPath;
 
-    auto laterals = RimTools::wellPathCollection()->connectedWellPathLaterals( m_topLevelWellPath );
+    auto laterals = RimWellPathCollection::instance()->connectedWellPathLaterals( m_topLevelWellPath );
 
     if ( !laterals.empty() ) m_sourceLateral = dynamic_cast<RimModeledWellPath*>( laterals.front() );
 }
@@ -115,7 +114,7 @@ QList<caf::PdmOptionItemInfo> RicCreateMultipleWellPathLateralsUi::calculateValu
     {
         if ( m_topLevelWellPath )
         {
-            auto laterals = RimTools::wellPathCollection()->connectedWellPathLaterals( m_topLevelWellPath );
+            auto laterals = RimWellPathCollection::instance()->connectedWellPathLaterals( m_topLevelWellPath );
 
             for ( auto lateral : laterals )
             {

ApplicationLibCode/Commands/WellPathCommands/RicDeleteWellPathFeature.cpp

@@ -18,7 +18,6 @@
 
 #include "RicDeleteWellPathFeature.h"
 
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -45,7 +44,7 @@ void RicDeleteWellPathFeature::onActionTriggered( bool isChecked )
     const auto wellPaths = caf::SelectionManager::instance()->objectsByType<RimWellPath>();
     if ( !wellPaths.empty() )
     {
-        auto wpc = RimTools::wellPathCollection();
+        auto wpc = RimWellPathCollection::instance();
 
         for ( auto w : wellPaths )
         {

ApplicationLibCode/Commands/WellPathCommands/RicDuplicateWellPathFeature.cpp

@@ -24,7 +24,6 @@
 
 #include "RimModeledWellPath.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathGeometryDef.h"
 
@@ -71,7 +70,7 @@ RimWellPath* RicDuplicateWellPathFeature::duplicateWellPath( RimWellPath* wellPa
     if ( wellPath == nullptr ) return nullptr;
 
     RimProject*            project            = RimProject::current();
-    RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathCollection = RimWellPathCollection::instance();
     if ( project && wellPathCollection )
     {
         auto newModeledWellPath = wellPath->copyObject<RimModeledWellPath>();

ApplicationLibCode/Commands/WellPathCommands/RicHideGridGeometryFeature.cpp

@@ -26,7 +26,6 @@
 #include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 #include "RimSimWellInViewCollection.h"
-#include "RimTools.h"
 #include "WellPath/RimWellPathCollection.h"
 
 #include "RiuMainWindow.h"
@@ -83,7 +82,7 @@ void RicHideGridGeometryFeature::onActionTriggered( bool isChecked )
     gridView->scheduleCreateDisplayModelAndRedraw();
 
     // Force all well paths visible
-    if ( auto wellPathColl = RimTools::wellPathCollection() )
+    if ( auto wellPathColl = RimWellPathCollection::instance() )
     {
         wellPathColl->isActive           = true;
         wellPathColl->wellPathVisibility = RimWellPathCollection::FORCE_ALL_ON;

ApplicationLibCode/Commands/WellPathCommands/RicNewEditableWellPathFeature.cpp

@@ -27,7 +27,6 @@
 #include "RimModeledWellPath.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathGeometryDef.h"
@@ -36,6 +35,8 @@
 
 #include "cafSelectionManager.h"
 
+#include "cvfBoundingBox.h"
+
 #include <QAction>
 
 CAF_CMD_SOURCE_INIT( RicNewEditableWellPathFeature, "RicNewEditableWellPathFeature" );
@@ -71,8 +72,7 @@ void RicNewEditableWellPathFeature::onActionTriggered( bool isChecked )
     RimProject* project = RimProject::current();
     if ( project && RimProject::current()->activeOilField() )
     {
-        RimWellPathCollection* wellPathCollection = RimTools::wellPathCollection();
-        if ( wellPathCollection )
+        if ( auto wellPathCollection = RimWellPathCollection::instance() )
         {
             std::vector<RimWellPath*> newWellPaths;
             auto                      newModeledWellPath = new RimModeledWellPath();

ApplicationLibCode/Commands/WellPathCommands/RicNewWellPathLateralAtDepthFeature.cpp

@@ -26,7 +26,6 @@
 #include "RimFishbonesCollection.h"
 #include "RimModeledWellPath.h"
 #include "RimProject.h"
-#include "RimTools.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathGeometryDef.h"
@@ -83,7 +82,7 @@ void RicNewWellPathLateralAtDepthFeature::setupActionLook( QAction* actionToSetu
 RimModeledWellPath* RicNewWellPathLateralAtDepthFeature::createLateralAtMeasuredDepth( RimWellPath* parentWellPath, double parentWellMD )
 {
     RimProject*            project      = RimProject::current();
-    RimWellPathCollection* wellPathColl = RimTools::wellPathCollection();
+    RimWellPathCollection* wellPathColl = RimWellPathCollection::instance();
     if ( project && wellPathColl )
     {
         auto newModeledWellPath = new RimModeledWellPath();