From d198ae44bacb2efcc13169132cdf0458f9fd8a80 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 14 Nov 2017 12:58:24 +0100
Subject: [PATCH] #2092 Cross Plot : Detect if curve is a cross plot curve
 based on anchestor

---
 .../RicNewSummaryCrossPlotCurveFeature.cpp    |  1 -
 .../Summary/RimSummaryCurve.cpp               | 34 +++++++++----------
 .../Summary/RimSummaryCurve.h                 |  6 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp
index 9e806f53ac..e379d7483b 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp
@@ -61,7 +61,6 @@ void RicNewSummaryCrossPlotCurveFeature::onActionTriggered(bool isChecked)
         RimSummaryCurve* newCurve = new RimSummaryCurve();
         cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable(plot->curveCount());
         newCurve->setColor(curveColor);
-        newCurve->setAsCrossPlotCurve();
 
         plot->addCurveAndUpdate(newCurve);
 
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
index 85c9fba4af..9e1e3b49bd 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
@@ -28,6 +28,7 @@
 #include "RimSummaryAddress.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
+#include "RimSummaryCrossPlot.h"
 #include "RimSummaryCurveAutoName.h"
 #include "RimSummaryFilter.h"
 #include "RimSummaryPlot.h"
@@ -132,9 +133,6 @@ RimSummaryCurve::RimSummaryCurve()
     
     // Other members
 
-    CAF_PDM_InitField(&m_isCrossPlot, "IsCrossPlot", false, "Cross Plot Curve", "", "", "");
-    //m_isCrossPlot.uiCapability()->setUiHidden(true);
-
     CAF_PDM_InitFieldNoDefault(&m_plotAxis, "PlotAxis", "Axis", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig", "", "", "");
@@ -154,14 +152,6 @@ RimSummaryCurve::~RimSummaryCurve()
 {
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimSummaryCurve::setAsCrossPlotCurve()
-{
-    m_isCrossPlot = true;
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -357,7 +347,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
 
         bool shouldPopulateViewWithEmptyData = false;
 
-        if (m_isCrossPlot())
+        if (isCrossPlotCurve())
         {
             std::vector<double> xValues = this->xValues();
 
@@ -424,24 +414,22 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 {
     RimPlotCurve::updateOptionSensitivity();
 
-    uiOrdering.add(&m_isCrossPlot);
-
     {
         QString curveDataGroupName = "Summary Vector";
-        if (m_isCrossPlot()) curveDataGroupName += " Y";
+        if (isCrossPlotCurve()) curveDataGroupName += " Y";
         caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroupWithKeyword(curveDataGroupName, "Summary Vector Y");
         curveDataGroup->add(&m_yValuesSummaryCase);
         curveDataGroup->add(&m_yValuesSelectedVariableDisplayField);
 
         QString curveVarSelectionGroupName = "Vector Selection";
-        if (m_isCrossPlot()) curveVarSelectionGroupName += " Y";
+        if (isCrossPlotCurve()) curveVarSelectionGroupName += " Y";
         caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroupWithKeyword(curveVarSelectionGroupName, "Vector Selection Y");
         curveVarSelectionGroup->setCollapsedByDefault(true);
         m_yValuesSummaryFilter->uiOrdering(uiConfigName, *curveVarSelectionGroup);
         curveVarSelectionGroup->add(&m_yValuesUiFilterResultSelection);
     }
 
-    if (m_isCrossPlot())
+    if (isCrossPlotCurve())
     {
         caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup("Summary Vector X");
         curveDataGroup->add(&m_xValuesSummaryCase);
@@ -499,6 +487,18 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionI
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RimSummaryCurve::isCrossPlotCurve() const
+{
+    RimSummaryCrossPlot* crossPlot = nullptr;
+    this->firstAncestorOrThisOfType(crossPlot);
+    if (crossPlot) return true;
+
+    return false;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
index 2b2018e2f4..f2a5cec8a5 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
@@ -51,8 +51,6 @@ public:
     RimSummaryCurve();
     virtual ~RimSummaryCurve();
 
-    void                                    setAsCrossPlotCurve();
-
     void                                    setSummaryCase(RimSummaryCase* sumCase);
     RimSummaryCase*                         summaryCase() const; 
 
@@ -91,6 +89,8 @@ private:
                                                                                  RimSummaryCase* summaryCase,
                                                                                  RimSummaryFilter* summaryFilter);
 
+    bool                                    isCrossPlotCurve() const;
+
 private:
     // Y values
     caf::PdmPtrField<RimSummaryCase*>       m_yValuesSummaryCase;
@@ -106,8 +106,6 @@ private:
     caf::PdmChildField<RimSummaryFilter*>   m_xValuesSummaryFilter;
     caf::PdmField<RifEclipseSummaryAddress> m_xValuesUiFilterResultSelection;
 
-    caf::PdmField<bool>                     m_isCrossPlot;
-
     caf::PdmChildField<RimSummaryCurveAutoName*>        m_curveNameConfig;
     caf::PdmField<caf::AppEnum< RiaDefines::PlotAxis>>  m_plotAxis;
 };