From 806f36756694dedd9f4be07aac812c95028fb5d6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 18 Sep 2023 09:28:29 +0200 Subject: [PATCH] Rename to SummaryCategory --- .../Tools/RiaOptionItemFactory.cpp | 38 +-- .../Application/Tools/RiaOptionItemFactory.h | 2 +- .../Tools/RiaSummaryAddressAnalyzer.cpp | 42 +-- .../Tools/RiaSummaryAddressAnalyzer.h | 14 +- .../RicSaveMultiPlotTemplateFeature.cpp | 6 +- .../RicNewSummaryTableFeature.h | 8 +- .../RicPasteAsciiDataToSummaryPlotFeatureUi.h | 4 +- .../FileInterface/RifCsvUserDataParser.cpp | 4 +- .../FileInterface/RifEclEclipseSummary.cpp | 30 +- .../RifEclipseSummaryAddress.cpp | 230 +++++++-------- .../FileInterface/RifEclipseSummaryAddress.h | 30 +- .../RifEclipseSummaryAddressDefines.h | 2 +- .../RifEclipseUserDataKeywordTools.cpp | 32 +- .../RifEnsembleStatisticsReader.cpp | 2 +- .../FileInterface/RifReaderObservedData.cpp | 10 +- .../FileInterface/RifReaderObservedData.h | 4 +- .../RifRevealCsvSectionSummaryReader.cpp | 4 +- .../RifRevealCsvSectionSummaryReader.h | 2 +- .../RifRevealCsvSummaryReader.cpp | 4 +- .../RimAnalysisPlotCollection.cpp | 2 +- .../RimDataSourceSteppingTools.cpp | 20 +- .../RimDataSourceSteppingTools.h | 2 +- .../RimSimWellInViewCollection.cpp | 2 +- .../RimSummaryCalculation.cpp | 60 ++-- .../ProjectDataModel/RimSummaryCalculation.h | 2 +- .../Summary/RimEnsembleCurveSet.cpp | 12 +- .../Summary/RimObservedSummaryData.cpp | 18 +- .../Summary/RimObservedSummaryData.h | 4 +- .../Summary/RimSummaryAddress.cpp | 16 +- .../Summary/RimSummaryAddress.h | 4 +- .../Summary/RimSummaryAddressCollection.cpp | 30 +- .../Summary/RimSummaryCurve.cpp | 2 +- .../RimSummaryCurveAppearanceCalculator.cpp | 2 +- .../Summary/RimSummaryCurveAutoName.cpp | 26 +- .../Summary/RimSummaryPlot.cpp | 12 +- .../Summary/RimSummaryPlotSourceStepping.cpp | 62 ++-- .../Summary/RimSummaryTable.cpp | 40 +-- .../Summary/RimSummaryTable.h | 8 +- .../Summary/RimSummaryTableCollection.cpp | 2 +- .../Summary/RimSummaryTableCollection.h | 2 +- .../UnitTests/ObservedDataParser-Test.cpp | 2 +- .../RiaSummaryAddressAnalyzer-Test.cpp | 2 +- .../RifEclipseSummaryAddress-Test.cpp | 46 +-- .../RifRevealCsvSectionSummaryReader-Test.cpp | 4 +- .../RiuSummaryVectorDescriptionMap-Test.cpp | 10 +- .../RiuSummaryQuantityNameInfoProvider.cpp | 40 +-- .../RiuSummaryQuantityNameInfoProvider.h | 10 +- .../RiuSummaryVectorSelectionUi.cpp | 278 +++++++++--------- .../RiuSummaryVectorSelectionUi.h | 8 +- 49 files changed, 598 insertions(+), 598 deletions(-) diff --git a/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp b/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp index 331a8837a5..33aeb9086b 100644 --- a/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp +++ b/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp @@ -55,9 +55,9 @@ void RiaOptionItemFactory::appendOptionItemsForEnsembleCurveSets( QList::uiText( summaryType ); + auto uiText = caf::AppEnum::uiText( summaryType ); // Use icons from https://github.com/equinor/webviz-subsurface-components @@ -65,55 +65,55 @@ caf::PdmOptionItemInfo RiaOptionItemFactory::optionItemFromSummaryType( RifEclip switch ( summaryType ) { - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID: iconText = ":/summary/components/images/invalid.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD: iconText = ":/summary/components/images/field.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER: iconText = ":/summary/components/images/aquifer.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK: iconText = ":/summary/components/images/network.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC: iconText = ":/summary/components/images/misc.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION: iconText = ":/summary/components/images/region.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION: iconText = ":/summary/components/images/region-region.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP: iconText = ":/summary/components/images/group.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL: iconText = ":/summary/components/images/well.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION: iconText = ":/summary/components/images/well-completion.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR: iconText = ":/summary/components/images/well.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: iconText = ":/summary/components/images/well-completion.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT: iconText = ":/summary/components/images/segment.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK: iconText = ":/summary/components/images/block.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR: iconText = ":/summary/components/images/block.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED: iconText = ":/summary/components/images/others.svg"; break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS: break; } diff --git a/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.h b/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.h index 77a788aa80..4fdf552330 100644 --- a/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.h +++ b/ApplicationLibCode/Application/Tools/RiaOptionItemFactory.h @@ -31,5 +31,5 @@ class RiaOptionItemFactory public: static void appendOptionItemFromViewNameAndCaseName( Rim3dView* view, QList* optionItems ); static void appendOptionItemsForEnsembleCurveSets( QList* options ); - static caf::PdmOptionItemInfo optionItemFromSummaryType( RifEclipseSummaryAddressDefines::SummaryVarCategory summaryType ); + static caf::PdmOptionItemInfo optionItemFromSummaryType( RifEclipseSummaryAddressDefines::SummaryCategory summaryType ); }; diff --git a/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp b/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp index d614b56956..7b9cdc369c 100644 --- a/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp +++ b/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp @@ -205,7 +205,7 @@ std::set RiaSummaryAddressAnalyzer::aquifers() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::set RiaSummaryAddressAnalyzer::categories() const +std::set RiaSummaryAddressAnalyzer::categories() const { return keysInMap( m_categories ); } @@ -238,12 +238,12 @@ std::vector> RiaSummaryAddressAnalyzer::ad //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSummaryAddressDefines::SummaryVarCategory category, +std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSummaryAddressDefines::SummaryCategory category, const std::string& secondaryIdentifier ) const { std::vector identifierStrings; - if ( category == SummaryVarCategory::SUMMARY_REGION ) + if ( category == SummaryCategory::SUMMARY_REGION ) { auto keys = keysInMap( m_regionNumbers ); for ( const auto& key : keys ) @@ -251,7 +251,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::number( key ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_WELL ) + else if ( category == SummaryCategory::SUMMARY_WELL ) { auto keys = keysInMap( m_wellNames ); for ( const auto& key : keys ) @@ -259,7 +259,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::fromStdString( key ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_GROUP ) + else if ( category == SummaryCategory::SUMMARY_GROUP ) { auto keys = keysInMap( m_groupNames ); for ( const auto& key : keys ) @@ -267,7 +267,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::fromStdString( key ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_NETWORK ) + else if ( category == SummaryCategory::SUMMARY_NETWORK ) { auto keys = keysInMap( m_networkNames ); for ( const auto& key : keys ) @@ -275,7 +275,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::fromStdString( key ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_BLOCK ) + else if ( category == SummaryCategory::SUMMARY_BLOCK ) { auto keys = keysInMap( m_blocks ); for ( const auto& key : keys ) @@ -283,7 +283,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::fromStdString( key ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_WELL_SEGMENT ) + else if ( category == SummaryCategory::SUMMARY_WELL_SEGMENT ) { auto segmentNumbers = wellSegmentNumbers( secondaryIdentifier ); for ( const auto& segment : segmentNumbers ) @@ -291,7 +291,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::number( segment ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_WELL_COMPLETION ) + else if ( category == SummaryCategory::SUMMARY_WELL_COMPLETION ) { auto connections = wellCompletions( secondaryIdentifier ); for ( const auto& conn : connections ) @@ -299,7 +299,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma identifierStrings.push_back( QString::fromStdString( conn ) ); } } - else if ( category == SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( category == SummaryCategory::SUMMARY_AQUIFER ) { auto keys = keysInMap( m_aquifers ); for ( const auto& key : keys ) @@ -316,7 +316,7 @@ std::vector RiaSummaryAddressAnalyzer::identifierTexts( RifEclipseSumma //-------------------------------------------------------------------------------------------------- std::vector RiaSummaryAddressAnalyzer::addressesForCategory( const std::set& addresses, - RifEclipseSummaryAddressDefines::SummaryVarCategory category ) + RifEclipseSummaryAddressDefines::SummaryCategory category ) { std::vector filteredAddresses; @@ -350,7 +350,7 @@ std::string RiaSummaryAddressAnalyzer::correspondingHistorySummaryCurveName( con //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::set RiaSummaryAddressAnalyzer::vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category ) +std::set RiaSummaryAddressAnalyzer::vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category ) { auto it = m_categories.find( category ); if ( it != m_categories.end() ) return it->second; @@ -457,32 +457,32 @@ void RiaSummaryAddressAnalyzer::analyzeSingleAddress( const RifEclipseSummaryAdd m_regionNumbers.insert( { address.regionNumber(), address } ); } - if ( address.category() == SummaryVarCategory::SUMMARY_WELL_COMPLETION ) + if ( address.category() == SummaryCategory::SUMMARY_WELL_COMPLETION ) { auto wellNameAndCompletion = std::make_pair( wellName, address.blockAsString() ); m_wellCompletions.insert( wellNameAndCompletion ); } - else if ( address.category() == SummaryVarCategory::SUMMARY_WELL_SEGMENT ) + else if ( address.category() == SummaryCategory::SUMMARY_WELL_SEGMENT ) { auto wellNameAndSegment = std::make_pair( wellName, address.wellSegmentNumber() ); m_wellSegmentNumbers.insert( wellNameAndSegment ); } - else if ( address.category() == SummaryVarCategory::SUMMARY_BLOCK ) + else if ( address.category() == SummaryCategory::SUMMARY_BLOCK ) { auto text = address.blockAsString(); m_blocks.insert( { text, address } ); } - else if ( address.category() == SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( address.category() == SummaryCategory::SUMMARY_AQUIFER ) { m_aquifers.insert( { address.aquiferNumber(), address } ); } - else if ( address.category() == SummaryVarCategory::SUMMARY_FIELD || address.category() == SummaryVarCategory::SUMMARY_MISC ) + else if ( address.category() == SummaryCategory::SUMMARY_FIELD || address.category() == SummaryCategory::SUMMARY_MISC ) { m_otherCategory.push_back( address ); } - if ( address.category() != SummaryVarCategory::SUMMARY_INVALID ) + if ( address.category() != SummaryCategory::SUMMARY_INVALID ) { if ( m_categories.count( address.category() ) == 0 ) { @@ -522,10 +522,10 @@ std::set RiaSummaryAddressAnalyzer::keysInMap( const std::multimap - RiaSummaryAddressAnalyzer::keysInMap( const std::map>& map ) +std::set + RiaSummaryAddressAnalyzer::keysInMap( const std::map>& map ) { - std::set keys; + std::set keys; for ( const auto& [key, value] : map ) { keys.insert( key ); diff --git a/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h b/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h index dc6727cec2..4426545c65 100644 --- a/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h +++ b/ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.h @@ -60,18 +60,18 @@ public: std::set blocks() const; std::set aquifers() const; - std::set categories() const; + std::set categories() const; std::vector> addressesGroupedByObject() const; - std::vector identifierTexts( RifEclipseSummaryAddressDefines::SummaryVarCategory category, + std::vector identifierTexts( RifEclipseSummaryAddressDefines::SummaryCategory category, const std::string& secondaryIdentifier ) const; static std::vector addressesForCategory( const std::set& addresses, - RifEclipseSummaryAddressDefines::SummaryVarCategory category ); + RifEclipseSummaryAddressDefines::SummaryCategory category ); static std::string correspondingHistorySummaryCurveName( const std::string& curveName ); - std::set vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category ); + std::set vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category ); private: void assignCategoryToQuantities() const; @@ -81,8 +81,8 @@ private: static std::set keysInMap( const std::multimap& map ); static std::set keysInMap( const std::multimap& map ); - static std::set - keysInMap( const std::map>& map ); + static std::set + keysInMap( const std::map>& map ); static std::vector> valuesInMap( const std::multimap& map ); @@ -103,5 +103,5 @@ private: std::multimap m_blocks; std::multimap m_aquifers; - std::map> m_categories; + std::map> m_categories; }; diff --git a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp index ab05853947..b2d6d50805 100644 --- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp +++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp @@ -219,7 +219,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl } replaceStrings( sourceStrings, - dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ), + dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ), RicSummaryPlotTemplateTools::placeholderTextForWell(), objectAsText ); } @@ -233,7 +233,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl } replaceStrings( sourceStrings, - dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ), + dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ), RicSummaryPlotTemplateTools::placeholderTextForGroup(), objectAsText ); } @@ -251,7 +251,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl // Encode placeholder index. Use negative values below -1 to represent a placeholder index int index = -( i + 2 ); - QString fieldKeyword = dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ); + QString fieldKeyword = dummy.keywordForCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ); QString sourceString = QString( "<%1>%2" ).arg( fieldKeyword ).arg( regionNumbers[i] ); QString replacementTextWithIndex = QString( "<%1>%2" ).arg( fieldKeyword ).arg( index ); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryTableFeature.h b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryTableFeature.h index 8e4d13f873..1b681da39a 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryTableFeature.h +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryTableFeature.h @@ -37,8 +37,8 @@ private: void setupActionLook( QAction* actionToSetup ) override; private: - const std::set m_enabledCategories = - { RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL, - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION, - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP }; + const std::set m_enabledCategories = + { RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL, + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION, + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP }; }; diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h b/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h index 4afc7de5c7..2f6543135e 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h @@ -42,7 +42,7 @@ public: : useCustomDateTimeFormat( false ) , assumeNumericDataColumns( false ) , curveSymbolSkipDistance( 0.0f ) - , defaultCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + , defaultCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { } @@ -62,7 +62,7 @@ public: QDateTime startDateTime; bool assumeNumericDataColumns; - RifEclipseSummaryAddressDefines::SummaryVarCategory defaultCategory; + RifEclipseSummaryAddressDefines::SummaryCategory defaultCategory; RiuQwtPlotCurveDefines::LineStyleEnum curveLineStyle; RiuPlotCurveSymbol::PointSymbolEnum curveSymbol; diff --git a/ApplicationLibCode/FileInterface/RifCsvUserDataParser.cpp b/ApplicationLibCode/FileInterface/RifCsvUserDataParser.cpp index 2f88adbf68..000e1d3e45 100644 --- a/ApplicationLibCode/FileInterface/RifCsvUserDataParser.cpp +++ b/ApplicationLibCode/FileInterface/RifCsvUserDataParser.cpp @@ -419,9 +419,9 @@ bool RifCsvUserDataParser::parseColumnInfo( QTextStream* RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( colName.toStdString() ); // Create address of a give category if provided - if ( parseOptions.defaultCategory == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + if ( parseOptions.defaultCategory == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) addr = RifEclipseSummaryAddress::wellAddress( colName.toStdString(), nameFromData.toStdString() ); - else if ( parseOptions.defaultCategory == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ) + else if ( parseOptions.defaultCategory == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ) addr = RifEclipseSummaryAddress::fieldAddress( colName.toStdString() ); double scaleFactor = 1.0; diff --git a/ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp b/ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp index e346c71255..5920063f2b 100644 --- a/ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp +++ b/ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp @@ -107,7 +107,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu return RifEclipseSummaryAddress(); } - RifEclipseSummaryAddressDefines::SummaryVarCategory sumCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ); + RifEclipseSummaryAddressDefines::SummaryCategory sumCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ); std::string quantityName; int regionNumber( -1 ); int regionNumber2( -1 ); @@ -129,36 +129,36 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu { case ECL_SMSPEC_AQUIFER_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER; aquiferNumber = ertSumVarNode.get_num(); } break; case ECL_SMSPEC_WELL_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL; wellName = stringFromPointer( ertSumVarNode.get_wgname() ); } break; case ECL_SMSPEC_REGION_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION; regionNumber = ertSumVarNode.get_num(); } break; case ECL_SMSPEC_FIELD_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD; } break; case ECL_SMSPEC_GROUP_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP; groupName = stringFromPointer( ertSumVarNode.get_wgname() ); } break; case ECL_SMSPEC_BLOCK_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK; auto ijk = ertSumVarNode.get_ijk(); cellI = ijk[0]; @@ -168,7 +168,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu break; case ECL_SMSPEC_COMPLETION_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION; wellName = stringFromPointer( ertSumVarNode.get_wgname() ); auto ijk = ertSumVarNode.get_ijk(); @@ -179,7 +179,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu break; case ECL_SMSPEC_LOCAL_BLOCK_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR; lgrName = stringFromPointer( ertSumVarNode.get_lgr_name() ); auto ijk = ertSumVarNode.get_lgr_ijk(); @@ -190,7 +190,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu break; case ECL_SMSPEC_LOCAL_COMPLETION_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR; wellName = stringFromPointer( ertSumVarNode.get_wgname() ); lgrName = stringFromPointer( ertSumVarNode.get_lgr_name() ); @@ -202,33 +202,33 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode( const ecl::smspec_node& ertSu break; case ECL_SMSPEC_LOCAL_WELL_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR; wellName = stringFromPointer( ertSumVarNode.get_wgname() ); lgrName = stringFromPointer( ertSumVarNode.get_lgr_name() ); } break; case ECL_SMSPEC_NETWORK_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK; } break; case ECL_SMSPEC_REGION_2_REGION_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION; regionNumber = ertSumVarNode.get_R1(); regionNumber2 = ertSumVarNode.get_R2(); } break; case ECL_SMSPEC_SEGMENT_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT; wellName = stringFromPointer( ertSumVarNode.get_wgname() ); wellSegmentNumber = ertSumVarNode.get_num(); } break; case ECL_SMSPEC_MISC_VAR: { - sumCategory = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC; + sumCategory = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC; } break; default: diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp index bb4e51cf85..40e8d4768a 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp @@ -31,8 +31,8 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, std::map& identifiers ) - : m_variableCategory( category ) +RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryCategory category, std::map& identifiers ) + : m_category( category ) , m_number0( -1 ) , m_number1( -1 ) , m_number2( -1 ) @@ -42,48 +42,48 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, std::pair reg2regPair; switch ( category ) { - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: m_number0 = RiaStdStringTools::toInt16( identifiers[SummaryIdentifierType::INPUT_REGION_NUMBER] ); break; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: reg2regPair = regionToRegionPairFromUiText( identifiers[SummaryIdentifierType::INPUT_REGION_2_REGION] ); m_number0 = reg2regPair.first; m_number1 = reg2regPair.second; break; - case SummaryVarCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_GROUP: m_name = identifiers[SummaryIdentifierType::INPUT_GROUP_NAME]; break; - case SummaryVarCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_NETWORK: m_name = identifiers[SummaryIdentifierType::INPUT_NETWORK_NAME]; break; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: m_name = identifiers[SummaryIdentifierType::INPUT_WELL_NAME]; break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: m_name = identifiers[SummaryIdentifierType::INPUT_WELL_NAME]; setCellIjk( ijkTupleFromUiText( identifiers[SummaryIdentifierType::INPUT_CELL_IJK] ) ); break; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: m_lgrName = identifiers[SummaryIdentifierType::INPUT_LGR_NAME]; m_name = identifiers[SummaryIdentifierType::INPUT_WELL_NAME]; break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: m_lgrName = identifiers[SummaryIdentifierType::INPUT_LGR_NAME]; m_name = identifiers[SummaryIdentifierType::INPUT_WELL_NAME]; setCellIjk( ijkTupleFromUiText( identifiers[SummaryIdentifierType::INPUT_CELL_IJK] ) ); break; - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_WELL_SEGMENT: m_name = identifiers[SummaryIdentifierType::INPUT_WELL_NAME]; m_number0 = RiaStdStringTools::toInt( identifiers[SummaryIdentifierType::INPUT_SEGMENT_NUMBER] ); break; - case SummaryVarCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK: setCellIjk( ijkTupleFromUiText( identifiers[SummaryIdentifierType::INPUT_CELL_IJK] ) ); break; - case SummaryVarCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_BLOCK_LGR: m_lgrName = identifiers[SummaryIdentifierType::INPUT_LGR_NAME]; setCellIjk( ijkTupleFromUiText( identifiers[SummaryIdentifierType::INPUT_CELL_IJK] ) ); break; - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: m_number0 = RiaStdStringTools::toInt( identifiers[SummaryIdentifierType::INPUT_AQUIFER_NUMBER] ); break; } @@ -95,7 +95,7 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, +RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryCategory category, const std::string& vectorName, int regionNumber, int regionNumber2, @@ -110,7 +110,7 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, int aquiferNumber, bool isErrorResult, int id ) - : m_variableCategory( category ) + : m_category( category ) , m_vectorName( vectorName ) , m_lgrName( lgrName ) , m_number0( -1 ) @@ -121,44 +121,44 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, { switch ( category ) { - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: m_number0 = regionNumber; break; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: m_number0 = regionNumber; m_number1 = regionNumber2; break; - case SummaryVarCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_GROUP: m_name = groupName; break; - case SummaryVarCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_NETWORK: m_name = networkName; break; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: m_name = wellName; break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: m_name = wellName; setCellIjk( cellI, cellJ, cellK ); break; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: m_name = wellName; break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: m_name = wellName; setCellIjk( cellI, cellJ, cellK ); break; - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_WELL_SEGMENT: m_name = wellName; m_number0 = wellSegmentNumber; break; - case SummaryVarCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK: setCellIjk( cellI, cellJ, cellK ); break; - case SummaryVarCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_BLOCK_LGR: setCellIjk( cellI, cellJ, cellK ); break; - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: m_number0 = aquiferNumber; break; } @@ -168,7 +168,7 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory category, /// //-------------------------------------------------------------------------------------------------- RifEclipseSummaryAddress::RifEclipseSummaryAddress() - : m_variableCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + : m_category( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) , m_number0( -1 ) , m_number1( -1 ) , m_number2( -1 ) @@ -200,7 +200,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromEclipseTextAddressParseEr auto address = fromTokens( tokens ); - if ( address.category() == SummaryVarCategory::SUMMARY_INVALID || address.category() == SummaryVarCategory::SUMMARY_IMPORTED ) + if ( address.category() == SummaryCategory::SUMMARY_INVALID || address.category() == SummaryCategory::SUMMARY_IMPORTED ) { // Address category not recognized, use incoming text string without error prefix as vector name auto text = RiaStdStringTools::joinStrings( tokens, ':' ); @@ -227,7 +227,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromEclipseTextAddress( const RifEclipseSummaryAddress RifEclipseSummaryAddress::fieldAddress( const std::string& vectorName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_FIELD; + addr.m_category = SummaryCategory::SUMMARY_FIELD; addr.m_vectorName = vectorName; addr.m_id = calculationId; return addr; @@ -239,7 +239,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fieldAddress( const std::stri RifEclipseSummaryAddress RifEclipseSummaryAddress::aquiferAddress( const std::string& vectorName, int aquiferNumber, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_AQUIFER; + addr.m_category = SummaryCategory::SUMMARY_AQUIFER; addr.m_vectorName = vectorName; addr.m_number0 = aquiferNumber; addr.m_id = calculationId; @@ -253,7 +253,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::networkAddress( const std::string& vectorName, const std::string& networkName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_NETWORK; + addr.m_category = SummaryCategory::SUMMARY_NETWORK; addr.m_vectorName = vectorName; addr.m_name = networkName; addr.m_id = calculationId; @@ -266,7 +266,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress RifEclipseSummaryAddress::miscAddress( const std::string& vectorName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_MISC; + addr.m_category = SummaryCategory::SUMMARY_MISC; addr.m_vectorName = vectorName; addr.m_id = calculationId; return addr; @@ -278,7 +278,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::miscAddress( const std::strin RifEclipseSummaryAddress RifEclipseSummaryAddress::regionAddress( const std::string& vectorName, int regionNumber, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_REGION; + addr.m_category = SummaryCategory::SUMMARY_REGION; addr.m_vectorName = vectorName; addr.m_number0 = regionNumber; addr.m_id = calculationId; @@ -292,7 +292,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::regionToRegionAddress( const std::string& vectorName, int regionNumber, int region2Number, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_REGION_2_REGION; + addr.m_category = SummaryCategory::SUMMARY_REGION_2_REGION; addr.m_vectorName = vectorName; addr.m_number0 = regionNumber; addr.m_number1 = region2Number; @@ -306,7 +306,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress RifEclipseSummaryAddress::groupAddress( const std::string& vectorName, const std::string& groupName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_GROUP; + addr.m_category = SummaryCategory::SUMMARY_GROUP; addr.m_vectorName = vectorName; addr.m_name = groupName; addr.m_id = calculationId; @@ -319,7 +319,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::groupAddress( const std::stri RifEclipseSummaryAddress RifEclipseSummaryAddress::wellAddress( const std::string& vectorName, const std::string& wellName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_WELL; + addr.m_category = SummaryCategory::SUMMARY_WELL; addr.m_vectorName = vectorName; addr.m_name = wellName; addr.m_id = calculationId; @@ -333,7 +333,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionAddress( const std::string& vectorName, const std::string& wellName, int i, int j, int k, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_WELL_COMPLETION; + addr.m_category = SummaryCategory::SUMMARY_WELL_COMPLETION; addr.m_vectorName = vectorName; addr.m_name = wellName; addr.setCellIjk( i, j, k ); @@ -350,7 +350,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellLgrAddress( const std::st int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_WELL_LGR; + addr.m_category = SummaryCategory::SUMMARY_WELL_LGR; addr.m_vectorName = vectorName; addr.m_lgrName = lgrName; addr.m_name = wellName; @@ -370,7 +370,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionLgrAddress( con int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR; + addr.m_category = SummaryCategory::SUMMARY_WELL_COMPLETION_LGR; addr.m_vectorName = vectorName; addr.m_lgrName = lgrName; addr.m_name = wellName; @@ -386,7 +386,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellSegmentAddress( const std::string& vectorName, const std::string& wellName, int segmentNumber, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_WELL_SEGMENT; + addr.m_category = SummaryCategory::SUMMARY_WELL_SEGMENT; addr.m_vectorName = vectorName; addr.m_name = wellName; addr.m_number0 = segmentNumber; @@ -400,7 +400,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress RifEclipseSummaryAddress::blockAddress( const std::string& vectorName, int i, int j, int k, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_BLOCK; + addr.m_category = SummaryCategory::SUMMARY_BLOCK; addr.m_vectorName = vectorName; addr.setCellIjk( i, j, k ); addr.m_id = calculationId; @@ -414,7 +414,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::blockLgrAddress( const std::string& vectorName, const std::string& lgrName, int i, int j, int k, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_BLOCK_LGR; + addr.m_category = SummaryCategory::SUMMARY_BLOCK_LGR; addr.m_vectorName = vectorName; addr.m_lgrName = lgrName; addr.setCellIjk( i, j, k ); @@ -428,7 +428,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress RifEclipseSummaryAddress::importedAddress( const std::string& vectorName, int calculationId ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_IMPORTED; + addr.m_category = SummaryCategory::SUMMARY_IMPORTED; addr.m_vectorName = vectorName; addr.m_id = calculationId; return addr; @@ -440,7 +440,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::importedAddress( const std::s RifEclipseSummaryAddress RifEclipseSummaryAddress::ensembleStatisticsAddress( const std::string& vectorName, const std::string& dataQuantityName ) { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS; + addr.m_category = SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS; addr.m_vectorName = vectorName + ":" + dataQuantityName; return addr; } @@ -451,7 +451,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::ensembleStatisticsAddress( co RifEclipseSummaryAddress RifEclipseSummaryAddress::timeAddress() { RifEclipseSummaryAddress addr; - addr.m_variableCategory = SummaryVarCategory::SUMMARY_TIME; + addr.m_category = SummaryCategory::SUMMARY_TIME; return addr; } @@ -481,19 +481,19 @@ std::string RifEclipseSummaryAddress::generateStringFromAddresses( const std::ve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifEclipseSummaryAddress::isDependentOnWellName( SummaryVarCategory category ) +bool RifEclipseSummaryAddress::isDependentOnWellName( SummaryCategory category ) { - return ( category == SummaryVarCategory::SUMMARY_WELL || category == SummaryVarCategory::SUMMARY_WELL_COMPLETION || - category == SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR || category == SummaryVarCategory::SUMMARY_WELL_LGR || - category == SummaryVarCategory::SUMMARY_WELL_SEGMENT ); + return ( category == SummaryCategory::SUMMARY_WELL || category == SummaryCategory::SUMMARY_WELL_COMPLETION || + category == SummaryCategory::SUMMARY_WELL_COMPLETION_LGR || category == SummaryCategory::SUMMARY_WELL_LGR || + category == SummaryCategory::SUMMARY_WELL_SEGMENT ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddressDefines::SummaryVarCategory RifEclipseSummaryAddress::category() const +RifEclipseSummaryAddressDefines::SummaryCategory RifEclipseSummaryAddress::category() const { - return m_variableCategory; + return m_category; } //-------------------------------------------------------------------------------------------------- @@ -535,7 +535,7 @@ int RifEclipseSummaryAddress::regionNumber2() const //-------------------------------------------------------------------------------------------------- std::string RifEclipseSummaryAddress::groupName() const { - return ( m_variableCategory == SummaryVarCategory::SUMMARY_GROUP ) ? m_name : std::string(); + return ( m_category == SummaryCategory::SUMMARY_GROUP ) ? m_name : std::string(); } //-------------------------------------------------------------------------------------------------- @@ -543,7 +543,7 @@ std::string RifEclipseSummaryAddress::groupName() const //-------------------------------------------------------------------------------------------------- std::string RifEclipseSummaryAddress::networkName() const { - return ( m_variableCategory == SummaryVarCategory::SUMMARY_NETWORK ) ? m_name : std::string(); + return ( m_category == SummaryCategory::SUMMARY_NETWORK ) ? m_name : std::string(); } //-------------------------------------------------------------------------------------------------- @@ -551,7 +551,7 @@ std::string RifEclipseSummaryAddress::networkName() const //-------------------------------------------------------------------------------------------------- std::string RifEclipseSummaryAddress::wellName() const { - return isDependentOnWellName( m_variableCategory ) ? m_name : std::string(); + return isDependentOnWellName( m_category ) ? m_name : std::string(); } //-------------------------------------------------------------------------------------------------- @@ -651,45 +651,45 @@ std::string RifEclipseSummaryAddress::itemUiText() const switch ( category() ) { - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: { text += std::to_string( regionNumber() ); } break; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: { text += formatUiTextRegionToRegion(); } break; - case SummaryVarCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_GROUP: { text += groupName(); } break; - case SummaryVarCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_NETWORK: { text += networkName(); } break; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: { text += wellName(); } break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: { text += wellName(); text += ":" + blockAsString(); } break; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: { text += lgrName(); text += ":"; text += wellName(); } break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: { text += lgrName(); text += ":"; @@ -698,31 +698,31 @@ std::string RifEclipseSummaryAddress::itemUiText() const text += blockAsString(); } break; - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_WELL_SEGMENT: { text += wellName(); text += ":"; text += std::to_string( wellSegmentNumber() ); } break; - case SummaryVarCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK: { text += blockAsString(); } break; - case SummaryVarCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_BLOCK_LGR: { text += lgrName(); text += ":"; text += blockAsString(); } break; - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: { text += std::to_string( aquiferNumber() ); } break; - case SummaryVarCategory::SUMMARY_IMPORTED: + case SummaryCategory::SUMMARY_IMPORTED: { text += vectorName(); } @@ -788,39 +788,39 @@ bool RifEclipseSummaryAddress::isValid() const switch ( category() ) { - case SummaryVarCategory::SUMMARY_INVALID: + case SummaryCategory::SUMMARY_INVALID: return false; - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: if ( m_number0 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: if ( m_number0 == -1 ) return false; if ( m_number1 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_GROUP: if ( m_name.empty() ) return false; return true; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: if ( m_name.empty() ) return false; return true; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: if ( m_name.empty() ) return false; if ( m_number0 == -1 ) return false; if ( m_number1 == -1 ) return false; if ( m_number2 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: if ( m_lgrName.empty() ) return false; if ( m_name.empty() ) return false; return true; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: if ( m_lgrName.empty() ) return false; if ( m_name.empty() ) return false; if ( m_number0 == -1 ) return false; @@ -828,25 +828,25 @@ bool RifEclipseSummaryAddress::isValid() const if ( m_number2 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_WELL_SEGMENT: if ( m_name.empty() ) return false; if ( m_number0 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK: if ( m_number0 == -1 ) return false; if ( m_number1 == -1 ) return false; if ( m_number2 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_BLOCK_LGR: if ( m_lgrName.empty() ) return false; if ( m_number0 == -1 ) return false; if ( m_number1 == -1 ) return false; if ( m_number2 == -1 ) return false; return true; - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: if ( m_number0 == -1 ) return false; return true; } @@ -979,7 +979,7 @@ bool RifEclipseSummaryAddress::hasAccumulatedData() const if ( !isValidEclipseCategory() ) return false; QString quantityForInspection = QString::fromStdString( vectorName() ); - if ( category() == SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + if ( category() == SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) { // Remove statistics text prefix quantityForInspection = quantityForInspection.mid( quantityForInspection.indexOf( ":" ) + 1 ); @@ -1016,14 +1016,14 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector if ( tokens.size() > 1 ) token1 = tokens[1]; if ( tokens.size() > 2 ) token2 = tokens[2]; - SummaryVarCategory category = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( vectorName ); + SummaryCategory category = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( vectorName ); switch ( category ) { - case SummaryVarCategory::SUMMARY_FIELD: + case SummaryCategory::SUMMARY_FIELD: return fieldAddress( vectorName ); - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: if ( !token1.empty() ) { RiaStdStringTools::toInt( token1, intValue0 ); @@ -1031,15 +1031,15 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_NETWORK: return networkAddress( vectorName, token1 ); break; - case SummaryVarCategory::SUMMARY_MISC: + case SummaryCategory::SUMMARY_MISC: return miscAddress( vectorName ); break; - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: if ( !token1.empty() ) { RiaStdStringTools::toInt( token1, intValue0 ); @@ -1047,7 +1047,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: if ( !token1.empty() ) { auto regions = RiaStdStringTools::splitString( token1, '-' ); @@ -1061,15 +1061,15 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_GROUP: if ( !token1.empty() ) return groupAddress( vectorName, token1 ); break; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: if ( !token1.empty() ) return wellAddress( vectorName, token1 ); break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: if ( !token2.empty() ) { auto ijk = RiaStdStringTools::splitString( token2, ',' ); @@ -1084,11 +1084,11 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: if ( !token1.empty() && !token2.empty() ) return wellLgrAddress( vectorName, token1, token2 ); break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: if ( tokens.size() > 2 ) { const auto& token3 = tokens[3]; @@ -1104,7 +1104,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_WELL_SEGMENT: if ( !token2.empty() ) { @@ -1114,7 +1114,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK: if ( !token1.empty() ) { auto ijk = RiaStdStringTools::splitString( token1, ',' ); @@ -1129,7 +1129,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_BLOCK_LGR: if ( !token2.empty() ) { auto ijk = RiaStdStringTools::splitString( token2, ',' ); @@ -1144,8 +1144,8 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector } break; - case SummaryVarCategory::SUMMARY_IMPORTED: - case SummaryVarCategory::SUMMARY_INVALID: + case SummaryCategory::SUMMARY_IMPORTED: + case SummaryCategory::SUMMARY_INVALID: default: break; } @@ -1160,21 +1160,21 @@ bool RifEclipseSummaryAddress::isValidEclipseCategory() const { switch ( category() ) { - case SummaryVarCategory::SUMMARY_FIELD: - case SummaryVarCategory::SUMMARY_AQUIFER: - case SummaryVarCategory::SUMMARY_NETWORK: - case SummaryVarCategory::SUMMARY_MISC: - case SummaryVarCategory::SUMMARY_REGION: - case SummaryVarCategory::SUMMARY_REGION_2_REGION: - case SummaryVarCategory::SUMMARY_GROUP: - case SummaryVarCategory::SUMMARY_WELL: - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: - case SummaryVarCategory::SUMMARY_WELL_LGR: - case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: - case SummaryVarCategory::SUMMARY_WELL_SEGMENT: - case SummaryVarCategory::SUMMARY_BLOCK: - case SummaryVarCategory::SUMMARY_BLOCK_LGR: - case SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS: + case SummaryCategory::SUMMARY_FIELD: + case SummaryCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_MISC: + case SummaryCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_GROUP: + case SummaryCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: + case SummaryCategory::SUMMARY_WELL_SEGMENT: + case SummaryCategory::SUMMARY_BLOCK: + case SummaryCategory::SUMMARY_BLOCK_LGR: + case SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS: return true; } return false; @@ -1256,7 +1256,7 @@ bool RifEclipseSummaryAddress::isCalculated() const //-------------------------------------------------------------------------------------------------- bool RifEclipseSummaryAddress::isTime() const { - return m_variableCategory == SummaryVarCategory::SUMMARY_TIME; + return m_category == SummaryCategory::SUMMARY_TIME; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h index e8a3bcb545..8dddb06d52 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h @@ -37,7 +37,7 @@ class RifEclipseSummaryAddress public: RifEclipseSummaryAddress(); - RifEclipseSummaryAddress( SummaryVarCategory category, + RifEclipseSummaryAddress( SummaryCategory category, const std::string& vectorName, int regionNumber, int regionNumber2, @@ -53,7 +53,7 @@ public: bool isErrorResult, int id ); - RifEclipseSummaryAddress( SummaryVarCategory category, std::map& identifiers ); + RifEclipseSummaryAddress( SummaryCategory category, std::map& identifiers ); // Static specialized creation methods @@ -95,13 +95,13 @@ public: static std::string generateStringFromAddresses( const std::vector& addressVector, const std::string jointString = "; " ); - static bool isDependentOnWellName( RifEclipseSummaryAddressDefines::SummaryVarCategory category ); + static bool isDependentOnWellName( RifEclipseSummaryAddressDefines::SummaryCategory category ); // Access methods - SummaryVarCategory category() const; - std::string vectorName() const; - bool isHistoryVector() const; + SummaryCategory category() const; + std::string vectorName() const; + bool isHistoryVector() const; int regionNumber() const; int regionNumber2() const; @@ -167,15 +167,15 @@ private: // The ordering the variables are defined in defines how the objects get sorted. Members defined first will be // evaluated first. This concept is used by <=> operator. - SummaryVarCategory m_variableCategory; - std::string m_vectorName; - std::string m_name; - std::string m_lgrName; - int m_number0; - int m_number1; - int m_number2; - bool m_isErrorResult; - int m_id; + SummaryCategory m_category; + std::string m_vectorName; + std::string m_name; + std::string m_lgrName; + int m_number0; + int m_number1; + int m_number2; + bool m_isErrorResult; + int m_id; }; QTextStream& operator<<( QTextStream& str, const RifEclipseSummaryAddress& sobj ); diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h index ff0ff26a38..9a4772903a 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h @@ -29,7 +29,7 @@ namespace RifEclipseSummaryAddressDefines { // Based on list in ecl_smspec.c and list of types taken from Eclipse Reference Manual ecl_rm_2011.1.pdf -enum class SummaryVarCategory +enum class SummaryCategory { SUMMARY_INVALID, SUMMARY_FIELD, diff --git a/ApplicationLibCode/FileInterface/RifEclipseUserDataKeywordTools.cpp b/ApplicationLibCode/FileInterface/RifEclipseUserDataKeywordTools.cpp index d1c00e78fc..c9f43e425d 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseUserDataKeywordTools.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseUserDataKeywordTools.cpp @@ -166,10 +166,10 @@ bool RifEclipseUserDataKeywordTools::isYearX( const std::string& identifier ) RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( const std::string quantityName, const std::vector& columnHeaderText ) { - RifEclipseSummaryAddressDefines::SummaryVarCategory category = + RifEclipseSummaryAddressDefines::SummaryCategory category = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( quantityName ); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { return RifEclipseSummaryAddress::importedAddress( quantityName ); } @@ -190,9 +190,9 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con switch ( category ) { - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD: break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER: { if ( columnHeaderText.size() > 0 ) { @@ -200,11 +200,11 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con } break; } - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK: break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC: break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION: { if ( columnHeaderText.size() > 0 ) { @@ -212,9 +212,9 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con } break; } - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION: break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP: { if ( columnHeaderText.size() > 0 ) { @@ -222,7 +222,7 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con } break; } - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL: { if ( columnHeaderText.size() > 0 ) { @@ -230,7 +230,7 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con } break; } - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION: { if ( columnHeaderText.size() > 1 ) { @@ -241,14 +241,14 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con break; } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR: if ( columnHeaderText.size() > 1 ) { wellName = columnHeaderText[0]; lgrName = columnHeaderText[1]; } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: if ( columnHeaderText.size() > 2 ) { wellName = columnHeaderText[0]; @@ -257,20 +257,20 @@ RifEclipseSummaryAddress RifEclipseUserDataKeywordTools::makeAndFillAddress( con RifEclipseUserDataKeywordTools::extractThreeInts( &cellI, &cellJ, &cellK, columnHeaderText[2] ); } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT: if ( columnHeaderText.size() > 1 ) { wellName = columnHeaderText[0]; wellSegmentNumber = RiaStdStringTools::toInt( columnHeaderText[1] ); } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK: if ( columnHeaderText.size() > 0 ) { RifEclipseUserDataKeywordTools::extractThreeInts( &cellI, &cellJ, &cellK, columnHeaderText[0] ); } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR: if ( columnHeaderText.size() > 1 ) { lgrName = columnHeaderText[0]; diff --git a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp index 60bb0009e1..28dcf3ddbc 100644 --- a/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp +++ b/ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp @@ -111,6 +111,6 @@ RiaDefines::EclipseUnitSystem RifEnsembleStatisticsReader::unitSystem() const //-------------------------------------------------------------------------------------------------- bool RifEnsembleStatisticsReader::validateAddress( const RifEclipseSummaryAddress& address ) const { - return address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS && + return address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS && !address.vectorName().empty(); } diff --git a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp index c2e1e16046..6e49bcb270 100644 --- a/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderObservedData.cpp @@ -47,7 +47,7 @@ RifReaderObservedData::~RifReaderObservedData() //-------------------------------------------------------------------------------------------------- bool RifReaderObservedData::open( const QString& headerFileName, const QString& identifierName, - RifEclipseSummaryAddressDefines::SummaryVarCategory summaryCategory ) + RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory ) { AsciiDataParseOptions parseOptions; parseOptions.dateFormat = "yyyy-MM-dd"; @@ -156,7 +156,7 @@ std::vector RifReaderObservedData::timeSteps( const RifEclipseSummaryAdd //-------------------------------------------------------------------------------------------------- RifEclipseSummaryAddress RifReaderObservedData::address( const QString& vectorName, const QString& identifierName, - RifEclipseSummaryAddressDefines::SummaryVarCategory summaryCategory ) + RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory ) { std::string stdVectorName = vectorName.toStdString(); int regionNumber( -1 ); @@ -175,13 +175,13 @@ RifEclipseSummaryAddress RifReaderObservedData::address( const QString& switch ( summaryCategory ) { - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP: groupName = identifierName.toStdString(); break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL: wellName = identifierName.toStdString(); break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR: lgrName = identifierName.toStdString(); break; default: diff --git a/ApplicationLibCode/FileInterface/RifReaderObservedData.h b/ApplicationLibCode/FileInterface/RifReaderObservedData.h index 7606478ce1..677b7be7aa 100644 --- a/ApplicationLibCode/FileInterface/RifReaderObservedData.h +++ b/ApplicationLibCode/FileInterface/RifReaderObservedData.h @@ -41,7 +41,7 @@ public: RifReaderObservedData(); ~RifReaderObservedData() override; - bool open( const QString& headerFileName, const QString& identifierName, RifEclipseSummaryAddressDefines::SummaryVarCategory summaryCategory ); + bool open( const QString& headerFileName, const QString& identifierName, RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory ); std::vector timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override; @@ -54,7 +54,7 @@ public: private: RifEclipseSummaryAddress address( const QString& vectorName, const QString& identifierName, - RifEclipseSummaryAddressDefines::SummaryVarCategory summaryCategory ); + RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory ); private: std::unique_ptr m_asciiParser; diff --git a/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.cpp b/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.cpp index 78e8d531ab..de5609faa3 100644 --- a/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.cpp +++ b/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.cpp @@ -53,7 +53,7 @@ RifRevealCsvSectionSummaryReader::~RifRevealCsvSectionSummaryReader() /// //-------------------------------------------------------------------------------------------------- bool RifRevealCsvSectionSummaryReader::parse( const QString& text, - RifEclipseSummaryAddressDefines::SummaryVarCategory defaultCategory, + RifEclipseSummaryAddressDefines::SummaryCategory defaultCategory, QString* errorText ) { m_allResultAddresses.clear(); @@ -82,7 +82,7 @@ bool RifRevealCsvSectionSummaryReader::parse( const QString& { "1000Sm3/d", { "SM3/DAY", 1000.0 } }, { "MSm3", { "SM3", 1000000.0 } } }; - QString prefix = defaultCategory == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ? "F" : "W"; + QString prefix = defaultCategory == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ? "F" : "W"; std::map nameMapping = { { "WaterCut", prefix + "WCT" }, { "GOR", prefix + "GOR" }, { "BottomHolePressure", prefix + "BHP" }, { "CumLiquidInjected", prefix + "LIT" }, diff --git a/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.h b/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.h index 9c02db4902..c5be4fbf88 100644 --- a/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.h +++ b/ApplicationLibCode/FileInterface/RifRevealCsvSectionSummaryReader.h @@ -35,5 +35,5 @@ public: RifRevealCsvSectionSummaryReader(); ~RifRevealCsvSectionSummaryReader() override; - bool parse( const QString& fileName, RifEclipseSummaryAddressDefines::SummaryVarCategory defaultCategory, QString* errorText = nullptr ); + bool parse( const QString& fileName, RifEclipseSummaryAddressDefines::SummaryCategory defaultCategory, QString* errorText = nullptr ); }; diff --git a/ApplicationLibCode/FileInterface/RifRevealCsvSummaryReader.cpp b/ApplicationLibCode/FileInterface/RifRevealCsvSummaryReader.cpp index 25f11b1c4c..596ef222a0 100644 --- a/ApplicationLibCode/FileInterface/RifRevealCsvSummaryReader.cpp +++ b/ApplicationLibCode/FileInterface/RifRevealCsvSummaryReader.cpp @@ -66,8 +66,8 @@ std::pair RifRevealCsvSummaryReader::parse( const QString& fileNa cvf::ref sectionReader = new RifRevealCsvSectionSummaryReader; // The first part is field data, and the rest is well data - auto defaultCategory = isFirst ? RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD - : RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL; + auto defaultCategory = isFirst ? RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD + : RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL; QString errorMessage; if ( !sectionReader->parse( p, defaultCategory, &errorMessage ) ) diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp index 912a497c23..b396b58870 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp @@ -201,7 +201,7 @@ void RimAnalysisPlotCollection::applySummaryCaseCollectionAndFieldAddressToPlot( { for ( auto address : allAddresses ) { - if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ) + if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ) { if ( quantityName.empty() || quantityName == address.vectorName() ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp b/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp index 8f7fe30ed5..a09f6e6f5a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp @@ -76,12 +76,12 @@ void RimDataSourceSteppingTools::modifyCurrentIndex( caf::PdmValueField* //-------------------------------------------------------------------------------------------------- bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& oldValue, const QVariant& newValue, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, RifEclipseSummaryAddress* adr ) { if ( !adr ) return false; - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) { int oldInt = oldValue.toInt(); int newInt = newValue.toInt(); @@ -93,7 +93,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER ) { int oldInt = oldValue.toInt(); int newInt = newValue.toInt(); @@ -105,7 +105,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) { std::string oldString = oldValue.toString().toStdString(); std::string newString = newValue.toString().toStdString(); @@ -117,7 +117,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK ) { std::string oldString = oldValue.toString().toStdString(); std::string newString = newValue.toString().toStdString(); @@ -129,7 +129,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { std::string oldString = oldValue.toString().toStdString(); std::string newString = newValue.toString().toStdString(); @@ -141,8 +141,8 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK || - category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK || + category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION ) { std::string oldString = oldValue.toString().toStdString(); std::string newString = newValue.toString().toStdString(); @@ -153,7 +153,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION ) { std::string oldString = oldValue.toString().toStdString(); std::string newString = newValue.toString().toStdString(); @@ -166,7 +166,7 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& return true; } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT ) { int oldInt = oldValue.toInt(); int newInt = newValue.toInt(); diff --git a/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.h b/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.h index f3e25459ec..7a751babe0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.h +++ b/ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.h @@ -38,7 +38,7 @@ public: static bool updateAddressIfMatching( const QVariant& oldValue, const QVariant& newValue, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, RifEclipseSummaryAddress* adr ); static bool updateHistoryAndSummaryQuantityIfMatching( const QVariant& oldValue, const QVariant& newValue, RifEclipseSummaryAddress* adr ); diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 24614fd606..35d100cc2b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -516,7 +516,7 @@ QList RimSimWellInViewCollection::calculateValueOptions( auto addresses = summaryCase->summaryReader()->allResultAddresses(); for ( auto addr : addresses ) { - if ( addr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + if ( addr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { summaries.insert( addr.vectorName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp index ef95f556f1..829f8d3be0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp @@ -239,45 +239,45 @@ void RimSummaryCalculation::substituteVariables( std::vector RimSummaryCalculation::allAddressesFor /// //-------------------------------------------------------------------------------------------------- std::vector - RimSummaryCalculation::allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RimSummaryCalculation::allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category, const std::set& allResultAddresses ) const { std::vector addresses; std::string name = shortName().toStdString(); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ) + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ) { addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::fieldAddress( name, m_id ) ) ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER ) { std::set uniqueNumbers; std::for_each( allResultAddresses.begin(), @@ -515,11 +515,11 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::aquiferAddress( name, num, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC ) { addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::miscAddress( name, m_id ) ) ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK ) { std::set uniqueNames; std::for_each( allResultAddresses.begin(), @@ -531,7 +531,7 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::networkAddress( name, networkName, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { std::set uniqueWellNames; std::for_each( allResultAddresses.begin(), @@ -543,7 +543,7 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::wellAddress( name, wellName, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) { std::set uniqueGroupNames; std::for_each( allResultAddresses.begin(), @@ -555,7 +555,7 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::groupAddress( name, groupName, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) { std::set uniqueRegionNumbers; std::for_each( allResultAddresses.begin(), @@ -567,7 +567,7 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::regionAddress( name, regionNumber, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION ) { std::set> uniqueRegionNumbers; std::for_each( allResultAddresses.begin(), @@ -580,7 +580,7 @@ std::vector addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::regionToRegionAddress( name, r1, r2, m_id ) ) ); } } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED ) { addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::importedAddress( name, m_id ) ) ); } @@ -595,40 +595,40 @@ RimSummaryCalculationAddress RimSummaryCalculation::singleAddressesForCategory( { std::string name = shortName().toStdString(); - RifEclipseSummaryAddressDefines::SummaryVarCategory category = address.category(); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ) + RifEclipseSummaryAddressDefines::SummaryCategory category = address.category(); + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ) { return RifEclipseSummaryAddress::fieldAddress( name, m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER ) { return RifEclipseSummaryAddress::aquiferAddress( name, address.aquiferNumber(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC ) { return RifEclipseSummaryAddress::miscAddress( name, m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK ) { return RifEclipseSummaryAddress::networkAddress( name, address.networkName(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { return RifEclipseSummaryAddress::wellAddress( name, address.wellName(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) { return RifEclipseSummaryAddress::groupAddress( name, address.groupName(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) { return RifEclipseSummaryAddress::regionAddress( name, address.regionNumber(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION ) { return RifEclipseSummaryAddress::regionToRegionAddress( name, address.regionNumber(), address.regionNumber2(), m_id ); } - else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED ) + else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED ) { return RifEclipseSummaryAddress::importedAddress( name, m_id ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.h b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.h index aef1f33ebb..d4d55a7fff 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.h +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.h @@ -77,7 +77,7 @@ protected: static void substituteVariables( std::vector& vars, const RifEclipseSummaryAddress& address ); - std::vector allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category, + std::vector allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category, const std::set& allResultAddresses ) const; RimSummaryCalculationAddress singleAddressesForCategory( const RifEclipseSummaryAddress& address ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 7e7bf9b58a..57ce8b3b25 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -449,7 +449,7 @@ void RimEnsembleCurveSet::deleteEnsembleCurves() for ( size_t c = 0; c < m_curves.size(); c++ ) { RimSummaryCurve* curve = m_curves[c]; - if ( curve->summaryAddressY().category() != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + if ( curve->summaryAddressY().category() != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) curvesIndexesToDelete.push_back( c ); } @@ -471,7 +471,7 @@ void RimEnsembleCurveSet::deleteStatisticsCurves() for ( size_t c = 0; c < m_curves.size(); c++ ) { RimSummaryCurve* curve = m_curves[c]; - if ( curve->summaryAddressY().category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + if ( curve->summaryAddressY().category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) curvesIndexesToDelete.push_back( c ); } @@ -583,7 +583,7 @@ void RimEnsembleCurveSet::updateAllCurves() RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection(); RimSummaryAddress* addr = m_yValuesSummaryAddress(); - if ( group && addr->address().category() != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + if ( group && addr->address().category() != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { std::vector allCases = group->allSummaryCases(); std::vector filteredCases = filterEnsembleCases( allCases ); @@ -1669,7 +1669,7 @@ void RimEnsembleCurveSet::updateCurveColors() std::vector summaryCases; for ( auto& curve : m_curves ) { - if ( curve->summaryAddressY().category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + if ( curve->summaryAddressY().category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) continue; curvesToColor.push_back( curve ); @@ -1785,7 +1785,7 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vectoraddress().category() != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + if ( plot && addr->address().category() != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { if ( isCurvesVisible() ) { @@ -1856,7 +1856,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vectoraddress().category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + addr->address().category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) return; // Calculate diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp index cbef91fef0..f744982437 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp @@ -43,8 +43,8 @@ RimObservedSummaryData::RimObservedSummaryData() m_useCustomIdentifier.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_summaryCategory, "SummaryType", - caf::AppEnum( - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ), + caf::AppEnum( + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ), "Summary Type" ); m_summaryCategory.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_identifierName, "IdentifierName", "Identifier Name" ); @@ -72,7 +72,7 @@ QString RimObservedSummaryData::identifierName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddressDefines::SummaryVarCategory RimObservedSummaryData::summaryCategory() const +RifEclipseSummaryAddressDefines::SummaryCategory RimObservedSummaryData::summaryCategory() const { return m_summaryCategory(); } @@ -102,7 +102,7 @@ void RimObservedSummaryData::updateMetaData() //-------------------------------------------------------------------------------------------------- QString RimObservedSummaryData::customWellName() const { - if ( m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + if ( m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { return m_identifierName(); } @@ -119,11 +119,11 @@ QList RimObservedSummaryData::calculateValueOptions( con { QList options; - using AddressAppEnum = caf::AppEnum; - options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ), - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) ); - options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ), - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) ); + using AddressAppEnum = caf::AppEnum; + options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ), + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) ); + options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ), + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) ); return options; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h index e1d729b84b..17c3be219f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h @@ -39,7 +39,7 @@ public: QString caseName() const override; QString identifierName() const; - RifEclipseSummaryAddressDefines::SummaryVarCategory summaryCategory() const; + RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory() const; void updateMetaData(); @@ -51,7 +51,7 @@ private: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; private: - caf::PdmField> m_summaryCategory; + caf::PdmField> m_summaryCategory; caf::PdmField m_identifierName; caf::PdmField m_useCustomIdentifier; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp index 504eed6723..cefc8e4678 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp @@ -29,9 +29,9 @@ namespace caf { template <> -void caf::AppEnum::setUp() +void caf::AppEnum::setUp() { - using RifAdr = RifEclipseSummaryAddressDefines::SummaryVarCategory; + using RifAdr = RifEclipseSummaryAddressDefines::SummaryCategory; addItem( RifAdr::SUMMARY_FIELD, "SUMMARY_FIELD", RiaDefines::summaryField() ); addItem( RifAdr::SUMMARY_AQUIFER, "SUMMARY_AQUIFER", RiaDefines::summaryAquifer() ); @@ -82,7 +82,7 @@ RimSummaryAddress::RimSummaryAddress() CAF_PDM_InitField( &m_caseId, "CaseId", -1, "CaseId" ); CAF_PDM_InitField( &m_ensembleId, "EnsembleId", -1, "EnsembleId" ); - m_category = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID; + m_category = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID; m_regionNumber = -1; m_regionNumber2 = -1; m_wellSegmentNumber = -1; @@ -186,14 +186,14 @@ RiaDefines::PhaseType RimSummaryAddress::addressPhaseType() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimSummaryAddress::keywordForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category ) const +QString RimSummaryAddress::keywordForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category ) const { // Return the keyword text for supported field replacement in plot templates - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) return m_wellName.keyword(); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) return m_groupName.keyword(); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) return m_regionNumber.keyword(); - if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK ) return m_networkName.keyword(); + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) return m_wellName.keyword(); + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) return m_groupName.keyword(); + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) return m_regionNumber.keyword(); + if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK ) return m_networkName.keyword(); return {}; } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h index 7e506a13ce..20088ee191 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h @@ -60,7 +60,7 @@ public: RiaDefines::PhaseType addressPhaseType() const; - QString keywordForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category ) const; + QString keywordForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category ) const; protected: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; @@ -68,7 +68,7 @@ protected: QString iconResourceText() const; private: - caf::PdmField> m_category; + caf::PdmField> m_category; caf::PdmField m_vectorName; caf::PdmField m_regionNumber; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp index 1764d2ac6b..94db19360e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp @@ -212,27 +212,27 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddAddress( address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_AQUIFER: + case SummaryCategory::SUMMARY_AQUIFER: aquifer->addToSubfolder( QString::number( address.aquiferNumber() ), CollectionContentType::AQUIFER, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_NETWORK: + case SummaryCategory::SUMMARY_NETWORK: networks->addToSubfolder( QString::fromStdString( address.networkName() ), CollectionContentType::NETWORK, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_MISC: + case SummaryCategory::SUMMARY_MISC: misc->addAddress( address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_REGION: + case SummaryCategory::SUMMARY_REGION: regions->addToSubfolder( QString::number( address.regionNumber() ), CollectionContentType::REGION, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_REGION_2_REGION: + case SummaryCategory::SUMMARY_REGION_2_REGION: region2region->addToSubfolder( QString::fromStdString( address.itemUiText() ), CollectionContentType::REGION_2_REGION, address, @@ -240,15 +240,15 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddToSubfolder( QString::fromStdString( address.groupName() ), CollectionContentType::GROUP, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_WELL: + case SummaryCategory::SUMMARY_WELL: wells->addToSubfolder( QString::fromStdString( address.wellName() ), CollectionContentType::WELL, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case SummaryCategory::SUMMARY_WELL_COMPLETION: completion->addToSubfolderTree( { QString::fromStdString( address.wellName() ), QString::fromStdString( address.blockAsString() ) }, CollectionContentType::WELL_COMPLETION, @@ -257,7 +257,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddToSubfolderTree( { QString::fromStdString( address.wellName() ), QString::number( address.wellSegmentNumber() ) }, CollectionContentType::WELL_SEGMENT, address, @@ -265,11 +265,11 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddToSubfolder( QString::fromStdString( address.blockAsString() ), CollectionContentType::BLOCK, address, caseId, ensembleId ); break; - case SummaryVarCategory::SUMMARY_WELL_LGR: + case SummaryCategory::SUMMARY_WELL_LGR: lgrwell->addToSubfolderTree( { QString::fromStdString( address.lgrName() ), QString::fromStdString( address.wellName() ) }, CollectionContentType::WELL_LGR, address, @@ -277,7 +277,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddToSubfolderTree( { QString::fromStdString( address.lgrName() ), QString::fromStdString( address.wellName() ), QString::fromStdString( address.blockAsString() ) }, @@ -287,7 +287,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddToSubfolderTree( { QString::fromStdString( address.lgrName() ), QString::fromStdString( address.blockAsString() ) }, CollectionContentType::BLOCK_LGR, address, @@ -295,7 +295,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::setaddAddress( address, caseId, ensembleId ); break; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 0643130dd3..c768351369 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -798,7 +798,7 @@ double RimSummaryCurve::computeCurveZValue() { zOrder = RiuQwtPlotCurveDefines::zDepthForIndex( RiuQwtPlotCurveDefines::ZIndex::Z_SINGLE_CURVE_OBSERVED ); } - else if ( sumAddr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + else if ( sumAddr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) { zOrder = RiuQwtPlotCurveDefines::zDepthForIndex( RiuQwtPlotCurveDefines::ZIndex::Z_ENSEMBLE_STAT_CURVE ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp index 4626889739..44a5fd975a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp @@ -696,7 +696,7 @@ std::set RimSummaryCurveAppearanceCalculator::getAllSummaryWellName for ( auto& address : allAddresses ) { - if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { summaryWellNames.insert( address.wellName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp index 8ba2f79f51..efce53cf2d 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp @@ -215,7 +215,7 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress& } } - if ( summaryAddress.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) + if ( summaryAddress.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) { text = summaryAddress.vectorName(); } @@ -265,7 +265,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& { switch ( summaryAddress.category() ) { - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER: { if ( m_aquiferNumber ) { @@ -274,7 +274,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION: { if ( m_regionNumber ) { @@ -287,7 +287,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION: { if ( m_regionNumber ) { @@ -297,7 +297,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP: { if ( m_groupName ) { @@ -310,7 +310,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK: { bool skipSubString = nameHelper && nameHelper->isNetworkInTitle(); if ( !skipSubString ) @@ -320,12 +320,12 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL: { appendWellName( text, summaryAddress, nameHelper ); } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION: { appendWellName( text, summaryAddress, nameHelper ); @@ -341,13 +341,13 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR: { appendLgrName( text, summaryAddress ); appendWellName( text, summaryAddress, nameHelper ); } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR: { appendLgrName( text, summaryAddress ); appendWellName( text, summaryAddress, nameHelper ); @@ -364,7 +364,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT: { appendWellName( text, summaryAddress, nameHelper ); @@ -379,7 +379,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK: { if ( m_completion ) { @@ -393,7 +393,7 @@ void RimSummaryCurveAutoName::appendAddressDetails( std::string& } } break; - case RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR: + case RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR: { appendLgrName( text, summaryAddress ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 7e8dc7081b..20b4b6aaec 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -2309,28 +2309,28 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleAddressCollectionDrop( RimSummar auto newCurveDef = curveDef; auto curveAdr = newCurveDef.summaryAddress(); std::string objectIdentifierString; - if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) && + if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) && ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::WELL ) ) { objectIdentifierString = curveAdr.wellName(); curveAdr.setWellName( droppedName ); newCurveDef.setSummaryAddress( curveAdr ); } - else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) && + else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) && ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::GROUP ) ) { objectIdentifierString = curveAdr.groupName(); curveAdr.setGroupName( droppedName ); newCurveDef.setSummaryAddress( curveAdr ); } - else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK ) && + else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK ) && ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::NETWORK ) ) { objectIdentifierString = curveAdr.networkName(); curveAdr.setNetworkName( droppedName ); newCurveDef.setSummaryAddress( curveAdr ); } - else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) && + else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) && ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::REGION ) ) { objectIdentifierString = std::to_string( curveAdr.regionNumber() ); @@ -2340,7 +2340,7 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleAddressCollectionDrop( RimSummar curveAdr.setRegion( droppedRegion ); newCurveDef.setSummaryAddress( curveAdr ); } - else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT ) && + else if ( ( curveAdr.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT ) && ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::WELL_SEGMENT ) ) { objectIdentifierString = std::to_string( curveAdr.wellSegmentNumber() ); @@ -2802,7 +2802,7 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na { sumCases.push_back( curve->summaryCaseX() ); - if ( curve->summaryAddressX().category() != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + if ( curve->summaryAddressX().category() != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { addresses.push_back( curve->summaryAddressX() ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 860d61a151..a3a2b7abfd 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -255,47 +255,47 @@ QList RimSummaryPlotSourceStepping::calculateValueOption } else { - SummaryVarCategory category = SummaryVarCategory::SUMMARY_INVALID; + SummaryCategory category = SummaryCategory::SUMMARY_INVALID; std::string secondaryIdentifier; if ( fieldNeedingOptions == &m_wellName ) { - category = SummaryVarCategory::SUMMARY_WELL; + category = SummaryCategory::SUMMARY_WELL; } else if ( fieldNeedingOptions == &m_region ) { - category = SummaryVarCategory::SUMMARY_REGION; + category = SummaryCategory::SUMMARY_REGION; } else if ( fieldNeedingOptions == &m_groupName ) { - category = SummaryVarCategory::SUMMARY_GROUP; + category = SummaryCategory::SUMMARY_GROUP; } else if ( fieldNeedingOptions == &m_networkName ) { - category = SummaryVarCategory::SUMMARY_NETWORK; + category = SummaryCategory::SUMMARY_NETWORK; } else if ( fieldNeedingOptions == &m_cellBlock ) { - category = SummaryVarCategory::SUMMARY_BLOCK; + category = SummaryCategory::SUMMARY_BLOCK; } else if ( fieldNeedingOptions == &m_wellSegment ) { secondaryIdentifier = m_wellName().toStdString(); - category = SummaryVarCategory::SUMMARY_WELL_SEGMENT; + category = SummaryCategory::SUMMARY_WELL_SEGMENT; } else if ( fieldNeedingOptions == &m_completion ) { secondaryIdentifier = m_wellName().toStdString(); - category = SummaryVarCategory::SUMMARY_WELL_COMPLETION; + category = SummaryCategory::SUMMARY_WELL_COMPLETION; } else if ( fieldNeedingOptions == &m_aquifer ) { - category = SummaryVarCategory::SUMMARY_AQUIFER; + category = SummaryCategory::SUMMARY_AQUIFER; } std::vector identifierTexts; - if ( category != SummaryVarCategory::SUMMARY_INVALID ) + if ( category != SummaryCategory::SUMMARY_INVALID ) { identifierTexts = analyzer->identifierTexts( category, secondaryIdentifier ); } @@ -445,41 +445,41 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* if ( changedField != &m_vectorName ) { - SummaryVarCategory summaryCategoryToModify = SummaryVarCategory::SUMMARY_INVALID; + SummaryCategory summaryCategoryToModify = SummaryCategory::SUMMARY_INVALID; if ( changedField == &m_wellName ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_WELL; + summaryCategoryToModify = SummaryCategory::SUMMARY_WELL; } else if ( changedField == &m_region ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_REGION; + summaryCategoryToModify = SummaryCategory::SUMMARY_REGION; } else if ( changedField == &m_groupName ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_GROUP; + summaryCategoryToModify = SummaryCategory::SUMMARY_GROUP; } else if ( changedField == &m_networkName ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_NETWORK; + summaryCategoryToModify = SummaryCategory::SUMMARY_NETWORK; } else if ( changedField == &m_cellBlock ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_BLOCK; + summaryCategoryToModify = SummaryCategory::SUMMARY_BLOCK; } else if ( changedField == &m_wellSegment ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_WELL_SEGMENT; + summaryCategoryToModify = SummaryCategory::SUMMARY_WELL_SEGMENT; } else if ( changedField == &m_completion ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_WELL_COMPLETION; + summaryCategoryToModify = SummaryCategory::SUMMARY_WELL_COMPLETION; } else if ( changedField == &m_aquifer ) { - summaryCategoryToModify = SummaryVarCategory::SUMMARY_AQUIFER; + summaryCategoryToModify = SummaryCategory::SUMMARY_AQUIFER; } - if ( summaryCategoryToModify != SummaryVarCategory::SUMMARY_INVALID ) + if ( summaryCategoryToModify != SummaryCategory::SUMMARY_INVALID ) { for ( auto curve : curves ) { @@ -745,7 +745,7 @@ std::vector RimSummaryPlotSourceStepping::activeFieldsForD RiaSummaryAddressAnalyzer analyzer; analyzer.appendAddresses( addressesForCurvesInPlot() ); - SummaryVarCategory category = SummaryVarCategory::SUMMARY_INVALID; + SummaryCategory category = SummaryCategory::SUMMARY_INVALID; if ( !analyzer.categories().empty() ) { @@ -766,12 +766,12 @@ std::vector RimSummaryPlotSourceStepping::activeFieldsForD if ( allCategoriesAreDependingOnWellName ) { - category = SummaryVarCategory::SUMMARY_WELL; + category = SummaryCategory::SUMMARY_WELL; } } } - if ( category != SummaryVarCategory::SUMMARY_INVALID ) + if ( category != SummaryCategory::SUMMARY_INVALID ) { if ( analyzer.wellNames().size() == 1 ) { @@ -1020,7 +1020,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu { case RimSummaryDataSourceStepping::SourceSteppingDimension::WELL: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_WELL, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_WELL, "" ); auto searchString = QString::fromStdString( addr.wellName() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setWellName( ( *found ).toStdString() ); @@ -1029,7 +1029,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu case RimSummaryDataSourceStepping::SourceSteppingDimension::GROUP: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_GROUP, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_GROUP, "" ); auto searchString = QString::fromStdString( addr.groupName() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setGroupName( ( *found ).toStdString() ); @@ -1038,7 +1038,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu case RimSummaryDataSourceStepping::SourceSteppingDimension::NETWORK: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_NETWORK, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_NETWORK, "" ); auto searchString = QString::fromStdString( addr.networkName() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setNetworkName( ( *found ).toStdString() ); @@ -1047,7 +1047,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu case RimSummaryDataSourceStepping::SourceSteppingDimension::REGION: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_REGION, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_REGION, "" ); auto searchString = QString::number( addr.regionNumber() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setRegion( ( *found ).toInt() ); @@ -1072,7 +1072,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu case RimSummaryDataSourceStepping::SourceSteppingDimension::BLOCK: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_BLOCK, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_BLOCK, "" ); auto searchString = QString::fromStdString( addr.blockAsString() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setCellIjk( ( *found ).toStdString() ); @@ -1081,7 +1081,7 @@ RifEclipseSummaryAddress RimSummaryPlotSourceStepping::stepAddress( RifEclipseSu case RimSummaryDataSourceStepping::SourceSteppingDimension::AQUIFER: { - auto ids = analyzer.identifierTexts( SummaryVarCategory::SUMMARY_AQUIFER, "" ); + auto ids = analyzer.identifierTexts( SummaryCategory::SUMMARY_AQUIFER, "" ); auto searchString = QString::number( addr.aquiferNumber() ); auto found = getIdIterator( ids, searchString ); if ( found != ids.end() ) addr.setAquiferNumber( ( *found ).toInt() ); @@ -1190,7 +1190,7 @@ void RimSummaryPlotSourceStepping::setStep( QString stepIdentifier ) //-------------------------------------------------------------------------------------------------- std::map RimSummaryPlotSourceStepping::optionsForQuantity( std::set addresses ) { - SummaryVarCategory category = SummaryVarCategory::SUMMARY_FIELD; + SummaryCategory category = SummaryCategory::SUMMARY_FIELD; auto visibleCurveAddresses = addressesForCurvesInPlot(); if ( !visibleCurveAddresses.empty() ) @@ -1223,7 +1223,7 @@ std::map RimSummaryPlotSourceStepping::optionsForQuantity( std //-------------------------------------------------------------------------------------------------- std::map RimSummaryPlotSourceStepping::optionsForQuantity( RiaSummaryAddressAnalyzer* analyzser ) { - SummaryVarCategory category = SummaryVarCategory::SUMMARY_FIELD; + SummaryCategory category = SummaryCategory::SUMMARY_FIELD; auto visibleCurveAddresses = addressesForCurvesInPlot(); if ( !visibleCurveAddresses.empty() ) diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp index 4bb8e1b751..94b0189e35 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp @@ -74,7 +74,7 @@ RimSummaryTable::RimSummaryTable() m_vector.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); CAF_PDM_InitFieldNoDefault( &m_category, "Categories", "Category" ); m_category.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - m_category = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL; + m_category = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL; CAF_PDM_InitFieldNoDefault( &m_resamplingSelection, "ResamplingSelection", "Date Resampling" ); m_resamplingSelection.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); @@ -128,7 +128,7 @@ void RimSummaryTable::setDefaultCaseAndCategoryAndVectorName() { const auto summaryCases = getToplevelSummaryCases(); m_case = nullptr; - m_category = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL; + m_category = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL; m_vector = ""; m_tableName = createTableName(); @@ -151,7 +151,7 @@ void RimSummaryTable::setDefaultCaseAndCategoryAndVectorName() /// //-------------------------------------------------------------------------------------------------- void RimSummaryTable::setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vectorName ) { m_case = summaryCase; @@ -354,15 +354,15 @@ QList RimSummaryTable::calculateValueOptions( const caf: } else if ( fieldNeedingOptions == &m_category ) { - options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ), - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) ); - options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ), - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) ); - options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ), - RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) ); + options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ), + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) ); + options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ), + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) ); + options.push_back( caf::PdmOptionItemInfo( caf::AppEnum::uiText( + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ), + RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) ); } else if ( fieldNeedingOptions == &m_vector && m_case ) { @@ -603,7 +603,7 @@ QString RimSummaryTable::dateFormatString() const /// //-------------------------------------------------------------------------------------------------- std::set RimSummaryTable::getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vector ) const { if ( !summaryReader ) return {}; @@ -623,12 +623,12 @@ std::set RimSummaryTable::getSummaryAddressesFromReade /// //-------------------------------------------------------------------------------------------------- std::set RimSummaryTable::getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader, - RifEclipseSummaryAddressDefines::SummaryVarCategory category ) const + RifEclipseSummaryAddressDefines::SummaryCategory category ) const { if ( !summaryReader ) return {}; - if ( category != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL && - category != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP && - category != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) + if ( category != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL && + category != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP && + category != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) { return {}; } @@ -649,15 +649,15 @@ std::set RimSummaryTable::getCategoryVectorFromSummaryReader( const Rif //-------------------------------------------------------------------------------------------------- QString RimSummaryTable::getCategoryNameFromAddress( const RifEclipseSummaryAddress& address ) const { - if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) + if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) { return QString::fromStdString( address.wellName() ); } - else if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) + else if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) { return QString::fromStdString( address.groupName() ); } - else if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) + else if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION ) { return QString( "Region %1" ).arg( address.regionNumber() ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h index e007b33de0..b3590c2e38 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h @@ -60,7 +60,7 @@ public: void setDefaultCaseAndCategoryAndVectorName(); void setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vectorName ); void setDescription( const QString& description ); QString description() const override; @@ -99,10 +99,10 @@ private: QString dateFormatString() const; std::set getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vector ) const; std::set getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader, - RifEclipseSummaryAddressDefines::SummaryVarCategory category ) const; + RifEclipseSummaryAddressDefines::SummaryCategory category ) const; QString getCategoryNameFromAddress( const RifEclipseSummaryAddress& address ) const; std::vector getToplevelSummaryCases() const; @@ -115,7 +115,7 @@ private: caf::PdmField m_isAutomaticName; caf::PdmPtrField m_case; - caf::PdmField> m_category; + caf::PdmField> m_category; caf::PdmField m_vector; caf::PdmField> m_resamplingSelection; caf::PdmField m_thresholdValue; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp index 14301b6cc3..e229de9fff 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp @@ -130,7 +130,7 @@ RimSummaryTable* RimSummaryTableCollection::createDefaultSummaryTable() //-------------------------------------------------------------------------------------------------- RimSummaryTable* RimSummaryTableCollection::createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vectorName ) { RimSummaryTable* table = new RimSummaryTable(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h index ef108d235e..f83dc33d6e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h @@ -52,7 +52,7 @@ public: RimSummaryTable* createDefaultSummaryTable(); RimSummaryTable* createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase, - RifEclipseSummaryAddressDefines::SummaryVarCategory category, + RifEclipseSummaryAddressDefines::SummaryCategory category, const QString& vectorName ); private: diff --git a/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp b/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp index 3cea9ad2ad..d1f5f055ab 100644 --- a/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp +++ b/ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp @@ -991,7 +991,7 @@ TEST( RifKeywordBasedRsmspecParserTest, TestAddressCreation ) RifEclipseSummaryAddress address = RifEclipseUserDataKeywordTools::makeAndFillAddress( quantityName, headerColumn ); EXPECT_TRUE( address.isValid() ); - EXPECT_EQ( address.category(), RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR ); + EXPECT_EQ( address.category(), RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR ); EXPECT_EQ( address.uiText(), "LCABC:lgrName:wellName:12,14,16" ); } diff --git a/ApplicationLibCode/UnitTests/RiaSummaryAddressAnalyzer-Test.cpp b/ApplicationLibCode/UnitTests/RiaSummaryAddressAnalyzer-Test.cpp index 8a7c601673..fd18dac23c 100644 --- a/ApplicationLibCode/UnitTests/RiaSummaryAddressAnalyzer-Test.cpp +++ b/ApplicationLibCode/UnitTests/RiaSummaryAddressAnalyzer-Test.cpp @@ -168,6 +168,6 @@ TEST( RiaSummaryAddressAnalyzer, QuantitiesPerCategory ) auto categories = analyzer.categories(); EXPECT_EQ( 2u, categories.size() ); - auto vectorNamesForWells = analyzer.vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ); + auto vectorNamesForWells = analyzer.vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ); EXPECT_EQ( 3u, vectorNamesForWells.size() ); } diff --git a/ApplicationLibCode/UnitTests/RifEclipseSummaryAddress-Test.cpp b/ApplicationLibCode/UnitTests/RifEclipseSummaryAddress-Test.cpp index c2a7d79dda..3d493779ae 100644 --- a/ApplicationLibCode/UnitTests/RifEclipseSummaryAddress-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifEclipseSummaryAddress-Test.cpp @@ -18,7 +18,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Field ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD, addr.category() ); EXPECT_EQ( "FOPT", addr.vectorName() ); EXPECT_FALSE( addr.isErrorResult() ); } @@ -30,7 +30,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Aquifer ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER, addr.category() ); EXPECT_EQ( "AAQR", addr.vectorName() ); EXPECT_EQ( 456, addr.aquiferNumber() ); EXPECT_FALSE( addr.isErrorResult() ); @@ -43,7 +43,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Network ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK, addr.category() ); EXPECT_EQ( "NETW", addr.vectorName() ); EXPECT_FALSE( addr.isErrorResult() ); } @@ -55,7 +55,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Network_name ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK, addr.category() ); EXPECT_EQ( "NETW", addr.vectorName() ); EXPECT_EQ( "MYNAME", addr.networkName() ); EXPECT_FALSE( addr.isErrorResult() ); @@ -68,7 +68,7 @@ TEST( RifEclipseSummaryAddressTest, DISABLED_TestEclipseAddressParsing_Misc ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC, addr.category() ); EXPECT_EQ( "CPU", addr.vectorName() ); EXPECT_FALSE( addr.isErrorResult() ); } @@ -80,7 +80,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Region ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION, addr.category() ); EXPECT_EQ( "RPR", addr.vectorName() ); EXPECT_EQ( 7081, addr.regionNumber() ); EXPECT_FALSE( addr.isErrorResult() ); @@ -93,7 +93,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_RegionToRegion ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION, addr.category() ); EXPECT_EQ( "ROFR", addr.vectorName() ); EXPECT_EQ( 7081, addr.regionNumber() ); EXPECT_EQ( 8001, addr.regionNumber2() ); @@ -107,7 +107,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellGroup ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP, addr.category() ); EXPECT_EQ( "GOPR", addr.vectorName() ); EXPECT_EQ( "WELLS1", addr.groupName() ); EXPECT_FALSE( addr.isErrorResult() ); @@ -120,7 +120,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Well ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL, addr.category() ); EXPECT_EQ( "WOPR", addr.vectorName() ); EXPECT_EQ( "B-2H", addr.wellName() ); EXPECT_FALSE( addr.isErrorResult() ); @@ -133,7 +133,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletion ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION, addr.category() ); EXPECT_EQ( "COFRL", addr.vectorName() ); EXPECT_EQ( "B-1H", addr.wellName() ); EXPECT_EQ( 15, addr.cellI() ); @@ -149,7 +149,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellLgr ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR, addr.category() ); EXPECT_EQ( "LWABC", addr.vectorName() ); EXPECT_EQ( "LGRNA", addr.lgrName() ); EXPECT_EQ( "B-10H", addr.wellName() ); @@ -163,7 +163,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletionLgr RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() ); EXPECT_EQ( "LCGAS", addr.vectorName() ); EXPECT_EQ( "LGR1", addr.lgrName() ); EXPECT_EQ( "B-1H", addr.wellName() ); @@ -180,7 +180,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellSegment ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT, addr.category() ); EXPECT_EQ( "SOFR", addr.vectorName() ); EXPECT_EQ( "B-5H", addr.wellName() ); EXPECT_EQ( 32, addr.wellSegmentNumber() ); @@ -194,7 +194,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Block ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK, addr.category() ); EXPECT_EQ( "BPR", addr.vectorName() ); EXPECT_EQ( 123, addr.cellI() ); EXPECT_EQ( 122, addr.cellJ() ); @@ -209,7 +209,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_BlockLgr ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR, addr.category() ); EXPECT_EQ( "LBABC", addr.vectorName() ); EXPECT_EQ( "LGRN", addr.lgrName() ); EXPECT_EQ( 45, addr.cellI() ); @@ -225,7 +225,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Imported ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED, addr.category() ); EXPECT_EQ( "FAULT (Imp)", addr.vectorName() ); EXPECT_FALSE( addr.isErrorResult() ); } @@ -237,7 +237,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult1 ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER, addr.category() ); EXPECT_EQ( "AAQR", addr.vectorName() ); EXPECT_EQ( 456, addr.aquiferNumber() ); EXPECT_TRUE( addr.isErrorResult() ); @@ -250,7 +250,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult2 ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() ); EXPECT_EQ( "LCGAS", addr.vectorName() ); EXPECT_EQ( "LGR1", addr.lgrName() ); EXPECT_EQ( "B-1H", addr.wellName() ); @@ -267,14 +267,14 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult3 ) RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED, addr.category() ); EXPECT_EQ( "FAULT (Imp)", addr.vectorName() ); EXPECT_TRUE( addr.isErrorResult() ); } TEST( RifEclipseSummaryAddressTest, TestEclipseAddressIjkParsing ) { - RifEclipseSummaryAddressDefines::SummaryVarCategory cat = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION; + RifEclipseSummaryAddressDefines::SummaryCategory cat = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION; std::map identifiers( { { RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_WELL_NAME, "1-BH" }, { RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_CELL_IJK, "6, 7, 8" }, @@ -284,7 +284,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressIjkParsing ) RifEclipseSummaryAddress addr( cat, identifiers ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION, addr.category() ); EXPECT_EQ( "WOPR", addr.vectorName() ); EXPECT_EQ( "1-BH", addr.wellName() ); EXPECT_EQ( 6, addr.cellI() ); @@ -295,7 +295,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressIjkParsing ) TEST( RifEclipseSummaryAddressTest, TestEclipseAddressRegToRegParsing ) { - RifEclipseSummaryAddressDefines::SummaryVarCategory cat = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION; + RifEclipseSummaryAddressDefines::SummaryCategory cat = RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION; std::map identifiers( { { RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_REGION_2_REGION, "123 - 456" }, { RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_VECTOR_NAME, "ROFR" }, @@ -304,7 +304,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressRegToRegParsing ) RifEclipseSummaryAddress addr( cat, identifiers ); EXPECT_TRUE( addr.isValid() ); - EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION, addr.category() ); + EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION, addr.category() ); EXPECT_EQ( "ROFR", addr.vectorName() ); EXPECT_EQ( 123, addr.regionNumber() ); EXPECT_EQ( 456, addr.regionNumber2() ); diff --git a/ApplicationLibCode/UnitTests/RifRevealCsvSectionSummaryReader-Test.cpp b/ApplicationLibCode/UnitTests/RifRevealCsvSectionSummaryReader-Test.cpp index 5917f81e31..0675d6be73 100644 --- a/ApplicationLibCode/UnitTests/RifRevealCsvSectionSummaryReader-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifRevealCsvSectionSummaryReader-Test.cpp @@ -27,7 +27,7 @@ TEST( RifRevealCsvSectionSummaryReaderTest, ExpectedText ) QString errorMessage; RifRevealCsvSectionSummaryReader reader; - bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL, &errorMessage ); + bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL, &errorMessage ); ASSERT_TRUE( isOk ); EXPECT_TRUE( errorMessage.isEmpty() ); @@ -46,6 +46,6 @@ TEST( RifRevealCsvSectionSummaryReaderTest, EmptyText ) QString fileContents = ""; QString errorMessage; - bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC, &errorMessage ); + bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC, &errorMessage ); ASSERT_FALSE( isOk ); } diff --git a/ApplicationLibCode/UnitTests/RiuSummaryVectorDescriptionMap-Test.cpp b/ApplicationLibCode/UnitTests/RiuSummaryVectorDescriptionMap-Test.cpp index 1900c40b08..4519c861f4 100644 --- a/ApplicationLibCode/UnitTests/RiuSummaryVectorDescriptionMap-Test.cpp +++ b/ApplicationLibCode/UnitTests/RiuSummaryVectorDescriptionMap-Test.cpp @@ -11,7 +11,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestInit ) { std::string s( "SRSFC" ); auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s ); - EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT ); + EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT ); auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s ); EXPECT_TRUE( longName == "Reach brine concentration" ); @@ -27,7 +27,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestInit ) { std::string s( "does not exist" ); auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s ); - EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ); + EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ); auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s ); @@ -57,7 +57,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestCustomNaming ) { std::string s( "SRSFCABC" ); auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s ); - EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT ); + EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT ); auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s ); EXPECT_TRUE( longName == "Reach brine concentration" ); @@ -79,13 +79,13 @@ TEST( RiuSummaryQuantityNameInfoProvider, Test6x ) { std::string s( "GLIT" ); auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s ); - EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ); + EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ); } { std::string s( "WSBVPROP" ); auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s ); - EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ); + EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ); } } diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp index 61798c0194..4fe3744b10 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.cpp @@ -64,36 +64,36 @@ RiuSummaryQuantityNameInfoProvider* RiuSummaryQuantityNameInfoProvider::instance //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddressDefines::SummaryVarCategory RiuSummaryQuantityNameInfoProvider::identifyCategory( const std::string& vectorName ) +RifEclipseSummaryAddressDefines::SummaryCategory RiuSummaryQuantityNameInfoProvider::identifyCategory( const std::string& vectorName ) { // Try to an exact match on the vector name first in the vector table. bool exactMatch = true; auto exactCategory = categoryFromVectorName( vectorName, exactMatch ); - if ( exactCategory != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) return exactCategory; + if ( exactCategory != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) return exactCategory; - if ( vectorName.size() < 3 || vectorName.size() > 8 ) return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID; + if ( vectorName.size() < 3 || vectorName.size() > 8 ) return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID; // Try to match the base vector name with more heuristics auto strippedQuantityName = RifEclipseSummaryAddress::baseVectorName( vectorName ); // First, try to lookup vector in vector table auto category = categoryFromVectorName( strippedQuantityName ); - if ( category != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) return category; + if ( category != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) return category; switch ( strippedQuantityName[0] ) { case 'A': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER; case 'B': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK; case 'F': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD; case 'N': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK; case 'S': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_SEGMENT; case 'W': - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL; default: break; } @@ -101,25 +101,25 @@ RifEclipseSummaryAddressDefines::SummaryVarCategory RiuSummaryQuantityNameInfoPr if ( strippedQuantityName[0] == 'R' ) { if ( ParseHelpers::is_region_to_region( strippedQuantityName ) ) - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION; - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION; } // Then check LGR categories std::string firstTwoLetters = strippedQuantityName.substr( 0, 2 ); - if ( firstTwoLetters == "LB" ) return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR; - if ( firstTwoLetters == "LC" ) return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR; - if ( firstTwoLetters == "LW" ) return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR; + if ( firstTwoLetters == "LB" ) return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK_LGR; + if ( firstTwoLetters == "LC" ) return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION_LGR; + if ( firstTwoLetters == "LW" ) return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_LGR; - return RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID; + return RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddressDefines::SummaryVarCategory +RifEclipseSummaryAddressDefines::SummaryCategory RiuSummaryQuantityNameInfoProvider::categoryFromVectorName( const std::string& vectorName, bool exactMatch ) const { auto info = quantityInfo( vectorName, exactMatch ); @@ -185,7 +185,7 @@ RiuSummaryQuantityNameInfoProvider::RiuSummaryQuantityInfo RiuSummaryQuantityNam std::string RiuSummaryQuantityNameInfoProvider::longNameFromVectorName( const std::string& vectorName, bool returnVectorNameIfNotFound ) const { auto info = quantityInfo( vectorName ); - return info.category != RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID || !returnVectorNameIfNotFound ? info.longName + return info.category != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID || !returnVectorNameIfNotFound ? info.longName : vectorName; } @@ -212,7 +212,7 @@ RiuSummaryQuantityNameInfoProvider::RiuSummaryQuantityNameInfoProvider() std::unordered_map RiuSummaryQuantityNameInfoProvider::createInfoForEclipseKeywords() { - using A = RifEclipseSummaryAddressDefines::SummaryVarCategory; + using A = RifEclipseSummaryAddressDefines::SummaryCategory; std::unordered_map info; @@ -2142,7 +2142,7 @@ std::unordered_map RiuSummaryQuantityNameInfoProvider::createInfoFor6xKeywords() { - using A = RifEclipseSummaryAddressDefines::SummaryVarCategory; + using A = RifEclipseSummaryAddressDefines::SummaryCategory; std::unordered_map info; diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.h b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.h index fd491d8c65..7558f15992 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryQuantityNameInfoProvider.h @@ -31,7 +31,7 @@ class RiuSummaryQuantityNameInfoProvider public: static RiuSummaryQuantityNameInfoProvider* instance(); - RifEclipseSummaryAddressDefines::SummaryVarCategory identifyCategory( const std::string& vectorName ); + RifEclipseSummaryAddressDefines::SummaryCategory identifyCategory( const std::string& vectorName ); std::string longNameFromVectorName( const std::string& vectorName, bool returnVectorNameIfNotFound = false ) const; @@ -40,16 +40,16 @@ private: { public: RiuSummaryQuantityInfo() - : category( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID ) + : category( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID ) { } - RiuSummaryQuantityInfo( RifEclipseSummaryAddressDefines::SummaryVarCategory category, const std::string& longName ) + RiuSummaryQuantityInfo( RifEclipseSummaryAddressDefines::SummaryCategory category, const std::string& longName ) : category( category ) , longName( longName ) { } - RifEclipseSummaryAddressDefines::SummaryVarCategory category; + RifEclipseSummaryAddressDefines::SummaryCategory category; std::string longName; }; @@ -57,7 +57,7 @@ private: RiuSummaryQuantityNameInfoProvider(); RiuSummaryQuantityInfo quantityInfo( const std::string& vectorName, bool exactMatch = false ) const; - RifEclipseSummaryAddressDefines::SummaryVarCategory categoryFromVectorName( const std::string& vectorName, bool exactMatch = false ) const; + RifEclipseSummaryAddressDefines::SummaryCategory categoryFromVectorName( const std::string& vectorName, bool exactMatch = false ) const; static std::unordered_map createInfoForEclipseKeywords(); static std::unordered_map createInfoFor6xKeywords(); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp index 6f83dc11f8..5115ba6a2e 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp @@ -96,67 +96,67 @@ SummaryIdentifierAndField::~SummaryIdentifierAndField() //-------------------------------------------------------------------------------------------------- RiuSummaryVectorSelectionUi::RiuSummaryVectorSelectionUi() : m_identifierFieldsMap( { - { SummaryVarCategory::SUMMARY_FIELD, + { SummaryCategory::SUMMARY_FIELD, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_AQUIFER, + { SummaryCategory::SUMMARY_AQUIFER, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_AQUIFER_NUMBER ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_NETWORK, + { SummaryCategory::SUMMARY_NETWORK, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_NETWORK_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_MISC, + { SummaryCategory::SUMMARY_MISC, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_REGION, + { SummaryCategory::SUMMARY_REGION, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_REGION_NUMBER ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_REGION_2_REGION, + { SummaryCategory::SUMMARY_REGION_2_REGION, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_REGION_2_REGION ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_GROUP, + { SummaryCategory::SUMMARY_GROUP, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_GROUP_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_WELL, + { SummaryCategory::SUMMARY_WELL, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_WELL_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_WELL_COMPLETION, + { SummaryCategory::SUMMARY_WELL_COMPLETION, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_WELL_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_CELL_IJK ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR, + { SummaryCategory::SUMMARY_WELL_COMPLETION_LGR, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_LGR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_WELL_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_CELL_IJK ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_WELL_LGR, + { SummaryCategory::SUMMARY_WELL_LGR, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_LGR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_WELL_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_WELL_SEGMENT, + { SummaryCategory::SUMMARY_WELL_SEGMENT, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_WELL_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_SEGMENT_NUMBER ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_BLOCK, + { SummaryCategory::SUMMARY_BLOCK, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_CELL_IJK ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_BLOCK_LGR, + { SummaryCategory::SUMMARY_BLOCK_LGR, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_LGR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_CELL_IJK ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, - { SummaryVarCategory::SUMMARY_IMPORTED, + { SummaryCategory::SUMMARY_IMPORTED, { new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_VECTOR_NAME ), new SummaryIdentifierAndField( SummaryIdentifierType::INPUT_ID ) } }, @@ -169,114 +169,114 @@ RiuSummaryVectorSelectionUi::RiuSummaryVectorSelectionUi() CAF_PDM_InitFieldNoDefault( &m_currentSummaryCategory, "CurrentSummaryCategory", "Current Summary Category" ); CAF_PDM_InitFieldNoDefault( &m_selectedSummaryCategories, "SelectedSummaryCategories", "Summary Categories" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_FIELD][0]->pdmField(), "FieldVectors", "Field vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_FIELD][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_FIELD][0]->pdmField(), "FieldVectors", "Field vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_FIELD][1]->pdmField(), "FieldCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_AQUIFER][0]->pdmField(), "Aquifers", "Aquifers" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_AQUIFER][1]->pdmField(), "AquiferVectors", "Aquifer Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_AQUIFER][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_AQUIFER][0]->pdmField(), "Aquifers", "Aquifers" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_AQUIFER][1]->pdmField(), "AquiferVectors", "Aquifer Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_AQUIFER][2]->pdmField(), "AquifierCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_NETWORK][0]->pdmField(), "NetworkNames", "Networks" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_NETWORK][1]->pdmField(), "NetworkVectors", "Network Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_NETWORK][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_NETWORK][0]->pdmField(), "NetworkNames", "Networks" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_NETWORK][1]->pdmField(), "NetworkVectors", "Network Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_NETWORK][2]->pdmField(), "NetworkCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_MISC][0]->pdmField(), "MiscVectors", "Misc Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_MISC][1]->pdmField(), "MiscCalculationIds", "Calculation Ids" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_MISC][0]->pdmField(), "MiscVectors", "Misc Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_MISC][1]->pdmField(), "MiscCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION][0]->pdmField(), "Regions", "Regions" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION][1]->pdmField(), "RegionsVectors", "Regions Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION][0]->pdmField(), "Regions", "Regions" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION][1]->pdmField(), "RegionsVectors", "Regions Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION][2]->pdmField(), "RegionCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION_2_REGION][0]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION_2_REGION][0]->pdmField(), "Region2RegionRegions", "Regions" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION_2_REGION][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION_2_REGION][1]->pdmField(), "Region2RegionVectors", "Region2s Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION_2_REGION][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION_2_REGION][2]->pdmField(), "Region2RegionCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_GROUP][0]->pdmField(), "WellGroupWellGroupNames", "Groups" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_GROUP][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_GROUP][0]->pdmField(), "WellGroupWellGroupNames", "Groups" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_GROUP][1]->pdmField(), "WellGroupVectors", "Well Group Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_GROUP][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_GROUP][2]->pdmField(), "WellGroupCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL][0]->pdmField(), "WellWellName", "Wells" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL][1]->pdmField(), "WellVectors", "Well Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL][2]->pdmField(), "WellCalculationIds", "Calculation Ids" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL][0]->pdmField(), "WellWellName", "Wells" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL][1]->pdmField(), "WellVectors", "Well Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL][2]->pdmField(), "WellCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][0]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][0]->pdmField(), "WellCompletionWellName", "Wells" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][1]->pdmField(), "WellCompletionIjk", "Cell IJK" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][2]->pdmField(), "WellCompletionVectors", "Well Completion Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][3]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][3]->pdmField(), "WellCompletionCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField(), "WellCompletionLgrLgrName", "LGR Names" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField(), "WellCompletionLgrWellName", "Wells" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField(), "WellCompletionLgrIjk", "Cell IJK" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField(), "WellCompletionLgrVectors", "Well Completion Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][4]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][4]->pdmField(), "WellCompletionLgrCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][0]->pdmField(), "WellLgrLgrName", "LGR Names" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][1]->pdmField(), "WellLgrWellName", "Wells" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][2]->pdmField(), "WellLgrVectors", "Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][3]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][0]->pdmField(), "WellLgrLgrName", "LGR Names" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][1]->pdmField(), "WellLgrWellName", "Wells" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][2]->pdmField(), "WellLgrVectors", "Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][3]->pdmField(), "WellLgrCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][0]->pdmField(), "WellSegmentWellName", "Wells" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][1]->pdmField(), "WellSegmentNumber", "Segments" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][2]->pdmField(), "WellSegmentVectors", "Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][3]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][0]->pdmField(), "WellSegmentWellName", "Wells" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][1]->pdmField(), "WellSegmentNumber", "Segments" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][2]->pdmField(), "WellSegmentVectors", "Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][3]->pdmField(), "WellSegmentCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK][0]->pdmField(), "BlockIjk", "Cell IJK" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK][1]->pdmField(), "BlockVectors", "Block Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK][2]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK][0]->pdmField(), "BlockIjk", "Cell IJK" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK][1]->pdmField(), "BlockVectors", "Block Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK][2]->pdmField(), "BlockCalculationIds", "Calculation Ids" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][0]->pdmField(), "BlockLgrLgrName", "LGR Names" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][1]->pdmField(), "BlockLgrIjk", "Cell IJK" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][2]->pdmField(), "BlockLgrVectors", "Block Vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][3]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][0]->pdmField(), "BlockLgrLgrName", "LGR Names" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][1]->pdmField(), "BlockLgrIjk", "Cell IJK" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][2]->pdmField(), "BlockLgrVectors", "Block Vectors" ); + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][3]->pdmField(), "BlockLgrCalculationIds", "CalculationIds" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_IMPORTED][0]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_IMPORTED][0]->pdmField(), "ImportedVectors", "Imported vectors" ); - CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_IMPORTED][1]->pdmField(), + CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[SummaryCategory::SUMMARY_IMPORTED][1]->pdmField(), "ImportedCalculationIds", "Calculation Ids" ); @@ -648,7 +648,7 @@ void RiuSummaryVectorSelectionUi::setSelectedCurveDefinitions( const std::vector { resetAllFields(); - std::set categories; + std::set categories; for ( const auto& curveDef : curveDefinitions ) { if ( !( curveDef.summaryCase() || curveDef.isEnsembleCurve() ) ) continue; @@ -658,14 +658,14 @@ void RiuSummaryVectorSelectionUi::setSelectedCurveDefinitions( const std::vector RifEclipseSummaryAddress summaryAddress = curveDef.summaryAddress(); // Ignore ensemble statistics curves - if ( summaryAddress.category() == SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS ) continue; + if ( summaryAddress.category() == SummaryCategory::SUMMARY_ENSEMBLE_STATISTICS ) continue; // Select summary category if not already selected auto& selectedCategories = m_selectedSummaryCategories(); if ( std::find( selectedCategories.begin(), selectedCategories.end(), summaryAddress.category() ) == selectedCategories.end() ) { - if ( summaryAddress.category() != SummaryVarCategory::SUMMARY_INVALID ) + if ( summaryAddress.category() != SummaryCategory::SUMMARY_INVALID ) { m_selectedSummaryCategories.v().push_back( summaryAddress.category() ); } @@ -730,7 +730,7 @@ void RiuSummaryVectorSelectionUi::setSelectedCurveDefinitions( const std::vector if ( !categories.empty() ) { - SummaryVarCategory cat = *( categories.begin() ); + SummaryCategory cat = *( categories.begin() ); m_currentSummaryCategory.setValue( cat ); } @@ -745,8 +745,8 @@ void RiuSummaryVectorSelectionUi::fieldChangedByUi( const caf::PdmFieldHandle* c { if ( changedField != &m_selectedSources && changedField != &m_selectedSummaryCategories && changedField != &m_currentSummaryCategory ) { - SummaryVarCategory currentCategory = m_currentSummaryCategory(); - if ( currentCategory != SummaryVarCategory::SUMMARY_INVALID ) + SummaryCategory currentCategory = m_currentSummaryCategory(); + if ( currentCategory != SummaryCategory::SUMMARY_INVALID ) { // When a summary vector is selected, make sure the summary category for the summary vector is in the // selection Note that we use the size of the variant to avoid this operation when an item in unchecked @@ -846,137 +846,137 @@ void RiuSummaryVectorSelectionUi::defineUiOrdering( QString uiConfigName, caf::P caf::PdmField>* summaryiesField = nullptr; - SummaryVarCategory sumCategory = m_currentSummaryCategory(); - if ( sumCategory == SummaryVarCategory::SUMMARY_INVALID ) + SummaryCategory sumCategory = m_currentSummaryCategory(); + if ( sumCategory == SummaryCategory::SUMMARY_INVALID ) { - sumCategory = SummaryVarCategory::SUMMARY_FIELD; + sumCategory = SummaryCategory::SUMMARY_FIELD; } - if ( sumCategory == SummaryVarCategory::SUMMARY_FIELD ) + if ( sumCategory == SummaryCategory::SUMMARY_FIELD ) { - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_FIELD][0]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_FIELD][0]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_AQUIFER ) + else if ( sumCategory == SummaryCategory::SUMMARY_AQUIFER ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryAquifer() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_AQUIFER][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_AQUIFER][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_AQUIFER][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_AQUIFER][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_NETWORK ) + else if ( sumCategory == SummaryCategory::SUMMARY_NETWORK ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryNetwork() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_NETWORK][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_NETWORK][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_NETWORK][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_NETWORK][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_MISC ) + else if ( sumCategory == SummaryCategory::SUMMARY_MISC ) { - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_MISC][0]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_MISC][0]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_REGION ) + else if ( sumCategory == SummaryCategory::SUMMARY_REGION ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryRegion() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_REGION_2_REGION ) + else if ( sumCategory == SummaryCategory::SUMMARY_REGION_2_REGION ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( "Regions" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION_2_REGION][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION_2_REGION][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_REGION_2_REGION][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_REGION_2_REGION][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_GROUP ) + else if ( sumCategory == SummaryCategory::SUMMARY_GROUP ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryWellGroup() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_GROUP][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_GROUP][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_GROUP][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_GROUP][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_WELL ) + else if ( sumCategory == SummaryCategory::SUMMARY_WELL ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryWell() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_WELL_COMPLETION ) + else if ( sumCategory == SummaryCategory::SUMMARY_WELL_COMPLETION ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryCompletion() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][0]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][1]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][1]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION][2]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION][2]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR ) + else if ( sumCategory == SummaryCategory::SUMMARY_WELL_COMPLETION_LGR ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryLgrCompletion() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_WELL_LGR ) + else if ( sumCategory == SummaryCategory::SUMMARY_WELL_LGR ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryLgrWell() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][0]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][1]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][1]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_LGR][2]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_LGR][2]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_WELL_SEGMENT ) + else if ( sumCategory == SummaryCategory::SUMMARY_WELL_SEGMENT ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryWellSegment() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][0]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][1]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][1]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_WELL_SEGMENT][2]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_SEGMENT][2]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_BLOCK ) + else if ( sumCategory == SummaryCategory::SUMMARY_BLOCK ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryBlock() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK][0]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK][1]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK][1]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_BLOCK_LGR ) + else if ( sumCategory == SummaryCategory::SUMMARY_BLOCK_LGR ) { { caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryLgrBlock() + "s" ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][0]->pdmField() ); - myGroup->add( m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][1]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][0]->pdmField() ); + myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][1]->pdmField() ); } - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_BLOCK_LGR][2]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_BLOCK_LGR][2]->pdmField(); } - else if ( sumCategory == SummaryVarCategory::SUMMARY_IMPORTED ) + else if ( sumCategory == SummaryCategory::SUMMARY_IMPORTED ) { - summaryiesField = m_identifierFieldsMap[SummaryVarCategory::SUMMARY_IMPORTED][0]->pdmField(); + summaryiesField = m_identifierFieldsMap[SummaryCategory::SUMMARY_IMPORTED][0]->pdmField(); } caf::PdmUiGroup* summariesGroup = uiOrdering.addNewGroupWithKeyword( "Summaries", RiuSummaryCurveDefinitionKeywords::summaries() ); @@ -1220,7 +1220,7 @@ std::set RiuSummaryVectorSelectionUi::buildAddressList std::set addressSet; for ( const auto& category : m_selectedSummaryCategories() ) { - if ( m_identifierFieldsMap.at( category ).size() == 0 || category == SummaryVarCategory::SUMMARY_INVALID ) continue; + if ( m_identifierFieldsMap.at( category ).size() == 0 || category == SummaryCategory::SUMMARY_INVALID ) continue; const auto& identifierAndFieldList = m_identifierFieldsMap.at( category ); std::vector> selectionStack; @@ -1233,7 +1233,7 @@ std::set RiuSummaryVectorSelectionUi::buildAddressList /// //-------------------------------------------------------------------------------------------------- void RiuSummaryVectorSelectionUi::buildAddressListForCategoryRecursively( - SummaryVarCategory category, + SummaryCategory category, std::vector::const_iterator identifierAndFieldItr, std::vector>& identifierPath, std::set& addressSet ) const @@ -1314,7 +1314,7 @@ void RiuSummaryVectorSelectionUi::defineEditorAttribute( const caf::PdmFieldHand void RiuSummaryVectorSelectionUi::resetAllFields() { m_selectedSources.clearWithoutDelete(); - m_selectedSummaryCategories = std::vector>(); + m_selectedSummaryCategories = std::vector>(); // clear all state in fields for ( auto& identifierAndFieldList : m_identifierFieldsMap ) @@ -1370,28 +1370,28 @@ void RiuSummaryVectorSelectionUi::appendOptionItemsForSources( QList& options ) const { - std::vector sortedCategoriesForUi; + std::vector sortedCategoriesForUi; - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_FIELD ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_AQUIFER ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_NETWORK ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_MISC ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_REGION ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_REGION_2_REGION ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_GROUP ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_WELL ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_WELL_COMPLETION ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_BLOCK ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_FIELD ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_AQUIFER ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_NETWORK ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_MISC ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_REGION ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_REGION_2_REGION ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_GROUP ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_WELL ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_WELL_COMPLETION ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_BLOCK ); if ( !m_hideCalculationIncompatibleCategories ) { - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_WELL_SEGMENT ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_WELL_LGR ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR ); - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_BLOCK_LGR ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_WELL_SEGMENT ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_WELL_LGR ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_WELL_COMPLETION_LGR ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_BLOCK_LGR ); } - sortedCategoriesForUi.push_back( SummaryVarCategory::SUMMARY_IMPORTED ); + sortedCategoriesForUi.push_back( SummaryCategory::SUMMARY_IMPORTED ); // NB SUMMARY_ENSEMBLE_STATISTICS is intentionally excluded // categoriesForUiDisplay.push_back(SummaryVarCategory::SUMMARY_ENSEMBLE_STATISTICS); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.h b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.h index f6c6932cbf..b960e9b005 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.h @@ -95,7 +95,7 @@ private: const std::vector& identifierAndFieldList ) const; std::set buildAddressListFromSelections() const; - void buildAddressListForCategoryRecursively( RifEclipseSummaryAddressDefines::SummaryVarCategory category, + void buildAddressListForCategoryRecursively( RifEclipseSummaryAddressDefines::SummaryCategory category, std::vector::const_iterator identifierAndFieldItr, std::vector>& identifierPath, std::set& addressSet ) const; @@ -113,10 +113,10 @@ private: private: caf::PdmPtrArrayField m_selectedSources; - caf::PdmField>> m_selectedSummaryCategories; - caf::PdmField> m_currentSummaryCategory; + caf::PdmField>> m_selectedSummaryCategories; + caf::PdmField> m_currentSummaryCategory; - std::map> m_identifierFieldsMap; + std::map> m_identifierFieldsMap; bool m_multiSelectionMode;