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

#2918 Summary Plot Title : Make sure title and curve names are stable when deselecting ensemble curve

Browse Source
This commit is contained in:
Magne Sjaastad 2018-05-15 13:58:39 +02:00
parent ea50722cdd
commit 3effc4ca66
4 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -596,7 +596,7 @@ void RimPlotCurve::updateLegendEntryVisibilityNoPlotUpdate()
{ {
bool showLegendInQwt = m_showLegend(); bool showLegendInQwt = m_showLegend();
if (summaryPlot->ensembleCurveSetCollection()->visibleCurveSets().empty() && summaryPlot->curveCount() == 1) if (summaryPlot->ensembleCurveSetCollection()->curveSets().empty() && summaryPlot->curveCount() == 1)
{ {
// Disable display of legend if the summary plot has only one single curve // Disable display of legend if the summary plot has only one single curve
showLegendInQwt = false; showLegendInQwt = false;

21
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@ -170,27 +170,6 @@ std::vector<RimEnsembleCurveSet*> RimEnsembleCurveSetCollection::curveSets() con
return m_curveSets.childObjects(); return m_curveSets.childObjects();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsembleCurveSet*> RimEnsembleCurveSetCollection::visibleCurveSets() const
{
std::vector<RimEnsembleCurveSet*> visible;
if (m_showCurves())
{
for (const auto& c : m_curveSets)
{
if (c->isCurvesVisible())
{
visible.push_back(c);
}
}
}
return visible;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h
View File

@ -51,7 +51,6 @@ public:
void deleteCurveSet(RimEnsembleCurveSet* curveSet); void deleteCurveSet(RimEnsembleCurveSet* curveSet);
std::vector<RimEnsembleCurveSet*> curveSets() const; std::vector<RimEnsembleCurveSet*> curveSets() const;
std::vector<RimEnsembleCurveSet*> visibleCurveSets() const;
size_t curveSetCount() const; size_t curveSetCount() const;
void deleteAllCurveSets(); void deleteAllCurveSets();

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

@ -1557,13 +1557,10 @@ void RimSummaryPlot::updateNameHelperWithCurveData(RimSummaryPlotNameHelper* nam
} }
for (auto curveSet : m_ensembleCurveSetCollection->curveSets()) for (auto curveSet : m_ensembleCurveSetCollection->curveSets())
{
if (curveSet->isCurvesVisible())
{ {
addresses.push_back(curveSet->summaryAddress()); addresses.push_back(curveSet->summaryAddress());
ensembleCases.push_back(curveSet->summaryCaseCollection()); ensembleCases.push_back(curveSet->summaryCaseCollection());
} }
}
nameHelper->clear(); nameHelper->clear();
nameHelper->appendAddresses(addresses); nameHelper->appendAddresses(addresses);