Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -r998e73d396cfffed52646ecd18dbe8c3eee06497 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 998e73d396cfffed52646ecd18dbe8c3eee06497) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -217,6 +217,24 @@ } /// + /// Looks up a localized string similar to Categoriegrens (kans) waarvoor de berekening moet worden uitgevoerd.. + /// + public static string WaveConditionsInput_CategoryType_Description { + get { + return ResourceManager.GetString("WaveConditionsInput_CategoryType_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Categoriegrens. + /// + public static string WaveConditionsInput_CategoryType_DisplayName { + get { + return ResourceManager.GetString("WaveConditionsInput_CategoryType_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Ondergrens van de bekleding.. /// public static string WaveConditionsInput_LowerBoundaryRevetment_Description { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -r998e73d396cfffed52646ecd18dbe8c3eee06497 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 998e73d396cfffed52646ecd18dbe8c3eee06497) @@ -270,4 +270,10 @@ Hulplijn bekleding + + Categoriegrens (kans) waarvoor de berekening moet worden uitgevoerd. + + + Categoriegrens + \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs =================================================================== diff -u -rbb5ffc8cd070e506de1904ed9b1a8dbf63a42680 -r998e73d396cfffed52646ecd18dbe8c3eee06497 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision bb5ffc8cd070e506de1904ed9b1a8dbf63a42680) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 998e73d396cfffed52646ecd18dbe8c3eee06497) @@ -49,34 +49,37 @@ /// /// The type of the wave conditions input context. /// The type of the contained wave conditions input. - public abstract class WaveConditionsInputContextProperties : ObjectProperties, - IHasHydraulicBoundaryLocationProperty, - IHasForeshoreProfileProperty + /// The category type contained by the wave conditions input. + public abstract class WaveConditionsInputContextProperties + : ObjectProperties, + IHasHydraulicBoundaryLocationProperty, + IHasForeshoreProfileProperty where TContext : WaveConditionsInputContext where TInput : WaveConditionsInput { private const int hydraulicBoundaryLocationPropertyIndex = 0; - private const int assessmentLevelPropertyIndex = 1; - private const int upperBoundaryDesignWaterLevelPropertyIndex = 2; - private const int upperBoundaryRevetmentPropertyIndex = 3; - private const int lowerBoundaryRevetmentPropertyIndex = 4; - private const int upperBoundaryWaterLevelsPropertyIndex = 5; - private const int lowerBoundaryWaterLevelsPropertyIndex = 6; - private const int stepSizePropertyIndex = 7; - private const int waterLevelsPropertyIndex = 8; + private const int categoryTypePropertyIndex = 1; + private const int assessmentLevelPropertyIndex = 2; + private const int upperBoundaryDesignWaterLevelPropertyIndex = 3; + private const int upperBoundaryRevetmentPropertyIndex = 4; + private const int lowerBoundaryRevetmentPropertyIndex = 5; + private const int upperBoundaryWaterLevelsPropertyIndex = 6; + private const int lowerBoundaryWaterLevelsPropertyIndex = 7; + private const int stepSizePropertyIndex = 8; + private const int waterLevelsPropertyIndex = 9; - private const int foreshoreProfilePropertyIndex = 9; - private const int worldReferencePointPropertyIndex = 10; - private const int orientationPropertyIndex = 11; - private const int breakWaterPropertyIndex = 12; - private const int foreshoreGeometryPropertyIndex = 13; - private const int revetmentTypePropertyIndex = 14; + private const int foreshoreProfilePropertyIndex = 10; + private const int worldReferencePointPropertyIndex = 11; + private const int orientationPropertyIndex = 12; + private const int breakWaterPropertyIndex = 13; + private const int foreshoreGeometryPropertyIndex = 14; + private const int revetmentTypePropertyIndex = 15; private readonly Func getNormativeAssessmentLevelFunc; private readonly IObservablePropertyChangeHandler propertyChangeHandler; /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// The for which the properties are shown. /// for obtaining the normative assessment level. @@ -107,6 +110,13 @@ this.propertyChangeHandler = propertyChangeHandler; } + [PropertyOrder(categoryTypePropertyIndex)] + [TypeConverter(typeof(EnumTypeConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaveConditionsInput_CategoryType_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.WaveConditionsInput_CategoryType_Description))] + public abstract TCategory CategoryType { get; set; } + [PropertyOrder(assessmentLevelPropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.AssessmentLevel_DisplayName))]