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 #8791 from OPM/8790-rename-to-group

Browse Source 
Rename summary references to "Group"
This commit is contained in:
Magne Sjaastad
2022-04-07 21:06:40 +02:00
committed by GitHub
parent f099a8c89f
commit 93614ef272
42 changed files with 631 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp
View File

@@ -90,7 +90,7 @@ caf::PdmOptionItemInfo
case RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION:
iconText = ":/summary/components/images/region-region.svg";
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
case RifEclipseSummaryAddress::SUMMARY_GROUP:
iconText = ":/summary/components/images/group.svg";
break;
case RifEclipseSummaryAddress::SUMMARY_WELL:

26
ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp
View File

@@ -112,9 +112,9 @@ std::set<std::string> RiaSummaryAddressAnalyzer::wellNames() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<std::string> RiaSummaryAddressAnalyzer::wellGroupNames() const
std::set<std::string> RiaSummaryAddressAnalyzer::groupNames() const
{
return keysInMap( m_wellGroupNames );
return keysInMap( m_groupNames );
}
//--------------------------------------------------------------------------------------------------
@@ -190,15 +190,15 @@ std::set<RifEclipseSummaryAddress::SummaryVarCategory> RiaSummaryAddressAnalyzer
//--------------------------------------------------------------------------------------------------
std::vector<std::vector<RifEclipseSummaryAddress>> RiaSummaryAddressAnalyzer::addressesGroupedByObject() const
{
auto wellAdr = valuesInMap( m_wellNames );
auto wellGroupAdr = valuesInMap( m_wellGroupNames );
auto regionAdr = valuesInMap( m_regionNumbers );
auto blockAdr = valuesInMap( m_blocks );
auto aquiferAdr = valuesInMap( m_aquifers );
auto wellAdr = valuesInMap( m_wellNames );
auto groupAdr = valuesInMap( m_groupNames );
auto regionAdr = valuesInMap( m_regionNumbers );
auto blockAdr = valuesInMap( m_blocks );
auto aquiferAdr = valuesInMap( m_aquifers );
std::vector<std::vector<RifEclipseSummaryAddress>> groupedByObject;
groupedByObject.insert( groupedByObject.end(), wellAdr.begin(), wellAdr.end() );
groupedByObject.insert( groupedByObject.end(), wellGroupAdr.begin(), wellGroupAdr.end() );
groupedByObject.insert( groupedByObject.end(), groupAdr.begin(), groupAdr.end() );
groupedByObject.insert( groupedByObject.end(), regionAdr.begin(), regionAdr.end() );
groupedByObject.insert( groupedByObject.end(), blockAdr.begin(), blockAdr.end() );
groupedByObject.insert( groupedByObject.end(), aquiferAdr.begin(), aquiferAdr.end() );
@@ -230,9 +230,9 @@ std::vector<QString> RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma
identifierStrings.push_back( QString::fromStdString( key ) );
}
}
else if ( category == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP )
else if ( category == RifEclipseSummaryAddress::SUMMARY_GROUP )
{
auto keys = keysInMap( m_wellGroupNames );
auto keys = keysInMap( m_groupNames );
for ( const auto& key : keys )
{
identifierStrings.push_back( QString::fromStdString( key ) );
@@ -317,7 +317,7 @@ void RiaSummaryAddressAnalyzer::clear()
{
m_quantities.clear();
m_wellNames.clear();
m_wellGroupNames.clear();
m_groupNames.clear();
m_regionNumbers.clear();
m_categories.clear();
m_wellCompletions.clear();
@@ -393,9 +393,9 @@ void RiaSummaryAddressAnalyzer::analyzeSingleAddress( const RifEclipseSummaryAdd
m_quantities.insert( address.quantityName() );
}
if ( !address.wellGroupName().empty() )
if ( !address.groupName().empty() )
{
m_wellGroupNames.insert( { address.wellGroupName(), address } );
m_groupNames.insert( { address.groupName(), address } );
}
if ( address.regionNumber() != -1 )

4
ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h
View File

@@ -49,7 +49,7 @@ public:
std::string quantityNameForTitle() const;
std::set<std::string> wellNames() const;
std::set<std::string> wellGroupNames() const;
std::set<std::string> groupNames() const;
std::set<int> regionNumbers() const;
std::set<std::string> wellCompletions( const std::string& wellName ) const;
@@ -90,7 +90,7 @@ private:
mutable std::set<std::string> m_quantitiesNoMatchingHistory;
std::multimap<std::string, RifEclipseSummaryAddress> m_wellNames;
std::multimap<std::string, RifEclipseSummaryAddress> m_wellGroupNames;
std::multimap<std::string, RifEclipseSummaryAddress> m_groupNames;
std::multimap<int, RifEclipseSummaryAddress> m_regionNumbers;
std::set<std::pair<std::string, std::string>> m_wellCompletions;
std::set<std::pair<std::string, int>> m_wellSegmentNumbers;