#14101 Rename RimFaultDistanceResult/Collection classes and files to RimFaultDistance/RimFaultDistanceCollection

Carries the "Fault Distance" rename through to the C++ class names, file
names, PDM/scriptable keywords and the Python API (add_fault_distance,
class FaultDistance). The RicNewFaultDistanceResultFeature command class
keeps its name.

ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake

@@ -1,6 +1,6 @@
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceResult.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceResultCollection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistance.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimFaultDistanceCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultReactivationModel.cpp

ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimFaultDistanceResult.h"
+#include "RimFaultDistance.h"
 
 #include "RiaDefines.h"
 
@@ -38,18 +38,18 @@
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
-CAF_PDM_SOURCE_INIT( RimFaultDistanceResult, "RimFaultDistanceResult" );
+CAF_PDM_SOURCE_INIT( RimFaultDistance, "RimFaultDistance" );
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFaultDistanceResult::RimFaultDistanceResult()
+RimFaultDistance::RimFaultDistance()
 {
     CAF_PDM_InitScriptableObjectWithNameAndComment( "Fault Distance",
                                                     ":/draw_style_faults_24x24.png",
                                                     "",
                                                     "",
-                                                    "FaultDistanceResult",
+                                                    "FaultDistance",
                                                     "Per-cell distance to a selected subset of faults" );
 
     CAF_PDM_InitScriptableFieldNoDefault( &m_resultName, "ResultName", "Name" );
@@ -64,7 +64,7 @@ RimFaultDistanceResult::RimFaultDistanceResult()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RimFaultDistanceResult::resultName() const
+QString RimFaultDistance::resultName() const
 {
     return m_resultName();
 }
@@ -72,7 +72,7 @@ QString RimFaultDistanceResult::resultName() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::setResultName( const QString& name )
+void RimFaultDistance::setResultName( const QString& name )
 {
     m_resultName = name;
 }
@@ -80,7 +80,7 @@ void RimFaultDistanceResult::setResultName( const QString& name )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::setSelectedFaults( const std::vector<RimFaultInView*>& faults )
+void RimFaultDistance::setSelectedFaults( const std::vector<RimFaultInView*>& faults )
 {
     m_faults.setValue( faults );
 }
@@ -88,7 +88,7 @@ void RimFaultDistanceResult::setSelectedFaults( const std::vector<RimFaultInView
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<const RigFault*> RimFaultDistanceResult::selectedRigFaults() const
+std::vector<const RigFault*> RimFaultDistance::selectedRigFaults() const
 {
     std::vector<const RigFault*> rigFaults;
     for ( RimFaultInView* fault : m_faults )
@@ -101,7 +101,7 @@ std::vector<const RigFault*> RimFaultDistanceResult::selectedRigFaults() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::compute()
+void RimFaultDistance::compute()
 {
     if ( m_resultName().isEmpty() ) return;
 
@@ -134,7 +134,7 @@ void RimFaultDistanceResult::compute()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
+void RimFaultDistance::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
     if ( changedField == &m_resultName )
     {
@@ -154,7 +154,7 @@ void RimFaultDistanceResult::fieldChangedByUi( const caf::PdmFieldHandle* change
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimFaultDistanceResult::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
+QList<caf::PdmOptionItemInfo> RimFaultDistance::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
 {
     QList<caf::PdmOptionItemInfo> options;
 
@@ -178,7 +178,7 @@ QList<caf::PdmOptionItemInfo> RimFaultDistanceResult::calculateValueOptions( con
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimFaultDistanceResult::userDescriptionField()
+caf::PdmFieldHandle* RimFaultDistance::userDescriptionField()
 {
     return &m_resultName;
 }
@@ -186,7 +186,7 @@ caf::PdmFieldHandle* RimFaultDistanceResult::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
+void RimFaultDistance::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
     uiOrdering.add( &m_resultName );
     uiOrdering.add( &m_faults );
@@ -197,7 +197,7 @@ void RimFaultDistanceResult::defineUiOrdering( QString uiConfigName, caf::PdmUiO
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
+void RimFaultDistance::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
 {
     if ( field == &m_generateButton )
     {
@@ -211,7 +211,7 @@ void RimFaultDistanceResult::defineEditorAttribute( const caf::PdmFieldHandle* f
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::removeGeneratedResult( const QString& name )
+void RimFaultDistance::removeGeneratedResult( const QString& name )
 {
     if ( name.isEmpty() ) return;
 
@@ -230,7 +230,7 @@ void RimFaultDistanceResult::removeGeneratedResult( const QString& name )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResult::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
+void RimFaultDistance::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
 {
     menuBuilder << "RicNewFaultDistanceResultFeature";
 }

ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistance.h

@@ -37,12 +37,12 @@ class CmdFeatureMenuBuilder;
 //==================================================================================================
 ///
 //==================================================================================================
-class RimFaultDistanceResult : public caf::PdmObject
+class RimFaultDistance : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimFaultDistanceResult();
+    RimFaultDistance();
 
     QString resultName() const;
     void    setResultName( const QString& name );

ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.cpp

@@ -16,9 +16,9 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimFaultDistanceResultCollection.h"
+#include "RimFaultDistanceCollection.h"
 
-#include "RimFaultDistanceResult.h"
+#include "RimFaultDistance.h"
 
 #include "cafCmdFeatureMenuBuilder.h"
 #include "cafPdmFieldScriptingCapability.h"
@@ -27,29 +27,29 @@
 
 #include <QRegularExpression>
 
-CAF_PDM_SOURCE_INIT( RimFaultDistanceResultCollection, "RimFaultDistanceResultCollection" );
+CAF_PDM_SOURCE_INIT( RimFaultDistanceCollection, "RimFaultDistanceCollection" );
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFaultDistanceResultCollection::RimFaultDistanceResultCollection()
+RimFaultDistanceCollection::RimFaultDistanceCollection()
 {
     CAF_PDM_InitScriptableObjectWithNameAndComment( "Fault Distance",
                                                     ":/draw_style_faults_24x24.png",
                                                     "",
                                                     "",
-                                                    "FaultDistanceResultCollection",
+                                                    "FaultDistanceCollection",
                                                     "Collection of named, subset-based FAULTDIST results" );
 
-    CAF_PDM_InitScriptableFieldNoDefault( &m_items, "FaultDistanceResults", "" );
+    CAF_PDM_InitScriptableFieldNoDefault( &m_items, "FaultDistances", "" );
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFaultDistanceResult* RimFaultDistanceResultCollection::addResult()
+RimFaultDistance* RimFaultDistanceCollection::addResult()
 {
-    auto* newResult = new RimFaultDistanceResult();
+    auto* newResult = new RimFaultDistance();
     newResult->setResultName( nextDefaultName() );
     addItem( newResult );
     return newResult;
@@ -58,11 +58,11 @@ RimFaultDistanceResult* RimFaultDistanceResultCollection::addResult()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RimFaultDistanceResultCollection::nextDefaultName() const
+QString RimFaultDistanceCollection::nextDefaultName() const
 {
     QRegularExpression pattern( "^FAULTDIST(\\d+)$" );
     int                maxIndex = 0;
-    for ( RimFaultDistanceResult* result : items() )
+    for ( RimFaultDistance* result : items() )
     {
         if ( !result ) continue;
         const QRegularExpressionMatch match = pattern.match( result->resultName() );
@@ -77,9 +77,9 @@ QString RimFaultDistanceResultCollection::nextDefaultName() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResultCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName )
+void RimFaultDistanceCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName )
 {
-    for ( RimFaultDistanceResult* result : items() )
+    for ( RimFaultDistance* result : items() )
     {
         uiTreeOrdering.add( result );
     }
@@ -89,7 +89,7 @@ void RimFaultDistanceResultCollection::defineUiTreeOrdering( caf::PdmUiTreeOrder
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFaultDistanceResultCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
+void RimFaultDistanceCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
 {
     menuBuilder << "RicNewFaultDistanceResultFeature";
 }

ApplicationLibCode/ProjectDataModel/Faults/RimFaultDistanceCollection.h

@@ -22,7 +22,7 @@
 
 #include <QString>
 
-class RimFaultDistanceResult;
+class RimFaultDistance;
 
 namespace caf
 {
@@ -32,15 +32,15 @@ class CmdFeatureMenuBuilder;
 //==================================================================================================
 ///
 //==================================================================================================
-class RimFaultDistanceResultCollection : public caf::PdmObjectCollection<RimFaultDistanceResult>
+class RimFaultDistanceCollection : public caf::PdmObjectCollection<RimFaultDistance>
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimFaultDistanceResultCollection();
+    RimFaultDistanceCollection();
 
-    RimFaultDistanceResult* addResult();
-    QString                 nextDefaultName() const;
+    RimFaultDistance* addResult();
+    QString           nextDefaultName() const;
 
 private:
     void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;

ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp

@@ -61,8 +61,8 @@
 #include "RimEclipseStatisticsCase.h"
 #include "RimEclipseView.h"
 #include "RimEclipseViewCollection.h"
-#include "RimFaultDistanceResult.h"
-#include "RimFaultDistanceResultCollection.h"
+#include "RimFaultDistance.h"
+#include "RimFaultDistanceCollection.h"
 #include "RimFaultInViewCollection.h"
 #include "RimGridCollection.h"
 #include "RimIntersectionCollection.h"
@@ -134,8 +134,8 @@ RimEclipseCase::RimEclipseCase()
 
     CAF_PDM_InitFieldNoDefault( &m_wellTargetMappings, "WellTargetMappings", "Well Target Mappings" );
 
-    CAF_PDM_InitFieldNoDefault( &m_faultDistanceResultCollection, "FaultDistanceResultCollection", "Fault Distance" );
-    m_faultDistanceResultCollection = new RimFaultDistanceResultCollection;
+    CAF_PDM_InitFieldNoDefault( &m_faultDistanceCollection, "FaultDistanceCollection", "Fault Distance" );
+    m_faultDistanceCollection = new RimFaultDistanceCollection;
 
     CAF_PDM_InitFieldNoDefault( &m_resultAliasList, "ResultAliasNames", "Result Name Aliases" );
     m_resultAliasList.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
@@ -671,7 +671,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
 {
     if ( uiConfigName == "MainWindow.ProjectTree" )
     {
-        const bool hasFaultDistance = m_faultDistanceResultCollection() && !m_faultDistanceResultCollection()->isEmpty();
+        const bool hasFaultDistance = m_faultDistanceCollection() && !m_faultDistanceCollection()->isEmpty();
         const bool hasWellTargets   = !m_wellTargetMappings.empty();
         if ( hasFaultDistance || hasWellTargets )
         {
@@ -679,7 +679,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
 
             if ( hasFaultDistance )
             {
-                for ( auto* result : m_faultDistanceResultCollection()->items() )
+                for ( auto* result : m_faultDistanceCollection()->items() )
                 {
                     dataAnalytics->add( result );
                 }
@@ -1459,7 +1459,7 @@ void RimEclipseCase::addWellTargetMapping( RimWellTargetMapping* generator )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFaultDistanceResultCollection* RimEclipseCase::faultDistanceResults() const
+RimFaultDistanceCollection* RimEclipseCase::faultDistanceCollection() const
 {
-    return m_faultDistanceResultCollection;
+    return m_faultDistanceCollection;
 }

ApplicationLibCode/ProjectDataModel/RimEclipseCase.h

@@ -41,7 +41,7 @@
 class QString;
 
 class RimWellTargetMapping;
-class RimFaultDistanceResultCollection;
+class RimFaultDistanceCollection;
 class RigCaseCellResultsData;
 class RigEclipseCaseData;
 class RigFormationNames;
@@ -143,7 +143,7 @@ public:
 
     void addWellTargetMapping( RimWellTargetMapping* wellTargetMapping );
 
-    RimFaultDistanceResultCollection* faultDistanceResults() const;
+    RimFaultDistanceCollection* faultDistanceCollection() const;
 
     void updateResultAddressCollection();
 
@@ -206,7 +206,7 @@ private:
 
     caf::PdmChildArrayField<RimWellTargetMapping*> m_wellTargetMappings;
 
-    caf::PdmChildField<RimFaultDistanceResultCollection*> m_faultDistanceResultCollection;
+    caf::PdmChildField<RimFaultDistanceCollection*> m_faultDistanceCollection;
 
     caf::PdmField<std::vector<caf::FilePath>> m_filesContainingFaults;
 

ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp

@@ -66,7 +66,7 @@
 #include "RimEclipseResultDefinition.h"
 #include "RimElementVectorResult.h"
 #include "RimExtrudedCurveIntersection.h"
-#include "RimFaultDistanceResultCollection.h"
+#include "RimFaultDistanceCollection.h"
 #include "RimFaultInViewCollection.h"
 #include "RimFaultReactivationModelCollection.h"
 #include "RimFilterInViewCollection.h"
@@ -357,10 +357,10 @@ RimFaultInViewCollection* RimEclipseView::faultCollection() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFaultDistanceResultCollection* RimEclipseView::faultDistanceResults() const
+RimFaultDistanceCollection* RimEclipseView::faultDistanceCollection() const
 {
     RimEclipseCase* eclipseCase = this->eclipseCase();
-    return eclipseCase ? eclipseCase->faultDistanceResults() : nullptr;
+    return eclipseCase ? eclipseCase->faultDistanceCollection() : nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimEclipseView.h

@@ -53,7 +53,7 @@ class RimEclipseCellColors;
 class RimEclipseFaultColors;
 class RimEclipsePropertyFilter;
 class RimEclipsePropertyFilterCollection;
-class RimFaultDistanceResultCollection;
+class RimFaultDistanceCollection;
 class RimFaultInViewCollection;
 class RimFilterInViewCollection;
 class RimReservoirCellResultsStorage;
@@ -115,7 +115,7 @@ public:
     RimStimPlanColors*                   fractureColors() const;
     RimSimWellInViewCollection*          wellCollection() const;
     RimFaultInViewCollection*            faultCollection() const;
-    RimFaultDistanceResultCollection*    faultDistanceResults() const;
+    RimFaultDistanceCollection*          faultDistanceCollection() const;
     RimVirtualPerforationResults*        virtualPerforationResult() const;
     RimStreamlineInViewCollection*       streamlineCollection() const;
     RimFaultReactivationModelCollection* faultReactivationModelCollection() const;