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

#5131 : Calculated curves : Show native address in title

Browse Source
This commit is contained in:
Magne Sjaastad
2019-12-10 13:18:14 +01:00
committed by Kristian Bendiksen
parent 03581804e2
commit 532d5899de
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,10 @@
#include "RimMultiPlotWindow.h"
#include "RimPlotAxisProperties.h"
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCalculationVariable.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
@@ -1779,16 +1783,38 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
{
for ( RimSummaryCurve* curve : m_summaryCurveCollection->curves() )
{
addresses.push_back( curve->summaryAddressY() );
sumCases.push_back( curve->summaryCaseY() );
if ( curve->summaryCaseX() )
if ( curve->summaryAddressY().category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
sumCases.push_back( curve->summaryCaseX() );
RimProject* proj = RiaApplication::instance()->project();
RimSummaryCalculationCollection* calculationColl = proj->calculationCollection();
if ( curve->summaryAddressX().category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
if ( calculationColl )
{
addresses.push_back( curve->summaryAddressX() );
RimSummaryCalculation* calculation = calculationColl->findCalculationById(
curve->summaryAddressY().id() );
if ( calculation )
{
for ( RimSummaryCalculationVariable* v : calculation->allVariables() )
{
sumCases.push_back( v->summaryCase() );
addresses.push_back( v->summaryAddress()->address() );
}
}
}
}
else
{
addresses.push_back( curve->summaryAddressY() );
sumCases.push_back( curve->summaryCaseY() );
if ( curve->summaryCaseX() )
{
sumCases.push_back( curve->summaryCaseX() );
if ( curve->summaryAddressX().category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
{
addresses.push_back( curve->summaryAddressX() );
}
}
}
}