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

Use subset of enums

Browse Source 
Use setEnumSubset instead of calculateValueOptions
This commit is contained in:
Magne Sjaastad
2025-02-10 17:22:25 +01:00
committed by GitHub
parent 00c70a6da6
commit d76f67f3fb
14 changed files with 64 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h
View File

@@ -37,6 +37,7 @@
#pragma once
#include "cafAssert.h"
#include "cafPdmFieldHandle.h"
#include <QString>
#include <QStringList>
@@ -103,7 +104,7 @@ namespace caf
/// contains a valid value when the constructor is done.
///
/// CAF_PDM_InitField( &m_enum2Field, "Enum2Field", MyEnumType::T6, "Subset using setEnumSubset()" );
/// caf::AppEnum<MyEnumType>::setEnumSubset( m_enum2Field.keyword(), { MyEnumType::T2, MyEnumType::T6 } );
/// caf::AppEnum<MyEnumType>::setEnumSubset( &m_enum2Field, { MyEnumType::T2, MyEnumType::T6 } );
///
///
//==================================================================================================
@@ -128,7 +129,11 @@ public:
{
}
static void setEnumSubset( QString fieldKeyword, std::vector<T> subset ) { m_enumSubset[fieldKeyword] = subset; }
static void setEnumSubset( caf::PdmFieldHandle* fieldKeyword, std::vector<T> subset )
{
if ( !fieldKeyword ) return;
m_enumSubset[fieldKeyword->keyword()] = subset;
}
static std::vector<T> enumSubset( QString fieldKeyword )
{
auto it = m_enumSubset.find( fieldKeyword );

2
Fwk/AppFwk/cafTests/cafTestApplication/ApplicationEnum.cpp
View File

@@ -31,7 +31,7 @@ ApplicationEnum::ApplicationEnum()
// Enum field displaying a subset of the defined enums using the static function setEnumSubset()
CAF_PDM_InitField( &m_enum2Field, "Enum2Field", MyEnumType::T6, "Subset using setEnumSubset()" );
caf::AppEnum<MyEnumType>::setEnumSubset( m_enum2Field.keyword(), { MyEnumType::T2, MyEnumType::T6 } );
caf::AppEnum<MyEnumType>::setEnumSubset( &m_enum2Field, { MyEnumType::T2, MyEnumType::T6 } );
// Enum field displaying a subset of the defined enums using calculateValueOptions()
CAF_PDM_InitFieldNoDefault( &m_enum3Field, "Enum3Field", "Subset using calculateValueOptions()" );