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

#8893 Rename quantity name -> vector name

Browse Source
This commit is contained in:
Magne Sjaastad
2022-05-06 16:34:37 +02:00
parent 6f1819ba96
commit f52acd9a64
64 changed files with 359 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp
View File

@@ -33,9 +33,9 @@ RiuSummaryQuantityNameInfoProvider* RiuSummaryQuantityNameInfoProvider::instance
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress::SummaryVarCategory
RiuSummaryQuantityNameInfoProvider::categoryFromQuantityName( const std::string& quantity ) const
RiuSummaryQuantityNameInfoProvider::categoryFromVectorName( const std::string& vectorName ) const
{
auto info = quantityInfo( quantity );
auto info = quantityInfo( vectorName );
return info.category;
}
@@ -44,16 +44,16 @@ RifEclipseSummaryAddress::SummaryVarCategory
///
//--------------------------------------------------------------------------------------------------
RiuSummaryQuantityNameInfoProvider::RiuSummaryQuantityInfo
RiuSummaryQuantityNameInfoProvider::quantityInfo( const std::string& quantity ) const
RiuSummaryQuantityNameInfoProvider::quantityInfo( const std::string& vectorName ) const
{
auto it = m_summaryToDescMap.find( quantity );
auto it = m_summaryToDescMap.find( vectorName );
if ( it != m_summaryToDescMap.end() )
{
return it->second;
}
if ( quantity.size() > 1 && quantity[1] == 'U' )
if ( vectorName.size() > 1 && vectorName[1] == 'U' )
{
// User defined vector name
// The summary type is given by the first letter, and U defines user-defined
@@ -63,12 +63,12 @@ RiuSummaryQuantityNameInfoProvider::RiuSummaryQuantityInfo
return RiuSummaryQuantityInfo();
}
if ( quantity.size() > 5 )
if ( vectorName.size() > 5 )
{
// Check for custom vector naming
std::string postfix = quantity.substr( quantity.size() - 5, 5 );
std::string baseName = quantity.substr( 0, 5 );
std::string postfix = vectorName.substr( vectorName.size() - 5, 5 );
std::string baseName = vectorName.substr( 0, 5 );
while ( baseName.back() == '_' )
baseName.pop_back();
@@ -92,8 +92,8 @@ RiuSummaryQuantityNameInfoProvider::RiuSummaryQuantityInfo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RiuSummaryQuantityNameInfoProvider::longNameFromQuantityName( const std::string& vectorName,
bool returnVectorNameIfNotFound ) const
std::string RiuSummaryQuantityNameInfoProvider::longNameFromVectorName( const std::string& vectorName,
bool returnVectorNameIfNotFound ) const
{
auto info = quantityInfo( vectorName );
return info.category != RifEclipseSummaryAddress::SUMMARY_INVALID || !returnVectorNameIfNotFound ? info.longName

6
ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.h
View File

@@ -31,8 +31,8 @@ class RiuSummaryQuantityNameInfoProvider
public:
static RiuSummaryQuantityNameInfoProvider* instance();
RifEclipseSummaryAddress::SummaryVarCategory categoryFromQuantityName( const std::string& quantity ) const;
std::string longNameFromQuantityName( const std::string& quantity, bool returnVectorNameIfNotFound = false ) const;
RifEclipseSummaryAddress::SummaryVarCategory categoryFromVectorName( const std::string& vectorName ) const;
std::string longNameFromVectorName( const std::string& vectorName, bool returnVectorNameIfNotFound = false ) const;
private:
class RiuSummaryQuantityInfo
@@ -55,7 +55,7 @@ private:
private:
RiuSummaryQuantityNameInfoProvider();
RiuSummaryQuantityInfo quantityInfo( const std::string& quantity ) const;
RiuSummaryQuantityInfo quantityInfo( const std::string& vectorName ) const;
static std::unordered_map<std::string, RiuSummaryQuantityInfo> createInfoForEclipseKeywords();
static std::unordered_map<std::string, RiuSummaryQuantityInfo> createInfoFor6xKeywords();

10
ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp
View File

@@ -1115,22 +1115,22 @@ std::set<RifEclipseSummaryAddress>
for ( const auto& adr : addrUnion )
{
if ( m_hideHistoryVectors && adr.isHistoryQuantity() ) continue;
if ( m_hideHistoryVectors && adr.isHistoryVector() ) continue;
if ( m_hideDifferenceVectors )
{
const auto diffText = RifReaderEclipseSummary::differenceIdentifier();
if ( RiaStdStringTools::endsWith( adr.quantityName(), diffText ) ) continue;
if ( RiaStdStringTools::endsWith( adr.vectorName(), diffText ) ) continue;
}
if ( m_hideVectorsWithoutHistory )
{
auto candidateName = adr.quantityName() + RifReaderEclipseSummary::historyIdentifier();
auto candidateName = adr.vectorName() + RifReaderEclipseSummary::historyIdentifier();
bool found = false;
for ( const auto& ad : addrUnion )
{
if ( ad.quantityName() == candidateName ) found = true;
if ( ad.vectorName() == candidateName ) found = true;
}
if ( !found ) continue;
@@ -1549,7 +1549,7 @@ void RiuSummaryVectorSelectionUi::appendOptionItemsForSubCategoriesAndVectors( Q
if ( isVectorField )
{
std::string longVectorName =
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( itemName );
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( itemName );
if ( longVectorName.empty() )
{