#3907 Summary : Consider combined curve count when assigning color

ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp

@@ -19,6 +19,7 @@
 #include "RicNewSummaryCurveFeature.h"
 
 #include "RiaApplication.h"
+#include "RiaColorTables.h"
 
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
@@ -31,8 +32,6 @@
 
 #include "RiuPlotMainWindow.h"
 
-#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
-
 #include "cafSelectionManager.h"
 
 #include "cvfAssert.h"
@@ -62,7 +61,9 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
     if (plot)
     {
         RimSummaryCurve* newCurve = new RimSummaryCurve();
-        cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable(plot->curveCount());
+        
+        // Use same counting as RicNewSummaryEnsembleCurveSetFeature::onActionTriggered
+        cvf::Color3f curveColor = RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(plot->singleColorCurveCount());
         newCurve->setColor(curveColor);
 
         plot->addCurveAndUpdate(newCurve);

ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp

@@ -67,12 +67,8 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered(bool isChecked)
     {
         RimEnsembleCurveSet* curveSet = new RimEnsembleCurveSet();
 
-        // Set single curve set color
+        // Use same counting as RicNewSummaryCurveFeature::onActionTriggered
-        auto allCurveSets = plot->ensembleCurveSetCollection()->curveSets();
+        auto colorIndex = plot->singleColorCurveCount();
-        size_t colorIndex = std::count_if(allCurveSets.begin(), allCurveSets.end(), [](RimEnsembleCurveSet* curveSet)
-        {
-            return curveSet->colorMode() == RimEnsembleCurveSet::SINGLE_COLOR;
-        });
         curveSet->setColor(RiaColorTables::summaryCurveDefaultPaletteColors().cycledColor3f(colorIndex));
         curveSet->legendConfig()->setColorRange(RimEnsembleCurveSetColorManager::cycledEnsembleColorRange(static_cast<int>(colorIndex)));
 

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp

@@ -549,6 +549,22 @@ bool RimSummaryPlot::containsResamplableCurves() const
     return !m_gridTimeHistoryCurves.empty() || resamplableSummaryCurveCount > 0;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+size_t RimSummaryPlot::singleColorCurveCount() const
+{
+    auto allCurveSets = ensembleCurveSetCollection()->curveSets();
+    size_t colorIndex = std::count_if(allCurveSets.begin(), allCurveSets.end(), [](RimEnsembleCurveSet* curveSet)
+    {
+        return curveSet->colorMode() == RimEnsembleCurveSet::SINGLE_COLOR;
+    });
+
+    colorIndex += curveCount();
+
+    return colorIndex;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h

@@ -132,6 +132,8 @@ public:
     void                                            updatePlotInfoLabel();
 
     bool                                            containsResamplableCurves() const;
+
+    size_t                                          singleColorCurveCount() const;
     // RimViewWindow overrides
 public:
     QWidget*                                createViewWidget(QWidget* mainWindowParent) override;