#2883, #2890 Fix color assignment and stability for ensemble curve sets

This commit is contained in:
Jacob Støren
2018-05-11 08:01:10 +02:00
parent 6270dd3bc9
commit bb033eb561
12 changed files with 41 additions and 73 deletions

View File

@@ -140,15 +140,13 @@ RimEnsembleCurveSet* RimEnsembleCurveSetCollection::findRimCurveSetFromQwtCurve(
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSetCollection::addCurveSet(RimEnsembleCurveSet* curveSet)
{
static int nextAutoColorIndex = 1;
static int numberOfColors = (int)RiaColorTables::summaryCurveDefaultPaletteColors().size();
if (curveSet)
{
curveSet->setColor(RimSummaryCurveAppearanceCalculator::cycledPaletteColor(nextAutoColorIndex));
m_curveSets.push_back(curveSet);
nextAutoColorIndex = (++nextAutoColorIndex) % numberOfColors;
}
}
@@ -193,6 +191,14 @@ std::vector<RimEnsembleCurveSet*> RimEnsembleCurveSetCollection::visibleCurveSet
return visible;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimEnsembleCurveSetCollection::curveSetCount() const
{
return m_curveSets.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------