diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionEnums.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionEnums.cpp index d58424d98d..b7706717bc 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionEnums.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionEnums.cpp @@ -28,7 +28,7 @@ void caf::AppEnum::setUp() addItem( RimIntersectionFilterEnum::INTERSECT_FILTER_NONE, "INTERSECT_SHOW_ALL", "Disabled" ); addItem( RimIntersectionFilterEnum::INTERSECT_FILTER_ABOVE, "INTERSECT_SHOW_ABOVE", "Above" ); addItem( RimIntersectionFilterEnum::INTERSECT_FILTER_BELOW, "INTERSECT_SHOW_BELOW", "Below" ); - addItem( RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN, "INTERSECT_SHOW_BELOW", "Between" ); + addItem( RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN, "INTERSECT_SHOW_BETWEEN", "Between" ); setDefault( RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp index 783923099d..9dbb3b2fa8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp @@ -80,7 +80,7 @@ void caf::AppEnum::setUp() addItem( RimGridCalculation::AdditionalCasesType::NONE, "NONE", "None" ); addItem( RimGridCalculation::AdditionalCasesType::GRID_CASE_GROUP, "GRID_CASE_GROUP", "Case Group" ); addItem( RimGridCalculation::AdditionalCasesType::ENSEMBLE, "ENSEMBLE", "Ensemble" ); - addItem( RimGridCalculation::AdditionalCasesType::ALL_CASES, "NONE", "All Cases" ); + addItem( RimGridCalculation::AdditionalCasesType::ALL_CASES, "ALL_CASES", "All Cases" ); setDefault( RimGridCalculation::AdditionalCasesType::NONE ); } }; // namespace caf diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.cpp index 4589bd304f..44a7d59c38 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.cpp @@ -74,6 +74,13 @@ void AppEnumMapperBase::addItem( int enumVal, const QString& text, QString uiTex // https://github.com/OPM/ResInsight/issues/14404 CAF_ASSERT( !containsWhitespace( text.trimmed() ) ); + // Make sure the serialization text is unique for the enum, otherwise two enum values would read back + // as the same value from XML (see https://github.com/OPM/ResInsight/issues/14654) + for ( const auto& enumData : m_mapping ) + { + CAF_ASSERT( !enumData.isMatching( text.trimmed() ) ); + } + // Make sure the alias text is unique for enum for ( const auto& alias : aliases ) {