From 8846798ccfd0c71935082b69857ca3af89482c4a Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Mon, 15 Apr 2019 11:06:27 +0200
Subject: [PATCH] #4338 Add grouping result to Grid Cross Plot Data set
 property editor

---
 .../GridCrossPlots/RimGridCrossPlotDataSet.cpp      |  2 +-
 .../ProjectDataModel/RimEclipseCellColors.cpp       | 13 +++++++++++++
 .../ProjectDataModel/RimEclipseCellColors.h         |  3 +++
 .../ProjectDataModel/RimRegularLegendConfig.cpp     |  6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
index 3cbdc0be8b..b1fe212038 100644
--- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
+++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
@@ -792,7 +792,7 @@ void RimGridCrossPlotDataSet::defineUiOrdering(QString uiConfigName, caf::PdmUiO
         if (m_grouping() == GROUP_BY_RESULT)
         {
             caf::PdmUiGroup* dataGroupingGroup = uiOrdering.addNewGroup("Data Grouping Property");
-            m_groupingProperty->uiOrdering(uiConfigName, *dataGroupingGroup);
+            m_groupingProperty->uiOrdering("AddLegendLevels", *dataGroupingGroup);
         }
 
         caf::PdmUiGroup* invisibleFullWidthGroup = uiOrdering.addNewGroup("Property Group");
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
index 57b2b666f3..c188b672e7 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
@@ -183,6 +183,19 @@ void RimEclipseCellColors::initAfterRead()
     updateIconState();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimEclipseCellColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    RimEclipseResultDefinition::defineUiOrdering(uiConfigName, uiOrdering);
+
+    if (uiConfigName == "AddLegendLevels")
+    {
+        legendConfig()->uiOrdering("NumIntervalsOnly", uiOrdering);
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.h b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.h
index 5ba3658fb1..f8d96297b1 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.h
@@ -66,6 +66,9 @@ protected:
     friend class RimCellEdgeColors;
     void                                initAfterRead() override;
 
+
+    void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
+
 private:
     void                                        changeLegendConfig(QString resultVarNameOfNewLegend);
 
diff --git a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
index ab5929d9ae..48ea1a5167 100644
--- a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
@@ -845,6 +845,12 @@ void RimRegularLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
         uiOrdering.add(&m_numLevels);
         uiOrdering.skipRemainingFields(true);
     }
+    else if (uiConfigName == "NumIntervalsOnly")
+    {
+        m_numLevels.uiCapability()->setUiName("Number of Intervals");
+        uiOrdering.add(&m_numLevels);
+        uiOrdering.skipRemainingFields(true);
+    }
     else
     {
         caf::PdmUiOrdering * formatGr = uiOrdering.addNewGroup("Format");