Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra16989b635b3770eb1bbf10c47e41eef796ce2fa -r047f4923187a3d85e80edeb58439661eb926976f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 047f4923187a3d85e80edeb58439661eb926976f) @@ -284,6 +284,24 @@ } /// + /// Looks up a localized string similar to Geeft aan of het lineair belastingmodel of het kwadratisch belastingmodel moet worden gebruikt.. + /// + internal static string Structure_LoadSchematizationType_Description { + get { + return ResourceManager.GetString("Structure_LoadSchematizationType_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Belastingschematisering. + /// + internal static string Structure_LoadSchematizationType_DisplayName { + get { + return ResourceManager.GetString("Structure_LoadSchematizationType_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kans op aanvaring tweede keermiddel per nivellering.. /// internal static string Structure_ProbabilityCollisionSecondaryStructure_Description { @@ -390,5 +408,23 @@ return ResourceManager.GetString("Structure_VerticalDistance_DisplayName", resourceCulture); } } + + /// + /// Looks up a localized string similar to Volumiek gewicht van water.. + /// + internal static string Structure_VolumicWeightWater_Description { + get { + return ResourceManager.GetString("Structure_VolumicWeightWater_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volumiek gewicht van water [kN/m³]. + /// + internal static string Structure_VolumicWeightWater_DisplayName { + get { + return ResourceManager.GetString("Structure_VolumicWeightWater_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx =================================================================== diff -u -ra16989b635b3770eb1bbf10c47e41eef796ce2fa -r047f4923187a3d85e80edeb58439661eb926976f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 047f4923187a3d85e80edeb58439661eb926976f) @@ -183,6 +183,12 @@ Aantal nivelleringen per jaar [1/jaar] + + Geeft aan of het lineair belastingmodel of het kwadratisch belastingmodel moet worden gebruikt. + + + Belastingschematisering + Kans op aanvaring tweede keermiddel per nivellering. @@ -219,4 +225,10 @@ Afstand onderkant wand en teen van de dijk/berm [m] + + Volumiek gewicht van water. + + + Volumiek gewicht van water [kN/m³] + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs =================================================================== diff -u -ra16989b635b3770eb1bbf10c47e41eef796ce2fa -r047f4923187a3d85e80edeb58439661eb926976f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs (.../StabilitypointStructuresInputContextProperties.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs (.../StabilitypointStructuresInputContextProperties.cs) (revision 047f4923187a3d85e80edeb58439661eb926976f) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.ComponentModel; using Core.Common.Base.Data; @@ -29,8 +30,10 @@ using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Utils; +using Ringtoets.StabilityPointStructures.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.StabilityPointStructures.Forms.PropertyClasses @@ -40,6 +43,24 @@ /// public class StabilityPointStructuresInputContextProperties : StructuresInputBaseProperties, StabilityPointStructuresFailureMechanism> { + private const int verticalDistancePropertyIndex = 0; + private const int evaluationLevelPropertyIndex = 0; + private const int bankWidthPropertyIndex = 0; + private const int probabilityCollisionSecondaryStructurePropertyIndex = 0; + private const int levellingCountPropertyIndex = 0; + private const int shipVelocityPropertyIndex = 0; + private const int shipMassPropertyIndex = 0; + private const int failureCollisionEnergyPropertyIndex = 0; + private const int failureProbabilityRepairClosurePropertyIndex = 0; + private const int stabilityQuadraticLoadModelPropertyIndex = 0; + private const int stabilityLinearLoadModelPropertyIndex = 0; + private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 0; + private const int constructiveStrengthLinearLoadModelPropertyIndex = 0; + private const int levelCrestStructurePropertyIndex = 0; + private const int flowVelocityStructureClosablePropertyIndex = 0; + private const int insideWaterLevelFailureConstructionPropertyIndex = 0; + private const int volumicWeightWaterPropertyIndex = 0; + private const int loadSchematizationTypePropertyIndex = 0; private const int hydraulicBoundaryLocationPropertyIndex = 1; private const int stormDurationPropertyIndex = 2; private const int insideWaterLevelPropertyIndex = 4; @@ -102,6 +123,39 @@ #region Hydraulic data + [PropertyOrder(volumicWeightWaterPropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "Structure_VolumicWeightWater_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_VolumicWeightWater_Description")] + public RoundedDouble VolumicWeightWater + { + get + { + return data.WrappedData.VolumicWeightWater; + } + set + { + data.WrappedData.VolumicWeightWater = value; + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(insideWaterLevelFailureConstructionPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "Structure_InsideWaterLevelFailureConstruction_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_InsideWaterLevelFailureConstruction_Description")] + public NormalDistributionProperties InsideWaterLevelFailureConstruction + { + get + { + return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.InsideWaterLevelFailureConstruction + }; + } + } + [PropertyOrder(insideWaterLevelPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")] @@ -155,6 +209,22 @@ } } + [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] + public NormalDistributionProperties FlowVelocityStructureClosable + { + get + { + return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.FlowVelocityStructureClosable + }; + } + } + #endregion #region Schematization @@ -177,6 +247,40 @@ } } + [PropertyOrder(loadSchematizationTypePropertyIndex)] + [TypeConverter(typeof(EnumTypeConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_LoadSchematizationType_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_LoadSchematizationType_Description")] + public LoadSchematizationType LoadSchematizationType + { + get + { + return data.WrappedData.LoadSchematizationType; + } + set + { + data.WrappedData.LoadSchematizationType = value; + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(levelCrestStructurePropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_LevelCrestStructure_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_LevelCrestStructure_Description")] + public NormalDistributionProperties LevelCrestStructure + { + get + { + return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.LevelCrestStructure + }; + } + } + [PropertyOrder(thresholdHeightOpenWeirPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] @@ -209,6 +313,249 @@ } } + [PropertyOrder(constructiveStrengthLinearLoadModelPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_ConstructiveStrengthLinearLoadModel_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_ConstructiveStrengthLinearLoadModel_Description")] + public VariationCoefficientLogNormalDistributionProperties ConstructiveStrengthLinearLoadModel + { + get + { + return new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.ConstructiveStrengthLinearLoadModel + }; + } + } + + [PropertyOrder(constructiveStrengthQuadraticLoadModelPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_ConstructiveStrengthQuadraticLoadModel_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_ConstructiveStrengthQuadraticLoadModel_Description")] + public VariationCoefficientLogNormalDistributionProperties ConstructiveStrengthQuadraticLoadModel + { + get + { + return new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.ConstructiveStrengthQuadraticLoadModel + }; + } + } + + [PropertyOrder(stabilityLinearLoadModelPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_StabilityLinearLoadModel_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_StabilityLinearLoadModel_Description")] + public VariationCoefficientLogNormalDistributionProperties StabilityLinearLoadModel + { + get + { + return new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.StabilityLinearLoadModel + }; + } + } + + [PropertyOrder(stabilityQuadraticLoadModelPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_StabilityQuadraticLoadModel_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_StabilityQuadraticLoadModel_Description")] + public VariationCoefficientLogNormalDistributionProperties StabilityQuadraticLoadModel + { + get + { + return new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.StabilityQuadraticLoadModel + }; + } + } + + [PropertyOrder(failureProbabilityRepairClosurePropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_FailureProbabilityRepairClosure_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_FailureProbabilityRepairClosure_Description")] + public string FailureProbabilityRepairClosure + { + get + { + return ProbabilityFormattingHelper.Format(data.WrappedData.FailureProbabilityRepairClosure); + } + set + { + if (value == null) + { + throw new ArgumentNullException("value", RingtoetsCommonFormsResources.FailureProbability_Value_cannot_be_null); + } + try + { + data.WrappedData.FailureProbabilityRepairClosure = (RoundedDouble)double.Parse(value); + } + catch (OverflowException) + { + throw new ArgumentException(RingtoetsCommonFormsResources.FailureProbability_Value_too_large); + } + catch (FormatException) + { + throw new ArgumentException(RingtoetsCommonFormsResources.FailureProbability_Could_not_parse_string_to_double_value); + } + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(failureCollisionEnergyPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_FailureCollisionEnergy_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_FailureCollisionEnergy_Description")] + public VariationCoefficientLogNormalDistributionProperties FailureCollisionEnergy + { + get + { + return new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.FailureCollisionEnergy + }; + } + } + + [PropertyOrder(shipMassPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_ShipMass_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_ShipMass_Description")] + public VariationCoefficientNormalDistributionProperties ShipMass + { + get + { + return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.ShipMass + }; + } + } + + [PropertyOrder(shipVelocityPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_ShipVelocity_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_ShipVelocity_Description")] + public VariationCoefficientNormalDistributionProperties ShipVelocity + { + get + { + return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.ShipVelocity + }; + } + } + + [PropertyOrder(levellingCountPropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_LevellingCount_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_LevellingCount_Description")] + public int LevellingCount + { + get + { + return data.WrappedData.LevellingCount; + } + set + { + data.WrappedData.LevellingCount = value; + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(probabilityCollisionSecondaryStructurePropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_ProbabilityCollisionSecondaryStructure_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_ProbabilityCollisionSecondaryStructure_Description")] + public string ProbabilityCollisionSecondaryStructure + { + get + { + return ProbabilityFormattingHelper.Format(data.WrappedData.ProbabilityCollisionSecondaryStructure); + } + set + { + if (value == null) + { + throw new ArgumentNullException("value", RingtoetsCommonFormsResources.FailureProbability_Value_cannot_be_null); + } + try + { + data.WrappedData.ProbabilityCollisionSecondaryStructure = (RoundedDouble)double.Parse(value); + } + catch (OverflowException) + { + throw new ArgumentException(RingtoetsCommonFormsResources.FailureProbability_Value_too_large); + } + catch (FormatException) + { + throw new ArgumentException(RingtoetsCommonFormsResources.FailureProbability_Could_not_parse_string_to_double_value); + } + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(bankWidthPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_BankWidth_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_BankWidth_Description")] + public NormalDistributionProperties BankWidth + { + get + { + return new NormalDistributionProperties(DistributionPropertiesReadOnly.None, data.WrappedData) + { + Data = data.WrappedData.BankWidth + }; + } + } + + [PropertyOrder(evaluationLevelPropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_EvaluationLevel_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_EvaluationLevel_Description")] + public RoundedDouble EvaluationLevel + { + get + { + return data.WrappedData.EvaluationLevel; + } + set + { + data.WrappedData.EvaluationLevel = value; + data.WrappedData.NotifyObservers(); + } + } + + [PropertyOrder(verticalDistancePropertyIndex)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_VerticalDistance_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_VerticalDistance_Description")] + public RoundedDouble VerticalDistance + { + get + { + return data.WrappedData.VerticalDistance; + } + set + { + data.WrappedData.VerticalDistance = value; + data.WrappedData.NotifyObservers(); + } + } + #endregion } } \ No newline at end of file