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

Append vector name if multiple cases are present

Browse Source
This commit is contained in:
Magne Sjaastad 2023-11-09 13:11:43 +01:00
parent eea56e4818
commit 9af9aa7e66
6 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/ProjectDataModel/Summary/RimMultipleSummaryPlotNameHelper.cpp
View File

@ -256,3 +256,17 @@ std::string RimMultiSummaryPlotNameHelper::titleCompletion() const
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimMultiSummaryPlotNameHelper::numberOfCases() const
{
size_t caseCount = 0;
for ( auto nameHelper : m_nameHelpers )
{
caseCount += nameHelper->numberOfCases();
}
return caseCount;
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimMultipleSummaryPlotNameHelper.h
View File

@ -52,6 +52,8 @@ public:
std::string titleSegment() const override;
std::string titleCompletion() const override;
size_t numberOfCases() const override;
private:
std::vector<const RimSummaryNameHelper*> m_nameHelpers;
};

10
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -279,8 +279,18 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
if ( m_caseName && !skipSubString )
{
const bool isTextEmptyBeforeCaseName = text.empty();
if ( !text.empty() ) text += ", ";
text += caseName;
if ( isTextEmptyBeforeCaseName && currentNameHelper && currentNameHelper->numberOfCases() > 1 &&
currentNameHelper->vectorNames().size() > 1 )
{
// Add vector name to the case name if there are multiple cases and multiple vectors
text += ":" + summaryAddress.vectorName();
}
}
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryNameHelper.h
View File

@ -59,4 +59,6 @@ public:
virtual std::string titleBlock() const = 0;
virtual std::string titleSegment() const = 0;
virtual std::string titleCompletion() const = 0;
virtual size_t numberOfCases() const = 0;
};

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp
View File

@ -270,6 +270,14 @@ std::string RimSummaryPlotNameHelper::titleCompletion() const
return m_titleCompletion;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimSummaryPlotNameHelper::numberOfCases() const
{
return m_summaryCases.size() + m_ensembleCases.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.h
View File

@ -73,6 +73,8 @@ public:
std::string titleSegment() const override;
std::string titleCompletion() const override;
size_t numberOfCases() const override;
private:
void clearTitleSubStrings();
void extractPlotTitleSubStrings();