#5131 : Calculated curves : Use find in RimSummaryCalculationCollection

ApplicationCode/Commands/RicReplaceSummaryCaseFeature.cpp

@@ -102,8 +102,9 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
             if ( summaryAddressY.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED &&
                  ids.find( summaryAddressY.id() ) != ids.end() )
             {
-                RifCalculatedSummaryCurveReader reader( calcColl );
+                if ( calcColl )
-                RimSummaryCalculation*          calculation = reader.findCalculationByName( summaryAddressY );
+                {
+                    RimSummaryCalculation* calculation = calcColl->findCalculationById( summaryAddressY.id() );
                     QString                description = calculation->description();
 
                     RifEclipseSummaryAddress updatedAdr =
@@ -112,6 +113,7 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
                     summaryCurve->loadDataAndUpdate( true );
                 }
             }
+        }
 
         summaryPlot->loadDataAndUpdate();
     }
@@ -127,8 +129,9 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
             if ( summaryAddressX.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED &&
                  ids.find( summaryAddressX.id() ) != ids.end() )
             {
-                RifCalculatedSummaryCurveReader reader( calcColl );
+                if ( calcColl )
-                RimSummaryCalculation*          calculation = reader.findCalculationByName( summaryAddressX );
+                {
+                    RimSummaryCalculation* calculation = calcColl->findCalculationById( summaryAddressX.id() );
                     QString                description = calculation->description();
 
                     RifEclipseSummaryAddress updatedAdr =
@@ -136,13 +139,15 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
                     summaryCurve->setSummaryAddressX( updatedAdr );
                     summaryCurve->loadDataAndUpdate( true );
                 }
+            }
 
             RifEclipseSummaryAddress summaryAddressY = summaryCurve->summaryAddressY();
             if ( summaryAddressY.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED &&
                  ids.find( summaryAddressY.id() ) != ids.end() )
             {
-                RifCalculatedSummaryCurveReader reader( calcColl );
+                if ( calcColl )
-                RimSummaryCalculation*          calculation = reader.findCalculationByName( summaryAddressY );
+                {
+                    RimSummaryCalculation* calculation = calcColl->findCalculationById( summaryAddressX.id() );
                     QString                description = calculation->description();
 
                     RifEclipseSummaryAddress updatedAdr =
@@ -151,6 +156,7 @@ void RicReplaceSummaryCaseFeature::onActionTriggered( bool isChecked )
                     summaryCurve->loadDataAndUpdate( true );
                 }
             }
+        }
 
         summaryPlot->loadDataAndUpdate();
     }

ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurveCalculationFeature.cpp

@@ -26,7 +26,6 @@
 
 #include "RifEclipseSummaryAddress.h"
 
-#include "RimCalculatedSummaryCurveReader.h"
 #include "RimProject.h"
 #include "RimSummaryCalculation.h"
 #include "RimSummaryCalculationCollection.h"
@@ -65,9 +64,12 @@ void RicEditSummaryCurveCalculationFeature::onActionTriggered( bool isChecked )
         RifEclipseSummaryAddress selectedAddress = selectedCurves.front()->summaryAddressY();
 
         RimProject*                      proj            = RiaApplication::instance()->project();
-        RifCalculatedSummaryCurveReader* reader = dynamic_cast<RifCalculatedSummaryCurveReader*>(
+        RimSummaryCalculationCollection* calculationColl = proj->calculationCollection();
-            proj->calculationCollection->calculationSummaryCase()->summaryReader() );
+
-        calculation = reader != nullptr ? reader->findCalculationByName( selectedAddress ) : nullptr;
+        if ( calculationColl )
+        {
+            calculation = calculationColl->findCalculationById( selectedAddress.id() );
+        }
     }
 
     RicSummaryCurveCalculatorDialog* dialog = RicShowSummaryCurveCalculatorFeature::curveCalculatorDialog();

ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp

@@ -98,14 +98,7 @@ RimSummaryCalculation*
 {
     if ( m_calculationCollection && resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
     {
-        int id = resultAddress.id();
+        return m_calculationCollection->findCalculationById( resultAddress.id() );
-        for ( RimSummaryCalculation* calc : m_calculationCollection->calculations() )
-        {
-            if ( calc->id() == id )
-            {
-                return calc;
-            }
-        }
     }
 
     return nullptr;

ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h

@@ -41,10 +41,11 @@ public:
 
     void buildMetaData();
 
-    RimSummaryCalculation* findCalculationByName( const RifEclipseSummaryAddress& resultAddress ) const;
-
     RiaEclipseUnitTools::UnitSystem unitSystem() const override;
 
+private:
+    RimSummaryCalculation* findCalculationByName( const RifEclipseSummaryAddress& resultAddress ) const;
+
 private:
     caf::PdmPointer<RimSummaryCalculationCollection> m_calculationCollection;
 };

ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp

@@ -18,11 +18,15 @@
 
 #include "RimSummaryCurveAutoName.h"
 
+#include "RiaApplication.h"
 #include "RiaStatisticsTools.h"
 
 #include "RifEclipseSummaryAddress.h"
 
 #include "RimEnsembleCurveSet.h"
+#include "RimProject.h"
+#include "RimSummaryCalculation.h"
+#include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
@@ -197,6 +201,18 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
                        QString::fromStdString( summaryAddress.quantityName() ) )
                        .toStdString();
         }
+        else if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
+        {
+            // Need to add case name for calculated summary
+            RimProject*                      proj     = RiaApplication::instance()->project();
+            RimSummaryCalculationCollection* calcColl = proj->calculationCollection();
+
+            RimSummaryCalculation* calculation = calcColl->findCalculationById( summaryAddress.id() );
+            if ( calculation )
+            {
+                text = calculation->description().toStdString();
+            }
+        }
 
         if ( m_unit && !unitText.empty() )
         {