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

Merge pull request #5170 from OPM/avoid-duplicate-text-2

Browse Source 
Observed Data : Do not repeat curve name twice
This commit is contained in:
Magne Sjaastad
2019-12-04 08:05:23 +01:00
committed by GitHub
parent 44a4ba8785 8f99eb2274
commit 0909d820d2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@@ -220,8 +220,8 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
{ {
if ( m_axisProperties->showDescription() ) if ( m_axisProperties->showDescription() )
{ {
quantityNameForDisplay = quantityNameForDisplay = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName(
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName, true ); quantityName );
} }
if ( m_axisProperties->showAcronym() ) if ( m_axisProperties->showAcronym() )

12
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@@ -1510,11 +1510,19 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForSubCategoriesAndVectors(
if ( isVectorField ) if ( isVectorField )
{ {
std::string longVectorName = std::string longVectorName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName(
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( itemName, true ); itemName );
if ( longVectorName.empty() )
{
displayName = QString::fromStdString( itemName );
}
else
{
displayName = QString::fromStdString( longVectorName ); displayName = QString::fromStdString( longVectorName );
displayName += QString( " (%1)" ).arg( QString::fromStdString( itemName ) ); displayName += QString( " (%1)" ).arg( QString::fromStdString( itemName ) );
} }
}
else else
{ {
displayName = QString::fromStdString( itemName ); displayName = QString::fromStdString( itemName );