OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2658 Ensemble curves. Fix curve set coloring. Minor fixes.Some ClangFormat auto-changes

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-14 09:51:06 +02:00
parent 090a79cf90
commit dc319646b2
2 changed files with 131 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -1004,6 +1004,10 @@ void RimSummaryPlot::deleteCurve(RimSummaryCurve* curve)
curveSet->deleteCurve(curve);
if (curveSet->curves().empty())
{
if (curveSet->colorMode() == RimEnsembleCurveSet::BY_ENSEMBLE_PARAM)
{
qwtPlot()->removeEnsembleCurveSetLegend(curveSet);
}
m_ensembleCurveSetCollection->deleteCurveSet(curveSet);
}
return;
@@ -1189,7 +1193,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
if (uiConfigName == RicSummaryCurveCreator::CONFIGURATION_NAME)
{
uiTreeOrdering.add(&m_summaryCurveCollection);
if (!m_isCrossPlot && !m_ensembleCurveSetCollection->curveSets().empty())
if (!m_isCrossPlot)
{
uiTreeOrdering.add(&m_ensembleCurveSetCollection);
}
@@ -1210,7 +1214,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
axisFolder->add(&m_rightYAxisProperties);
uiTreeOrdering.add(&m_summaryCurveCollection);
if (!m_isCrossPlot && !m_ensembleCurveSetCollection->curveSets().empty())
if (!m_isCrossPlot)
{
uiTreeOrdering.add(&m_ensembleCurveSetCollection);
}