From 7cd371c1f844612bf9b6345df201abbbb2c684f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= <bjorn.erik.jensen@acando.no>
Date: Fri, 8 Jun 2018 08:43:00 +0200
Subject: [PATCH] #2659 Ensemble statistics. Fix plot editor issues

---
 .../ProjectDataModel/Summary/RimSummaryAddress.cpp        | 1 +
 .../UserInterface/RiuSummaryCurveDefSelection.cpp         | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
index ee184498af..0c86d2aede 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
@@ -40,6 +40,7 @@ namespace caf
         addItem(RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR, "SUMMARY_BLOCK_LGR", "Lgr-Block");
         addItem(RifEclipseSummaryAddress::SUMMARY_CALCULATED, "SUMMARY_CALCULATED", "Calculated");
         addItem(RifEclipseSummaryAddress::SUMMARY_IMPORTED, "SUMMARY_IMPORTED", "Imported");
+        addItem(RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS, "SUMMARY_ENSEMBLE_STATISTICS", "Ensemble Statistics");
         setDefault(RifEclipseSummaryAddress::SUMMARY_FIELD);
     }
 
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
index 3b7de8182f..61bc3084ba 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
@@ -426,6 +426,9 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
             summaryAddress = RifEclipseSummaryAddress::fieldAddress(summaryAddress.quantityName());
         }
 
+        // Ignore ensemble statistics curves
+        if (summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS) continue;
+
         // Select summary category if not already selected
         auto& selectedCategories = m_selectedSummaryCategories();
 
@@ -605,6 +608,8 @@ QList<caf::PdmOptionItemInfo> RiuSummaryCurveDefSelection::calculateValueOptions
     {
         for (size_t i = 0; i < caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::size(); ++i)
         {
+            if (caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i) == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS) continue;
+
             options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::uiTextFromIndex(i),
                                                      caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>::fromIndex(i)));
         }
@@ -1040,7 +1045,8 @@ std::set<RifEclipseSummaryAddress> RiuSummaryCurveDefSelection::buildAddressList
     std::set<RifEclipseSummaryAddress> addressSet;
     for (const auto& category : m_selectedSummaryCategories())
     {
-        if (category == RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_INVALID) continue;
+        if (m_identifierFieldsMap.at(category).size() == 0 ||
+            category == RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_INVALID) continue;
         
         const auto& identifierAndFieldList = m_identifierFieldsMap.at(category);
         std::vector<std::pair<RifEclipseSummaryAddress::SummaryIdentifierType, QString>> selectionStack;