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

#2690 Update all summary curves, not just visible when changing the vector for the whole collection

Browse Source 
* Also make sure the curve names take into account all curves in the project tree and in the legend text.
* Make sure plot name is updated when a curve is deleted.
This commit is contained in:
Gaute Lindkvist
2018-05-15 08:43:36 +02:00
parent e2dc1486e7
commit 77dd3cbc43
12 changed files with 57 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ RimSummaryPlot::RimSummaryPlot()
m_isCrossPlot = false;
m_nameHelper.reset(new RimSummaryPlotNameHelper);
m_nameHelperAllCurves.reset(new RimSummaryPlotNameHelper);
}
//--------------------------------------------------------------------------------------------------
@@ -521,24 +521,25 @@ RiuSummaryQwtPlot* RimSummaryPlot::qwtPlot() const
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updatePlotTitle()
{
updateNameHelperWithCurveData(m_nameHelperAllCurves.get());
if (m_useAutoPlotTitle)
{
m_userDefinedPlotTitle = generatePlotTitle(m_nameHelper.get());
m_userDefinedPlotTitle = m_nameHelperAllCurves->plotTitle();
}
updateCurveNames();
updateMdiWindowTitle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimSummaryPlotNameHelper* RimSummaryPlot::activePlotTitleHelper() const
const RimSummaryPlotNameHelper* RimSummaryPlot::activePlotTitleHelperAllCurves() const
{
if (m_useAutoPlotTitle())
{
return m_nameHelper.get();
return m_nameHelperAllCurves.get();
}
return nullptr;
@@ -547,11 +548,11 @@ const RimSummaryPlotNameHelper* RimSummaryPlot::activePlotTitleHelper() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryPlot::generatedPlotTitleFromVisibleCurves() const
QString RimSummaryPlot::generatedPlotTitleFromAllCurves() const
{
RimSummaryPlotNameHelper nameHelper;
return generatePlotTitle(&nameHelper);
updateNameHelperWithCurveData(&nameHelper);
return nameHelper.plotTitle();
}
//--------------------------------------------------------------------------------------------------
@@ -1527,10 +1528,11 @@ void RimSummaryPlot::updateMdiWindowTitle()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryPlot::generatePlotTitle(RimSummaryPlotNameHelper* nameHelper) const
void RimSummaryPlot::updateNameHelperWithCurveData(RimSummaryPlotNameHelper* nameHelper) const
{
if (!nameHelper) return "";
if (!nameHelper) return;
nameHelper->clear();
std::vector<RifEclipseSummaryAddress> addresses;
std::vector<RimSummaryCase*> sumCases;
std::vector<RimSummaryCaseCollection*> ensembleCases;
@@ -1539,19 +1541,16 @@ QString RimSummaryPlot::generatePlotTitle(RimSummaryPlotNameHelper* nameHelper)
{
for (RimSummaryCurve* curve : m_summaryCurveCollection->curves())
{
if (curve->isCurveVisible())
addresses.push_back(curve->summaryAddressY());
sumCases.push_back(curve->summaryCaseY());
if (curve->summaryCaseX())
{
addresses.push_back(curve->summaryAddressY());
sumCases.push_back(curve->summaryCaseY());
sumCases.push_back(curve->summaryCaseX());
if (curve->summaryCaseX())
if (curve->summaryAddressX().category() != RifEclipseSummaryAddress::SUMMARY_INVALID)
{
sumCases.push_back(curve->summaryCaseX());
if (curve->summaryAddressX().category() != RifEclipseSummaryAddress::SUMMARY_INVALID)
{
addresses.push_back(curve->summaryAddressX());
}
addresses.push_back(curve->summaryAddressX());
}
}
}
@@ -1570,8 +1569,6 @@ QString RimSummaryPlot::generatePlotTitle(RimSummaryPlotNameHelper* nameHelper)
nameHelper->appendAddresses(addresses);
nameHelper->appendSummaryCases(sumCases);
nameHelper->appendEnsembleCases(ensembleCases);
return nameHelper->plotTitle();
}
//--------------------------------------------------------------------------------------------------
@@ -1583,10 +1580,7 @@ void RimSummaryPlot::updateCurveNames()
{
for (auto c : summaryCurves())
{
if (c->isCurveVisible())
{
c->updateCurveNameNoLegendUpdate();
}
c->updateCurveNameNoLegendUpdate();
}
}