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

16
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@@ -119,6 +119,22 @@ std::vector<RimSummaryCalculation*> RimSummaryCalculationCollection::calculation
return m_calcuations.childObjects(); return m_calcuations.childObjects();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCalculation* RimSummaryCalculationCollection::findCalculationById( int id ) const
{
for ( RimSummaryCalculation* calc : m_calcuations )
{
if ( calc->id() == id )
{
return calc;
}
}
return nullptr;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.h
View File

@@ -41,6 +41,7 @@ public:
RimSummaryCalculation* addCalculationCopy( const RimSummaryCalculation* sourceCalculation ); RimSummaryCalculation* addCalculationCopy( const RimSummaryCalculation* sourceCalculation );
void deleteCalculation( RimSummaryCalculation* calculation ); void deleteCalculation( RimSummaryCalculation* calculation );
std::vector<RimSummaryCalculation*> calculations() const; std::vector<RimSummaryCalculation*> calculations() const;
RimSummaryCalculation* findCalculationById( int id ) const;
RimSummaryCase* calculationSummaryCase(); RimSummaryCase* calculationSummaryCase();

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

@@ -36,6 +36,10 @@
#include "RimMultiPlotWindow.h" #include "RimMultiPlotWindow.h"
#include "RimPlotAxisProperties.h" #include "RimPlotAxisProperties.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCalculationVariable.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h" #include "RimSummaryCurveCollection.h"
@@ -1778,6 +1782,27 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
if ( m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible() ) if ( m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible() )
{ {
for ( RimSummaryCurve* curve : m_summaryCurveCollection->curves() ) for ( RimSummaryCurve* curve : m_summaryCurveCollection->curves() )
{
if ( curve->summaryAddressY().category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
RimProject* proj = RiaApplication::instance()->project();
RimSummaryCalculationCollection* calculationColl = proj->calculationCollection();
if ( calculationColl )
{
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() ); addresses.push_back( curve->summaryAddressY() );
sumCases.push_back( curve->summaryCaseY() ); sumCases.push_back( curve->summaryCaseY() );
@@ -1793,6 +1818,7 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
} }
} }
} }
}
for ( auto curveSet : m_ensembleCurveSetCollection->curveSets() ) for ( auto curveSet : m_ensembleCurveSetCollection->curveSets() )
{ {