mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 14:40:26 -05:00
Magne Sjaastad
64361c2f78
RimGridCalculation::AdditionalCasesType::ALL_CASES and RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN both reused the serialization text of a sibling enum value (NONE and INTERSECT_SHOW_BELOW respectively), so they would silently round-trip as the wrong value when read back from a project file. AppEnumMapperBase::addItem only asserted alias uniqueness, not text uniqueness, so this class of bug went undetected. Add a CAF_ASSERT checking that a new enum value's serialization text does not match an existing value's text or aliases. Found while investigating the AppEnum alias-duplication note in #14654.
36 lines
1.4 KiB
C++
36 lines
1.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2021 Equinor ASA
|
|
//
|
|
// ResInsight is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "RimIntersectionEnums.h"
|
|
|
|
#include "cafAppEnum.h"
|
|
|
|
namespace caf
|
|
{
|
|
template <>
|
|
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_BETWEEN", "Between" );
|
|
setDefault( RimIntersectionFilterEnum::INTERSECT_FILTER_BETWEEN );
|
|
}
|
|
|
|
} // namespace caf
|