#2688 Set different curves color for each curve set

This commit is contained in:
Bjørn Erik Jensen
2018-04-18 08:32:16 +02:00
parent 2452c965ab
commit c3e9a39532
6 changed files with 120 additions and 55 deletions

View File

@@ -965,6 +965,8 @@ void RimSummaryPlot::addCurveNoUpdate(RimSummaryCurve* curve)
//{
// if (curveSet && curve)
// {
// curve->setColor(RimSummaryCurveAppearanceCalculator::cycledPaletteColor((int)m_ensambleCurveSetCollection->curveSets().size()));
//
// const_cast<RimEnsambleCurveSet*>(curveSet)->addCurve(curve);
// curve->setParentQwtPlotAndReplot(m_qwtPlot);
// }
@@ -1186,17 +1188,18 @@ void RimSummaryPlot::onLoadDataAndUpdate()
for (RimGridTimeHistoryCurve* curve : m_gridTimeHistoryCurves)
{
curve->loadDataAndUpdate(true);
curve->loadDataAndUpdate(false);
}
for (RimAsciiDataCurve* curve : m_asciiDataCurves)
{
curve->loadDataAndUpdate(true);
curve->loadDataAndUpdate(false);
}
if (m_qwtPlot) m_qwtPlot->updateLegend();
this->updateAxes();
updateZoomInQwt();
if(m_qwtPlot) m_qwtPlot->replot();
}
//--------------------------------------------------------------------------------------------------
@@ -1354,6 +1357,11 @@ QWidget* RimSummaryPlot::createViewWidget(QWidget* mainWindowParent)
{
m_summaryCurveCollection->setParentQwtPlotAndReplot(m_qwtPlot);
}
if (m_ensambleCurveSetCollection)
{
m_ensambleCurveSetCollection->setParentQwtPlotAndReplot(m_qwtPlot);
}
}
return m_qwtPlot;