From 6855d63394c9b55d98f761e3cc6270eb7119c57d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 15 Sep 2017 12:39:26 +0200
Subject: [PATCH] #1889 Curve Creator : Produce option items in summary plot
 collection

---
 .../RicSelectSummaryPlotUI.cpp                | 27 +++++--------------
 .../RicSelectSummaryPlotUI.h                  |  3 ++-
 .../Summary/RimSummaryPlotCollection.cpp      | 14 ++++++++++
 .../Summary/RimSummaryPlotCollection.h        |  3 +++
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp
index c363739c65..6615b54a90 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp
@@ -91,13 +91,9 @@ QList<caf::PdmOptionItemInfo> RicSelectSummaryPlotUI::calculateValueOptions(cons
 
     if (fieldNeedingOptions == &m_selectedSummaryPlot)
     {
-        for (RimSummaryPlot* plot : RicSelectSummaryPlotUI::summaryPlots())
-        {
-            QIcon icon = plot->uiCapability()->uiIcon();
-            QString displayName = plot->description();
+        RimSummaryPlotCollection* summaryPlotColl = summaryPlotCollection();
 
-            options.push_back(caf::PdmOptionItemInfo(displayName, plot, false, icon));
-        }
+        summaryPlotColl->summaryPlotItemInfos(&options);
     }
 
     return options;
@@ -108,7 +104,7 @@ QList<caf::PdmOptionItemInfo> RicSelectSummaryPlotUI::calculateValueOptions(cons
 //--------------------------------------------------------------------------------------------------
 void RicSelectSummaryPlotUI::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
-    if (RicSelectSummaryPlotUI::summaryPlots().size() == 0)
+    if (summaryPlotCollection()->summaryPlots().size() == 0)
     {
         m_createNewPlot = true;
     }
@@ -128,20 +124,11 @@ void RicSelectSummaryPlotUI::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimSummaryPlot*> RicSelectSummaryPlotUI::summaryPlots()
+RimSummaryPlotCollection* RicSelectSummaryPlotUI::summaryPlotCollection()
 {
     RimProject* project = RiaApplication::instance()->project();
-    CVF_ASSERT(project);
-
-    RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
-    CVF_ASSERT(mainPlotColl);
-
-    RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
-    CVF_ASSERT(summaryPlotColl);
-
-    std::vector<RimSummaryPlot*> sumPlots;
-    summaryPlotColl->descendantsIncludingThisOfType(sumPlots);
-
-    return sumPlots;
+    
+    return project->mainPlotCollection()->summaryPlotCollection();
 }
 
+
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h
index fea570fc7a..3581ab8a38 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h
@@ -23,6 +23,7 @@
 #include "cafPdmPtrField.h"
 
 class RimSummaryPlot;
+class RimSummaryPlotCollection;
 
 //==================================================================================================
 /// 
@@ -47,7 +48,7 @@ protected:
     virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
 
 private:
-    static std::vector<RimSummaryPlot*> summaryPlots();
+    static RimSummaryPlotCollection* summaryPlotCollection();
 
 private:
     caf::PdmPtrField<RimSummaryPlot*>   m_selectedSummaryPlot;
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
index c4463b7476..212d1d8213 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
@@ -130,3 +130,17 @@ void RimSummaryPlotCollection::updateSummaryNameHasChanged()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimSummaryPlotCollection::summaryPlotItemInfos(QList<caf::PdmOptionItemInfo>* optionInfos) const
+{
+    for (RimSummaryPlot* plot : summaryPlots())
+    {
+        QIcon icon = plot->uiCapability()->uiIcon();
+        QString displayName = plot->description();
+
+        optionInfos->push_back(caf::PdmOptionItemInfo(displayName, plot, false, icon));
+    }
+}
+
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
index c675f478f5..49bfaa5f22 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
@@ -46,6 +46,9 @@ public:
     caf::PdmChildArrayField<RimSummaryPlot*> summaryPlots;
 
     void updateSummaryNameHasChanged();
+
+    void summaryPlotItemInfos(QList<caf::PdmOptionItemInfo>* optionInfos) const;
+
 private:
     RifReaderEclipseSummary* createSummaryFileReader(const QString& eclipseCaseFilePathBasename);
     RifReaderEclipseSummary* getOrCreateSummaryFileReader(const QString& eclipseCaseFilePathBasename);