From c0777e4950eee737052e5181f5fcb259b474e70f Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 27 Apr 2018 13:36:23 +0200
Subject: [PATCH] #2780 Ensemble Curve Set : Use ensamble name as case name

---
 .../Summary/RimEnsembleCurveSet.cpp           |  8 +++++++
 .../Summary/RimEnsembleCurveSet.h             |  2 ++
 .../Summary/RimSummaryCurveAutoName.cpp       | 23 ++++++++++++++++---
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
index 63b28d7259..15858e7b66 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
@@ -293,6 +293,14 @@ void RimEnsembleCurveSet::onLegendDefinitionChanged()
     updateCurveColors();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimSummaryCaseCollection* RimEnsembleCurveSet::summaryCaseCollection() const
+{
+    return m_yValuesSummaryGroup();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
index 1431393f39..68da28d220 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
@@ -79,6 +79,8 @@ public:
     RimRegularLegendConfig*                 legendConfig();
     void                                    onLegendDefinitionChanged();
 
+    RimSummaryCaseCollection*               summaryCaseCollection() const;
+
 private:
     caf::PdmFieldHandle*                    userDescriptionField() override;
     caf::PdmFieldHandle*                    objectToggleField();
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
index fa86d4bad0..663de98d87 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
@@ -20,14 +20,15 @@
 
 #include "RifEclipseSummaryAddress.h"
 
+#include "RimEnsembleCurveSet.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryPlotNameHelper.h"
 
 #include "SummaryPlotCommands/RicSummaryCurveCreator.h"
 
 #include "cafPdmUiPushButtonEditor.h"
-#include "RimEnsembleCurveSet.h"
 
 CAF_PDM_SOURCE_INIT(RimSummaryCurveAutoName, "SummaryCurveAutoName");
 
@@ -49,7 +50,7 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
     CAF_PDM_InitField(&m_completion,        "Completion",         true, "I, J, K", "", "", "");
     CAF_PDM_InitField(&m_aquiferNumber,     "Aquifer",            true, "Aquifer Number", "", "", "");
     
-    CAF_PDM_InitField(&m_caseName,          "CaseName",           true, "Case Name", "", "", "");
+    CAF_PDM_InitField(&m_caseName,          "CaseName",           true, "Case/Ensemble Name", "", "", "");
 
     // clang-format on
 }
@@ -81,7 +82,23 @@ QString RimSummaryCurveAutoName::curveNameY(const RifEclipseSummaryAddress& summ
 
     appendAddressDetails(text, summaryAddress, nameHelper);
 
-    if (summaryCurve)
+    RimEnsembleCurveSet* ensambleCurveSet = nullptr;
+    this->firstAncestorOrThisOfType(ensambleCurveSet);
+
+    if (ensambleCurveSet)
+    {
+        bool skipSubString = nameHelper && nameHelper->isCaseInTitle();
+
+        if (m_caseName && !skipSubString)
+        {
+            if (ensambleCurveSet && ensambleCurveSet->summaryCaseCollection())
+            {
+                if (text.size() > 0) text += ", ";
+                text += ensambleCurveSet->summaryCaseCollection()->name().toStdString();
+            }
+        }
+    }
+    else if (summaryCurve)
     {
         bool skipSubString = nameHelper && nameHelper->isCaseInTitle();