#11141 Improve curve and plot title for calculated summary curves

Remove obsolete special handling of calculated curves
This commit is contained in:
Magne Sjaastad committed 2024-02-02 10:27:20 +01:00
1 parent 06766b3650
commit 57cb3c0a0b
2 files changed
+1 -25

No files matched your search

@@ -252,18 +252,6 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
{
text = summaryAddress.vectorName();
}
else if ( summaryAddress.isCalculated() )
{
// Need to add case name for calculated summary
RimProject* proj = RimProject::current();
RimSummaryCalculationCollection* calcColl = proj->calculationCollection();
RimUserDefinedCalculation* calculation = calcColl->findCalculationById( summaryAddress.id() );
if ( calculation )
{
text = calculation->shortName().toStdString();
}
}
if ( m_unit && !unitText.empty() )
{
@@ -273,7 +261,7 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
appendAddressDetails( text, summaryAddress, plotNameHelper );
if ( !caseName.empty() && !summaryAddress.isCalculated() )
if ( !caseName.empty() )
{
bool skipSubString = plotNameHelper && plotNameHelper->isCaseInTitle();
@@ -2849,17 +2849,6 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
if ( m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible() )
{
for ( RimSummaryCurve* curve : m_summaryCurveCollection->curves() )
{
if ( curve->summaryAddressY().isCalculated() )
{
std::vector<RifEclipseSummaryAddress> calcAddresses;
RiaSummaryTools::getSummaryCasesAndAddressesForCalculation( curve->summaryAddressY().id(), sumCases, calcAddresses );
for ( const auto& adr : calcAddresses )
{
addresses.emplace_back( adr );
}
}
else
{
addresses.push_back( curve->curveAddress() );
sumCases.push_back( curve->summaryCaseY() );
@@ -2870,7 +2859,6 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
}
}
}
}
for ( auto curveSet : m_ensembleCurveSetCollection->curveSets() )
{