diff --git a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp index 5d1add2abc..823c57d450 100644 --- a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp +++ b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp @@ -116,7 +116,7 @@ QString RiaSummaryCurveDefinition::curveDefinitionText() const { QString caseName; if ( summaryCase() ) - caseName = summaryCase()->caseName(); + caseName = summaryCase()->displayCaseName(); else if ( ensemble() ) caseName = ensemble()->name(); @@ -176,11 +176,11 @@ bool RiaSummaryCurveDefinition::operator<( const RiaSummaryCurveDefinition& othe if ( m_summaryCase ) { - summaryCaseName = m_summaryCase->caseName(); + summaryCaseName = m_summaryCase->displayCaseName(); } if ( other.summaryCase() ) { - otherSummaryCaseName = other.summaryCase()->caseName(); + otherSummaryCaseName = other.summaryCase()->displayCaseName(); } // First check if names are different to ensure stable alphabetic sort diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp index 8e84f2651c..aba153d100 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp @@ -748,7 +748,7 @@ std::set if ( !usedFilters[cfIdx] ) { RiaLogging::warning( "Vector filter \"" + summaryAddressFilters[static_cast( cfIdx )] + - "\" did not match anything in case: \"" + sumCase->caseName() + "\"" ); + "\" did not match anything in case: \"" + sumCase->nativeCaseName() + "\"" ); } } } @@ -780,7 +780,7 @@ std::vector RicSummaryPlotFeatureImpl::addCurvesFromAddressFil if ( !usedFilters[cfIdx] ) { RiaLogging::warning( "Vector filter \"" + curveFilters[static_cast( cfIdx )] + - "\" did not match anything in case: \"" + summaryCase->caseName() + "\"" ); + "\" did not match anything in case: \"" + summaryCase->nativeCaseName() + "\"" ); } } diff --git a/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp index a449f80ec2..b500e6ddd3 100644 --- a/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp +++ b/ApplicationCode/FileInterface/RifDataSourceForRftPlt.cpp @@ -244,7 +244,7 @@ bool operator<( const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPl { if ( addr1.summaryCase() && addr2.summaryCase() ) { - if ( addr1.summaryCase()->caseName() == addr2.summaryCase()->caseName() ) + if ( addr1.summaryCase()->displayCaseName() == addr2.summaryCase()->displayCaseName() ) { if ( addr1.ensemble() && addr2.ensemble() ) { @@ -252,7 +252,7 @@ bool operator<( const RifDataSourceForRftPlt& addr1, const RifDataSourceForRftPl } return addr1.ensemble() < addr2.ensemble(); } - return addr1.summaryCase()->caseName() < addr2.summaryCase()->caseName(); + return addr1.summaryCase()->displayCaseName() < addr2.summaryCase()->displayCaseName(); } return addr1.summaryCase() < addr2.summaryCase(); } diff --git a/ApplicationCode/ProjectDataModel/RimOilField.cpp b/ApplicationCode/ProjectDataModel/RimOilField.cpp index ec039f9bcf..7909c405d5 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp @@ -28,11 +28,8 @@ #include "RimGeoMechModels.h" #include "RimMeasurement.h" #include "RimObservedDataCollection.h" -#include "RimObservedSummaryData.h" -#include "RimSummaryCase.h" #include "RimSummaryCaseMainCollection.h" #include "RimSurfaceCollection.h" -#include "RimValveTemplateCollection.h" #include "RimWellPathCollection.h" CAF_PDM_SOURCE_INIT( RimOilField, "ResInsightOilField" ); @@ -128,73 +125,6 @@ const RimValveTemplateCollection* RimOilField::valveTemplateCollection() const return completionTemplateCollection()->valveTemplateCollection(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString RimOilField::uniqueShortNameForCase( RimSummaryCase* summaryCase ) -{ - std::set allAutoShortNames; - - std::vector allCases = summaryCaseMainCollection->allSummaryCases(); - std::vector observedDataCases = observedDataCollection->allObservedSummaryData(); - - for ( auto observedData : observedDataCases ) - { - allCases.push_back( observedData ); - } - - for ( RimSummaryCase* sumCase : allCases ) - { - if ( sumCase && sumCase != summaryCase ) - { - allAutoShortNames.insert( sumCase->shortName() ); - } - } - - bool foundUnique = false; - - QString caseName = summaryCase->caseName(); - QString shortName; - - if ( caseName.size() > 2 ) - { - QString candidate; - candidate += caseName[0]; - - for ( int i = 1; i < caseName.size(); ++i ) - { - if ( allAutoShortNames.count( candidate + caseName[i] ) == 0 ) - { - shortName = candidate + caseName[i]; - foundUnique = true; - break; - } - } - } - else - { - shortName = caseName.left( 2 ); - if ( allAutoShortNames.count( shortName ) == 0 ) - { - foundUnique = true; - } - } - - int autoNumber = 0; - - while ( !foundUnique ) - { - QString candidate = shortName + QString::number( autoNumber++ ); - if ( allAutoShortNames.count( candidate ) == 0 ) - { - shortName = candidate; - foundUnique = true; - } - } - - return shortName; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimOilField.h b/ApplicationCode/ProjectDataModel/RimOilField.h index 758a4ff293..ac813a5d11 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.h +++ b/ApplicationCode/ProjectDataModel/RimOilField.h @@ -57,8 +57,6 @@ public: RimValveTemplateCollection* valveTemplateCollection(); const RimValveTemplateCollection* valveTemplateCollection() const; - QString uniqueShortNameForCase( RimSummaryCase* summaryCase ); - caf::PdmChildField analysisModels; caf::PdmChildField geoMechModels; caf::PdmChildField wellPathCollection; diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index 95cb5c3a5a..1c2c938946 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -132,7 +132,7 @@ void RimSummaryCalculationVariable::fieldChangedByUi( const caf::PdmFieldHandle* QString RimSummaryCalculationVariable::summaryAddressDisplayString() const { QString caseName; - if ( m_case() ) caseName = m_case()->caseName(); + if ( m_case() ) caseName = m_case()->displayCaseName(); return RiaSummaryCurveDefinition::curveDefinitionText( caseName, m_summaryAddress()->address() ); } diff --git a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp index c7d6512532..e17ccc546a 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp @@ -336,7 +336,7 @@ QString RimWellLogRftCurve::createCurveAutoName() } else if ( m_summaryCase ) { - name.push_back( m_summaryCase->caseName() ); + name.push_back( m_summaryCase->displayCaseName() ); } else if ( m_observedFmuRftData ) { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp index db94682d70..b389a8816e 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp @@ -184,8 +184,8 @@ void RimDerivedEnsembleCase::calculate( const RifEclipseSummaryAddress& address //-------------------------------------------------------------------------------------------------- QString RimDerivedEnsembleCase::caseName() const { - auto case1Name = m_summaryCase1->caseName(); - auto case2Name = m_summaryCase2->caseName(); + auto case1Name = m_summaryCase1->displayCaseName(); + auto case2Name = m_summaryCase2->displayCaseName(); if ( case1Name == case2Name ) return case1Name; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp index a7157ce15a..735939c00c 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -22,6 +22,7 @@ #include "RifSummaryReaderInterface.h" #include "RimMainPlotCollection.h" +#include "RimObservedDataCollection.h" #include "RimOilField.h" #include "RimProject.h" #include "RimSummaryCaseCollection.h" @@ -30,6 +31,7 @@ #include "cvfAssert.h" +#include "RimObservedSummaryData.h" #include CAF_PDM_ABSTRACT_SOURCE_INIT( RimSummaryCase, "SummaryCase" ); @@ -178,6 +180,14 @@ RifReaderRftInterface* RimSummaryCase::rftReader() return nullptr; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimSummaryCase::errorMessagesFromReader() +{ + return QString(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -191,8 +201,8 @@ void RimSummaryCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin //-------------------------------------------------------------------------------------------------- void RimSummaryCase::updateTreeItemName() { - if ( caseName() != shortName() ) - this->setUiName( caseName() + " (" + shortName() + ")" ); + if ( caseName() != displayCaseName() ) + this->setUiName( caseName() + " (" + displayCaseName() + ")" ); else this->setUiName( caseName() ); } @@ -200,11 +210,19 @@ void RimSummaryCase::updateTreeItemName() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimSummaryCase::shortName() const +QString RimSummaryCase::displayCaseName() const { return m_shortName(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimSummaryCase::nativeCaseName() const +{ + return caseName(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -226,6 +244,77 @@ void RimSummaryCase::initAfterRead() updateOptionSensitivity(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimSummaryCase::uniqueShortNameForCase( RimSummaryCase* summaryCase ) +{ + RimOilField* oilField = nullptr; + summaryCase->firstAncestorOrThisOfType( oilField ); + CVF_ASSERT( oilField ); + + std::set allAutoShortNames; + + std::vector allCases = oilField->summaryCaseMainCollection->allSummaryCases(); + std::vector observedDataCases = oilField->observedDataCollection->allObservedSummaryData(); + + for ( auto observedData : observedDataCases ) + { + allCases.push_back( observedData ); + } + + for ( RimSummaryCase* sumCase : allCases ) + { + if ( sumCase && sumCase != summaryCase ) + { + allAutoShortNames.insert( sumCase->displayCaseName() ); + } + } + + bool foundUnique = false; + + QString caseName = summaryCase->caseName(); + QString shortName; + + if ( caseName.size() > 2 ) + { + QString candidate; + candidate += caseName[0]; + + for ( int i = 1; i < caseName.size(); ++i ) + { + if ( allAutoShortNames.count( candidate + caseName[i] ) == 0 ) + { + shortName = candidate + caseName[i]; + foundUnique = true; + break; + } + } + } + else + { + shortName = caseName.left( 2 ); + if ( allAutoShortNames.count( shortName ) == 0 ) + { + foundUnique = true; + } + } + + int autoNumber = 0; + + while ( !foundUnique ) + { + QString candidate = shortName + QString::number( autoNumber++ ); + if ( allAutoShortNames.count( candidate ) == 0 ) + { + shortName = candidate; + foundUnique = true; + } + } + + return shortName; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -233,11 +322,7 @@ void RimSummaryCase::updateAutoShortName() { if ( m_useAutoShortName ) { - RimOilField* oilField = nullptr; - this->firstAncestorOrThisOfType( oilField ); - CVF_ASSERT( oilField ); - - m_shortName = oilField->uniqueShortNameForCase( this ); + m_shortName = RimSummaryCase::uniqueShortNameForCase( this ); } else if ( m_shortName() == DEFAULT_DISPLAY_NAME ) { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h index ed1d88a63c..c4afffb63d 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h @@ -45,8 +45,8 @@ public: ~RimSummaryCase() override; virtual QString summaryHeaderFilename() const; - virtual QString caseName() const = 0; - QString shortName() const; + QString displayCaseName() const; + QString nativeCaseName() const; RiaEclipseUnitTools::UnitSystemType unitsSystem(); @@ -58,10 +58,7 @@ public: virtual void createRftReaderInterface() {} virtual RifSummaryReaderInterface* summaryReader() = 0; virtual RifReaderRftInterface* rftReader(); - virtual QString errorMessagesFromReader() - { - return QString(); - } + virtual QString errorMessagesFromReader(); virtual void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) = 0; @@ -83,6 +80,13 @@ protected: void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; void updateTreeItemName(); + virtual QString caseName() const = 0; + +private: + void initAfterRead() override; + static QString uniqueShortNameForCase( RimSummaryCase* summaryCase ); + +protected: caf::PdmField m_shortName; caf::PdmField m_useAutoShortName; caf::PdmField m_summaryHeaderFilename; @@ -91,7 +95,4 @@ protected: std::shared_ptr m_crlParameters; static const QString DEFAULT_DISPLAY_NAME; - -private: - void initAfterRead() override; }; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index bbfa85ecb3..7534ad9de7 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -544,13 +544,13 @@ QString RimSummaryCaseMainCollection::uniqueShortNameForCase( RimSummaryCase* su { if ( sumCase && sumCase != summaryCase ) { - allAutoShortNames.insert( sumCase->shortName() ); + allAutoShortNames.insert( sumCase->displayCaseName() ); } } bool foundUnique = false; - QString caseName = summaryCase->caseName(); + QString caseName = summaryCase->nativeCaseName(); QString shortName; if ( caseName.size() > 2 ) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index b09f3e47cd..e3695c7adc 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -385,7 +385,7 @@ QList RimSummaryCurve::calculateValueOptions( const caf: for ( RimSummaryCase* rimCase : cases ) { - options.push_back( caf::PdmOptionItemInfo( rimCase->caseName(), rimCase ) ); + options.push_back( caf::PdmOptionItemInfo( rimCase->displayCaseName(), rimCase ) ); } if ( options.size() > 0 ) @@ -794,12 +794,12 @@ QString RimSummaryCurve::curveExportDescription( const RifEclipseSummaryAddress& { return QString( "%1.%2.%3" ) .arg( QString::fromStdString( addressUiText ) ) - .arg( m_yValuesSummaryCase->caseName() ) + .arg( m_yValuesSummaryCase->nativeCaseName() ) .arg( group->name() ); } else { - return QString( "%1.%2" ).arg( QString::fromStdString( addressUiText ) ).arg( m_yValuesSummaryCase->caseName() ); + return QString( "%1.%2" ).arg( QString::fromStdString( addressUiText ) ).arg( m_yValuesSummaryCase->nativeCaseName() ); } } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp index 29d6fe4329..7cb64cd9df 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp @@ -79,7 +79,7 @@ QString RimSummaryCurveAutoName::curveNameY( const RifEclipseSummaryAddress& sum std::string caseNameY; if ( caseNameY.empty() && summaryCurve && summaryCurve->summaryCaseY() ) { - caseNameY = summaryCurve->summaryCaseY()->caseName().toStdString(); + caseNameY = summaryCurve->summaryCaseY()->displayCaseName().toStdString(); } { @@ -114,7 +114,7 @@ QString RimSummaryCurveAutoName::curveNameX( const RifEclipseSummaryAddress& sum std::string caseNameX; if ( caseNameX.empty() && summaryCurve && summaryCurve->summaryCaseX() ) { - caseNameX = summaryCurve->summaryCaseX()->caseName().toStdString(); + caseNameX = summaryCurve->summaryCaseX()->displayCaseName().toStdString(); } { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index e8bca913fe..038939eb22 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -2107,7 +2107,7 @@ void populateSummaryCurvesData( std::vector curves, SummaryCur if ( isObservedCurve && ( curveType & CURVE_TYPE_OBSERVED ) == 0 ) continue; if ( !isObservedCurve && ( curveType & CURVE_TYPE_GRID ) == 0 ) continue; - QString curveCaseName = curve->summaryCaseY()->caseName(); + QString curveCaseName = curve->summaryCaseY()->displayCaseName(); size_t casePosInList = cvf::UNDEFINED_SIZE_T; for ( size_t i = 0; i < curvesData->caseNames.size(); i++ ) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp index 569a60efff..2204133983 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp @@ -504,7 +504,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::appendOptionItemsForSources( QList< // Top level cases for ( const auto& sumCase : sumCaseMainColl->topLevelSummaryCases() ) { - options.push_back( caf::PdmOptionItemInfo( sumCase->caseName(), sumCase ) ); + options.push_back( caf::PdmOptionItemInfo( sumCase->displayCaseName(), sumCase ) ); } } @@ -539,7 +539,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::appendOptionItemsForSources( QList< for ( const auto& sumCase : sumCaseColl->allSummaryCases() ) { - auto optionItem = caf::PdmOptionItemInfo( sumCase->caseName(), sumCase ); + auto optionItem = caf::PdmOptionItemInfo( sumCase->displayCaseName(), sumCase ); optionItem.setLevel( 1 ); options.push_back( optionItem ); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp index d69b55fe01..f716ab2ddb 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp @@ -293,7 +293,7 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings() if ( summaryCase ) { - m_titleCaseName = summaryCase->shortName(); + m_titleCaseName = summaryCase->displayCaseName(); } } else if ( ensembleCases.size() == 1 && summaryCases.empty() ) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 3b14fc4faf..28a68d1367 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -193,7 +193,7 @@ QList auto summaryCases = RimSummaryPlotSourceStepping::summaryCasesForSourceStepping(); for ( auto sumCase : summaryCases ) { - options.append( caf::PdmOptionItemInfo( sumCase->caseName(), sumCase ) ); + options.append( caf::PdmOptionItemInfo( sumCase->displayCaseName(), sumCase ) ); } return options; diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp index 64774485c0..3eed985d97 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp @@ -1333,7 +1333,7 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForSources( QListtopLevelSummaryCases() ) { - options.push_back( caf::PdmOptionItemInfo( sumCase->caseName(), sumCase ) ); + options.push_back( caf::PdmOptionItemInfo( sumCase->displayCaseName(), sumCase ) ); } } @@ -1368,7 +1368,7 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForSources( QListallSummaryCases() ) { - auto optionItem = caf::PdmOptionItemInfo( sumCase->caseName(), sumCase ); + auto optionItem = caf::PdmOptionItemInfo( sumCase->displayCaseName(), sumCase ); optionItem.setLevel( 1 ); options.push_back( optionItem ); } diff --git a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp index ab533a482a..1b85fccc9f 100644 --- a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp @@ -84,7 +84,7 @@ public: sumCurve = dynamic_cast( riuCurve->ownerRimCurve() ); } - return sumCurve && sumCurve->summaryCaseY() ? sumCurve->summaryCaseY()->caseName() : ""; + return sumCurve && sumCurve->summaryCaseY() ? sumCurve->summaryCaseY()->displayCaseName() : ""; } }; static EnsembleCurveInfoTextProvider ensembleCurveInfoTextProvider;