Refactor RigFormationNames

- Rename RifColorLegendData to RifFormationNamesReader to better reflect the
class purpose of reading formation names from .lyr files.
- Remove inheritance of cvf::Object
- Improve const correctness

ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp

@@ -2881,7 +2881,7 @@ void RigCaseCellResultsData::setHdf5Filename( const QString& hdf5SourSimFilename
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeFormationNames )
+void RigCaseCellResultsData::setActiveFormationNames( const RigFormationNames* activeFormationNames )
 {
     m_activeFormationNamesData = activeFormationNames;
 
@@ -2899,7 +2899,7 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF
                                                                                        RiaResultNames::activeFormationNamesResultName() ),
                                                               0 );
 
-    if ( m_activeFormationNamesData.isNull() )
+    if ( !m_activeFormationNamesData )
     {
         for ( size_t cIdx = 0; cIdx < totalGlobCellCount; ++cIdx )
         {
@@ -2957,7 +2957,7 @@ void RigCaseCellResultsData::setActiveFormationNames( RigFormationNames* activeF
 //--------------------------------------------------------------------------------------------------
 const RigFormationNames* RigCaseCellResultsData::activeFormationNames() const
 {
-    return m_activeFormationNamesData.p();
+    return m_activeFormationNamesData;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.h

@@ -57,7 +57,7 @@ public:
     void                      setReaderInterface( RifReaderInterface* readerInterface );
     const RifReaderInterface* readerInterface() const;
     void                      setHdf5Filename( const QString& hdf5SourSimFilename );
-    void                      setActiveFormationNames( RigFormationNames* activeFormationNames );
+    void                      setActiveFormationNames( const RigFormationNames* activeFormationNames );
     const RigFormationNames*  activeFormationNames() const;
     RigAllanDiagramData*      allanDiagramData();
 
@@ -221,7 +221,6 @@ private:
 
 private:
     cvf::ref<RifReaderInterface>  m_readerInterface;
-    cvf::cref<RigFormationNames>  m_activeFormationNamesData;
     cvf::ref<RigAllanDiagramData> m_allanDiagramData;
 
     std::vector<std::vector<std::vector<double>>> m_cellScalarResults; ///< Scalar results on the complete reservoir for
@@ -236,4 +235,5 @@ private:
     RigEclipseCaseData*           m_ownerCaseData;
     RigActiveCellInfo*            m_activeCellInfo;
     RiaDefines::PorosityModelType m_porosityModel;
+    const RigFormationNames*      m_activeFormationNamesData = nullptr;
 };

ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp

@@ -780,7 +780,7 @@ void RigEclipseCaseData::computeActiveCellsGeometryBoundingBoxOptimized()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RigEclipseCaseData::setActiveFormationNames( RigFormationNames* activeFormationNames )
+void RigEclipseCaseData::setActiveFormationNames( const RigFormationNames* activeFormationNames )
 {
     m_matrixModelResults->setActiveFormationNames( activeFormationNames );
 }

ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.h

@@ -85,7 +85,7 @@ public:
 
     bool hasFractureResults() const;
 
-    void                       setActiveFormationNames( RigFormationNames* activeFormationNames );
+    void                       setActiveFormationNames( const RigFormationNames* activeFormationNames );
     const std::vector<QString> formationNames() const;
     RigAllanDiagramData*       allanDiagramData();
 

ApplicationLibCode/ReservoirDataModel/RigFormationNames.cpp

@@ -30,14 +30,16 @@ RigFormationNames::RigFormationNames()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RigFormationNames::~RigFormationNames()
+int RigFormationNames::formationIndexFromKLayerIdx( size_t Kidx ) const
 {
+    if ( Kidx >= m_nameIndexPrKLayer.size() ) return -1;
+    return m_nameIndexPrKLayer[Kidx];
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RigFormationNames::formationNameFromKLayerIdx( size_t Kidx )
+QString RigFormationNames::formationNameFromKLayerIdx( size_t Kidx ) const
 {
     int idx = formationIndexFromKLayerIdx( Kidx );
     if ( idx >= static_cast<int>( m_formationNames.size() ) ) return "";
@@ -49,7 +51,7 @@ QString RigFormationNames::formationNameFromKLayerIdx( size_t Kidx )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RigFormationNames::formationColorFromKLayerIdx( size_t Kidx, cvf::Color3f* formationColor )
+bool RigFormationNames::formationColorFromKLayerIdx( size_t Kidx, cvf::Color3f* formationColor ) const
 {
     int idx = formationIndexFromKLayerIdx( Kidx );
 
@@ -64,6 +66,22 @@ bool RigFormationNames::formationColorFromKLayerIdx( size_t Kidx, cvf::Color3f*
     return true;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<QString> RigFormationNames::formationNames() const
+{
+    return m_formationNames;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<cvf::Color3f> RigFormationNames::formationColors() const
+{
+    return m_formationColors;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -143,7 +161,7 @@ void RigFormationNames::appendFormationRangeWithColor( const QString& name, cvf:
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<int> RigFormationNames::findKLayers( std::vector<QString> formationNames )
+std::set<int> RigFormationNames::findKLayers( std::vector<QString> formationNames ) const
 {
     std::set<int> foundK;
 

ApplicationLibCode/ReservoirDataModel/RigFormationNames.h

@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "cvfObject.h"
 #include <QString>
 
 #include <set>
@@ -26,24 +25,17 @@
 
 #include "cvfColor3.h"
 
-class RigFormationNames : public cvf::Object
+class RigFormationNames
 {
 public:
     RigFormationNames();
-    ~RigFormationNames() override;
 
-    int formationIndexFromKLayerIdx( size_t Kidx ) const
-    {
-        if ( Kidx >= m_nameIndexPrKLayer.size() ) return -1;
-        return m_nameIndexPrKLayer[Kidx];
-    }
+    int     formationIndexFromKLayerIdx( size_t Kidx ) const;
+    QString formationNameFromKLayerIdx( size_t Kidx ) const;
+    bool    formationColorFromKLayerIdx( size_t Kidx, cvf::Color3f* formationColor ) const;
 
-    QString formationNameFromKLayerIdx( size_t Kidx );
-
-    bool formationColorFromKLayerIdx( size_t Kidx, cvf::Color3f* formationColor );
-
-    const std::vector<QString>&      formationNames() const { return m_formationNames; }
-    const std::vector<cvf::Color3f>& formationColors() const { return m_formationColors; }
+    std::vector<QString>      formationNames() const;
+    std::vector<cvf::Color3f> formationColors() const;
 
     void appendFormationRange( const QString& name, int kStartIdx, int kEndIdx );
     void appendFormationRangeHeight( const QString& name, int kLayerCount );
@@ -51,7 +43,7 @@ public:
     void appendFormationRange( const QString& name, cvf::Color3f color, int kStartIdx, int kEndIdx );
     void appendFormationRangeHeight( const QString& name, cvf::Color3f color, int kLayerCount );
 
-    std::set<int> findKLayers( std::vector<QString> formationNames );
+    std::set<int> findKLayers( std::vector<QString> formationNames ) const;
 
 private:
     static cvf::Color3f undefinedColor();