Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -rd39966fb0ba934896979db057b1d4b07dad086ed --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision d39966fb0ba934896979db057b1d4b07dad086ed) @@ -49,11 +49,11 @@ private const int heightStructurePropertyIndex = 1; private const int heightStructureLocationPropertyIndex = 2; private const int structureNormalOrientationPropertyIndex = 3; - private const int levelCrestStructurePropertyIndex = 4; - private const int allowedLevelIncreaseStoragePropertyIndex = 5; + private const int flowWidthAtBottomProtectionPropertyIndex = 4; + private const int widthFlowAperturesPropertyIndex = 5; private const int storageStructureAreaPropertyIndex = 6; - private const int flowWidthAtBottomProtectionPropertyIndex = 7; - private const int widthFlowAperturesPropertyIndex = 8; + private const int allowedLevelIncreaseStoragePropertyIndex = 7; + private const int levelCrestStructurePropertyIndex = 8; private const int criticalOvertoppingDischargePropertyIndex = 9; private const int failureProbabilityStructureWithErosionPropertyIndex = 10; private const int foreshoreProfilePropertyIndex = 11; @@ -166,34 +166,34 @@ } } - [PropertyOrder(levelCrestStructurePropertyIndex)] + [PropertyOrder(flowWidthAtBottomProtectionPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")] - public NormalDistributionProperties LevelCrestStructure + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_Description")] + public LogNormalDistributionProperties FlowWidthAtBottomProtection { get { - return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + return new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) { - Data = data.WrappedData.LevelCrestStructure + Data = data.WrappedData.FlowWidthAtBottomProtection }; } } - [PropertyOrder(allowedLevelIncreaseStoragePropertyIndex)] + [PropertyOrder(widthFlowAperturesPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_DisplayName")] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_Description")] - public LogNormalDistributionProperties AllowedLevelIncreaseStorage + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_Description")] + public NormalDistributionVariationProperties WidthFlowApertures { get { - return new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + return new NormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) { - Data = data.WrappedData.AllowedLevelIncreaseStorage + Data = data.WrappedData.WidthFlowApertures }; } } @@ -214,34 +214,34 @@ } } - [PropertyOrder(flowWidthAtBottomProtectionPropertyIndex)] + [PropertyOrder(allowedLevelIncreaseStoragePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_DisplayName")] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_Description")] - public LogNormalDistributionProperties FlowWidthAtBottomProtection + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_Description")] + public LogNormalDistributionProperties AllowedLevelIncreaseStorage { get { return new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) { - Data = data.WrappedData.FlowWidthAtBottomProtection + Data = data.WrappedData.AllowedLevelIncreaseStorage }; } } - [PropertyOrder(widthFlowAperturesPropertyIndex)] + [PropertyOrder(levelCrestStructurePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_DisplayName")] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_Description")] - public NormalDistributionVariationProperties WidthFlowApertures + [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")] + [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")] + public NormalDistributionProperties LevelCrestStructure { get { - return new NormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) { - Data = data.WrappedData.WidthFlowApertures + Data = data.WrappedData.LevelCrestStructure }; } }