From 5fab8357ee246e7c873296113d10b1af58eb9c66 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 21 Dec 2017 15:25:05 +0100
Subject: [PATCH] #2289 Source Stepping : Rename to make it clear what summary
 case is used

---
 .../Summary/RimSummaryPlotSourceStepping.cpp  | 22 +++++++------------
 .../Summary/RimSummaryPlotSourceStepping.h    |  4 ++--
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
index 00e526ab26..944a130bc0 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
@@ -229,7 +229,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
 
     std::set<QString> identifierTexts;
 
-    RifSummaryReaderInterface* reader = summaryReader();
+    RifSummaryReaderInterface* reader = firstSummaryReaderForVisibleCurves();
     if (reader)
     {
         RiaSummaryCurveAnalyzer* analyzer = analyzerForReader(reader);
@@ -457,9 +457,9 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi(const caf::PdmFieldHandle* c
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifSummaryReaderInterface* RimSummaryPlotSourceStepping::summaryReader() const
+RifSummaryReaderInterface* RimSummaryPlotSourceStepping::firstSummaryReaderForVisibleCurves() const
 {
-    RimSummaryCase* sumCase = singleSummaryCase();
+    RimSummaryCase* sumCase = firstSummaryCaseForVisibleCurves();
     if (sumCase)
     {
         return sumCase->summaryReader();
@@ -471,30 +471,24 @@ RifSummaryReaderInterface* RimSummaryPlotSourceStepping::summaryReader() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCase* RimSummaryPlotSourceStepping::singleSummaryCase() const
+RimSummaryCase* RimSummaryPlotSourceStepping::firstSummaryCaseForVisibleCurves() const
 {
     RimSummaryCurveCollection* curveCollection = nullptr;
     this->firstAncestorOrThisOfTypeAsserted(curveCollection);
 
-    std::set<RimSummaryCase*> cases;
     for (auto curve : curveCollection->visibleCurves())
     {
-        if (isYAxisStepping())
+        if (isYAxisStepping() && curve->summaryCaseY())
         {
-            cases.insert(curve->summaryCaseY());
+            return curve->summaryCaseY();
         }
 
-        if (isXAxisStepping())
+        if (isXAxisStepping() && curve->summaryCaseX())
         {
-            cases.insert(curve->summaryCaseX());
+            return curve->summaryCaseX();
         }
     }
 
-    if (cases.size() > 0)
-    {
-        return *(cases.begin());
-    }
-
     return nullptr;
 }
 
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
index cfd86bb406..866108e79d 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
@@ -77,8 +77,8 @@ private:
                                        caf::PdmUiEditorAttribute* attribute) override;
 
 private:
-    RifSummaryReaderInterface* summaryReader() const;
-    RimSummaryCase*            singleSummaryCase() const;
+    RifSummaryReaderInterface* firstSummaryReaderForVisibleCurves() const;
+    RimSummaryCase*            firstSummaryCaseForVisibleCurves() const;
     caf::PdmValueField*        fieldToModify();
 
     std::set<RifEclipseSummaryAddress> visibleAddressesCurveCollection() const;