OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-28 18:01:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use AppEnumField in test application

Browse Source
This commit is contained in:
Magne Sjaastad 2024-03-03 14:08:25 +01:00
parent e080fa55e0
commit a1bada1f64
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnumField.h
View File

@ -24,7 +24,7 @@ public:
QVariant toQVariant() const override QVariant toQVariant() const override
{ {
auto enumValue = static_cast<std::underlying_type_t<DataType>>( m_fieldValue ); auto enumValue = static_cast<std::underlying_type_t<DataType>>( m_fieldValue.value() );
return enumValue; return enumValue;
} }

4
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
View File

@ -18,6 +18,7 @@
#include "cafCmdSelectionHelper.h" #include "cafCmdSelectionHelper.h"
#endif #endif
#include "cafAppEnumField.h"
#include "cafCmdFeatureMenuBuilder.h" #include "cafCmdFeatureMenuBuilder.h"
#include "cafFilePath.h" #include "cafFilePath.h"
#include "cafPdmDocument.h" #include "cafPdmDocument.h"
@ -714,6 +715,8 @@ public:
"", "",
"", "",
"" ); "" );
CAF_PDM_InitFieldNoDefault( &m_testAppEnumField, "TestAppEnumValue", "AppEnum Field" );
CAF_PDM_InitFieldNoDefault( &m_ptrField, "m_ptrField", "PtrField", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_ptrField, "m_ptrField", "PtrField", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_proxyEnumField, "ProxyEnumValue", "ProxyEnum", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_proxyEnumField, "ProxyEnumValue", "ProxyEnum", "", "", "" );
@ -732,6 +735,7 @@ public:
caf::PdmField<int> m_intField; caf::PdmField<int> m_intField;
caf::PdmField<QString> m_textField; caf::PdmField<QString> m_textField;
caf::PdmField<caf::AppEnum<TestEnumType>> m_testEnumField; caf::PdmField<caf::AppEnum<TestEnumType>> m_testEnumField;
caf::AppEnumField<TestEnumType> m_testAppEnumField;
caf::PdmPtrField<SmallDemoPdmObjectA*> m_ptrField; caf::PdmPtrField<SmallDemoPdmObjectA*> m_ptrField;
caf::PdmProxyValueField<caf::AppEnum<TestEnumType>> m_proxyEnumField; caf::PdmProxyValueField<caf::AppEnum<TestEnumType>> m_proxyEnumField;