Skip to content

#14746 Fix duplicate AppEnum serialization text and detect it in addItem #14745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magnesj merged 1 commit into from
Sep 14, 2026
+9 −2
Merged

#14746 Fix duplicate AppEnum serialization text and detect it in addItem #14745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionEnums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void caf::AppEnum<RimIntersectionFilterEnum>::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 );
}

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void caf::AppEnum<RimGridCalculation::AdditionalCasesType>::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
Expand Down
7 changes: 7 additions & 0 deletions Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down