From baaa18bdd5ce2ca8aa84d14f690f1e9f842e0c99 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Thu, 3 Sep 2020 16:06:20 +0200
Subject: [PATCH] Sort Ensemble curve filters by correlation

---
 .../Summary/RimEnsembleCurveFilter.cpp              | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
index 94da6d0d9d..b4e2cf0407 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
@@ -141,10 +141,13 @@ QList<caf::PdmOptionItemInfo>
         auto curveSet = parentCurveSet();
         if ( curveSet )
         {
-            auto ensParms = curveSet->variationSortedEnsembleParameters();
-            for ( auto& ensParm : ensParms )
+            auto params = curveSet->correlationSortedEnsembleParameters();
+            for ( const auto& paramCorrPair : params )
             {
-                options.push_back( caf::PdmOptionItemInfo( ensParm.uiName(), ensParm.name ) );
+                QString name = paramCorrPair.first.name;
+                double  corr = paramCorrPair.second;
+                options.push_back(
+                    caf::PdmOptionItemInfo( QString( "%1 (Avg. correlation: %2)" ).arg( name ).arg( corr ), name ) );
             }
         }
     }
@@ -358,10 +361,10 @@ void RimEnsembleCurveFilter::updateMaxMinAndDefaultValues( bool forceDefault )
 {
     if ( !selectedEnsembleParameter().isValid() )
     {
-        auto ensParams = parentCurveSet()->variationSortedEnsembleParameters();
+        auto ensParams = parentCurveSet()->correlationSortedEnsembleParameters();
         if ( !ensParams.empty() )
         {
-            m_ensembleParameterName = ensParams.front().name;
+            m_ensembleParameterName = ensParams.front().first.name;
             updateConnectedEditors();
         }
     }