OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-13 17:02:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to SummaryCategory

Browse Source
This commit is contained in:
Magne Sjaastad committed 2023-09-20 09:58:48 +02:00
1 parent c06cda3883
commit 806f367566
49 files changed
+598 -598
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+6 -6
View File
@@ -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<RimSummaryCase*> allCases = group->allSummaryCases();
std::vector<RimSummaryCase*> filteredCases = filterEnsembleCases( allCases );
@@ -1669,7 +1669,7 @@ void RimEnsembleCurveSet::updateCurveColors()
std::vector<RimSummaryCase*> 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::vector<RimSummaryCase
setLeftOrRightAxisY( axisY() );
RimSummaryAddress* addr = m_yValuesSummaryAddress();
if ( plot && addr->address().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::vector<RimSummaryCa
RimSummaryAddress* addr = m_yValuesSummaryAddress();
if ( !isCurvesVisible() || m_disableStatisticCurves || !group ||
addr->address().category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID )
addr->address().category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID )
return;
// Calculate
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
+9 -9
View File
@@ -43,8 +43,8 @@ RimObservedSummaryData::RimObservedSummaryData()
m_useCustomIdentifier.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_summaryCategory,
"SummaryType",
caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>(
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ),
caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>(
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<caf::PdmOptionItemInfo> RimObservedSummaryData::calculateValueOptions( con
{
QList<caf::PdmOptionItemInfo> options;
using AddressAppEnum = caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>;
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<RifEclipseSummaryAddressDefines::SummaryCategory>;
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;
}
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h
+2 -2
View File
@@ -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<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>> m_summaryCategory;
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>> m_summaryCategory;
caf::PdmField<QString> m_identifierName;
caf::PdmField<bool> m_useCustomIdentifier;
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
+8 -8
View File
@@ -29,9 +29,9 @@
namespace caf
{
template <>
void caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>::setUp()
void caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>::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 {};
}
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.h
+2 -2
View File
@@ -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<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>> m_category;
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>> m_category;
caf::PdmField<QString> m_vectorName;
caf::PdmField<int> m_regionNumber;
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
+15 -15
View File
@@ -212,27 +212,27 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
{
switch ( address.category() )
{
case SummaryVarCategory::SUMMARY_FIELD:
case SummaryCategory::SUMMARY_FIELD:
fields->addAddress( 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::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_GROUP:
case SummaryCategory::SUMMARY_GROUP:
groups->addToSubfolder( 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::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_WELL_SEGMENT:
case SummaryCategory::SUMMARY_WELL_SEGMENT:
segment->addToSubfolderTree( { QString::fromStdString( address.wellName() ), QString::number( address.wellSegmentNumber() ) },
CollectionContentType::WELL_SEGMENT,
address,
@@ -265,11 +265,11 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_BLOCK:
case SummaryCategory::SUMMARY_BLOCK:
blocks->addToSubfolder( 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::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR:
case SummaryCategory::SUMMARY_WELL_COMPLETION_LGR:
lgrcompletion->addToSubfolderTree( { QString::fromStdString( address.lgrName() ),
QString::fromStdString( address.wellName() ),
QString::fromStdString( address.blockAsString() ) },
@@ -287,7 +287,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_BLOCK_LGR:
case SummaryCategory::SUMMARY_BLOCK_LGR:
lgrblock->addToSubfolderTree( { QString::fromStdString( address.lgrName() ), QString::fromStdString( address.blockAsString() ) },
CollectionContentType::BLOCK_LGR,
address,
@@ -295,7 +295,7 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
ensembleId );
break;
case SummaryVarCategory::SUMMARY_IMPORTED:
case SummaryCategory::SUMMARY_IMPORTED:
imported->addAddress( address, caseId, ensembleId );
break;
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
+1 -1
View File
@@ -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 );
}
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
+1 -1
View File
@@ -696,7 +696,7 @@ std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryWellName
for ( auto& address : allAddresses )
{
if ( address.category() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL )
if ( address.category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL )
{
summaryWellNames.insert( address.wellName() );
}
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
+13 -13
View File
@@ -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 );
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
+6 -6
View File
@@ -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() );
}
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
+31 -31
View File
@@ -255,47 +255,47 @@ QList<caf::PdmOptionItemInfo> 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<QString> 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<caf::PdmFieldHandle*> 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<caf::PdmFieldHandle*> 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<QString, QString> RimSummaryPlotSourceStepping::optionsForQuantity( std::set<RifEclipseSummaryAddress> addresses )
{
SummaryVarCategory category = SummaryVarCategory::SUMMARY_FIELD;
SummaryCategory category = SummaryCategory::SUMMARY_FIELD;
auto visibleCurveAddresses = addressesForCurvesInPlot();
if ( !visibleCurveAddresses.empty() )
@@ -1223,7 +1223,7 @@ std::map<QString, QString> RimSummaryPlotSourceStepping::optionsForQuantity( std
//--------------------------------------------------------------------------------------------------
std::map<QString, QString> RimSummaryPlotSourceStepping::optionsForQuantity( RiaSummaryAddressAnalyzer* analyzser )
{
SummaryVarCategory category = SummaryVarCategory::SUMMARY_FIELD;
SummaryCategory category = SummaryCategory::SUMMARY_FIELD;
auto visibleCurveAddresses = addressesForCurvesInPlot();
if ( !visibleCurveAddresses.empty() )
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp
+20 -20
View File
@@ -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<caf::PdmOptionItemInfo> RimSummaryTable::calculateValueOptions( const caf:
}
else if ( fieldNeedingOptions == &m_category )
{
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>::uiText(
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ),
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ) );
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>::uiText(
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ),
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP ) );
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>::uiText(
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ),
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION ) );
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>::uiText(
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ),
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL ) );
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>::uiText(
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ),
RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP ) );
options.push_back( caf::PdmOptionItemInfo( caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>::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<RifEclipseSummaryAddress> RimSummaryTable::getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryVarCategory category,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vector ) const
{
if ( !summaryReader ) return {};
@@ -623,12 +623,12 @@ std::set<RifEclipseSummaryAddress> RimSummaryTable::getSummaryAddressesFromReade
///
//--------------------------------------------------------------------------------------------------
std::set<QString> 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<QString> 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() );
}
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h
+4 -4
View File
@@ -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<RifEclipseSummaryAddress> getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryVarCategory category,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vector ) const;
std::set<QString> getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryVarCategory category ) const;
RifEclipseSummaryAddressDefines::SummaryCategory category ) const;
QString getCategoryNameFromAddress( const RifEclipseSummaryAddress& address ) const;
std::vector<RimSummaryCase*> getToplevelSummaryCases() const;
@@ -115,7 +115,7 @@ private:
caf::PdmField<bool> m_isAutomaticName;
caf::PdmPtrField<RimSummaryCase*> m_case;
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>> m_category;
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>> m_category;
caf::PdmField<QString> m_vector;
caf::PdmField<caf::AppEnum<RiaDefines::DateTimePeriod>> m_resamplingSelection;
caf::PdmField<double> m_thresholdValue;
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp
+1 -1
View File
@@ -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();
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
RimSummaryTable* createDefaultSummaryTable();
RimSummaryTable* createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryVarCategory category,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName );
private: