OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduce memory use for summary address object

Browse Source 
* Use one common variable for object name, use three ints
* Move enums to separate file
* Refactor use of enums
* Move implementation to cpp
* Refactor includes
This commit is contained in:
Magne Sjaastad
2023-08-21 07:12:08 +02:00
committed by GitHub
parent 1b886c1a1e
commit 96b3bef878
70 changed files with 1252 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
View File

@@ -43,7 +43,8 @@ RimObservedSummaryData::RimObservedSummaryData()
m_useCustomIdentifier.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_summaryCategory,
"SummaryType",
caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>( RifEclipseSummaryAddress::SUMMARY_WELL ),
caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryVarCategory>(
RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL ),
"Summary Type" );
m_summaryCategory.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_identifierName, "IdentifierName", "Identifier Name" );
@@ -71,7 +72,7 @@ QString RimObservedSummaryData::identifierName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress::SummaryVarCategory RimObservedSummaryData::summaryCategory() const
RifEclipseSummaryAddressDefines::SummaryVarCategory RimObservedSummaryData::summaryCategory() const
{
return m_summaryCategory();
}
@@ -101,7 +102,7 @@ void RimObservedSummaryData::updateMetaData()
//--------------------------------------------------------------------------------------------------
QString RimObservedSummaryData::customWellName() const
{
if ( m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddress::SUMMARY_WELL )
if ( m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL )
{
return m_identifierName();
}
@@ -118,11 +119,11 @@ QList<caf::PdmOptionItemInfo> RimObservedSummaryData::calculateValueOptions( con
{
QList<caf::PdmOptionItemInfo> options;
using AddressAppEnum = caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>;
options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddress::SUMMARY_WELL ),
RifEclipseSummaryAddress::SUMMARY_WELL ) );
options.push_back( caf::PdmOptionItemInfo( AddressAppEnum::uiText( RifEclipseSummaryAddress::SUMMARY_GROUP ),
RifEclipseSummaryAddress::SUMMARY_GROUP ) );
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 ) );
return options;
}