Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r98b397912e4e949b1f518a8a830d8a35ac464968 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98b397912e4e949b1f518a8a830d8a35ac464968) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingData.cs =================================================================== diff -u -r7c544bdc0a35c6f193d1e786b8c001e9977c50d1 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingData.cs (.../PipingData.cs) (revision 7c544bdc0a35c6f193d1e786b8c001e9977c50d1) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingData.cs (.../PipingData.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -29,7 +29,7 @@ MeanDiameter70 = 2.08e-4; BeddingAngle = 37.0; SellmeijerReductionFactor = 0.3; - CriticalHeaveGradient = 0.5; + CriticalHeaveGradient = 0.3; PhreaticLevelExit = new NormalDistribution(); DampingFactorExit = new LognormalDistribution { Mean = 1.0 }; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r1efcd2277f5a38d44a78e4a9286eec35134fe8dd -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1efcd2277f5a38d44a78e4a9286eec35134fe8dd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -189,6 +189,15 @@ } /// + /// Looks up a localized string similar to Lognormaal. + /// + public static string LognormalDistribution_ShortName { + get { + return ResourceManager.GetString("LognormalDistribution_ShortName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Normale verdeling. /// public static string NormalDistribution_DisplayName { @@ -198,6 +207,15 @@ } /// + /// Looks up a localized string similar to Normaal. + /// + public static string NormalDistribution_ShortName { + get { + return ResourceManager.GetString("NormalDistribution_ShortName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Piping. /// public static string PipingCalculationInputsProperties_DisplayName { @@ -1087,6 +1105,15 @@ } /// + /// Looks up a localized string similar to Verschoven lognormaal. + /// + public static string ShiftedLognormalDistribution_ShortName { + get { + return ResourceManager.GetString("ShiftedLognormalDistribution_ShortName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Valideren. /// public static string Validate { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r1efcd2277f5a38d44a78e4a9286eec35134fe8dd -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1efcd2277f5a38d44a78e4a9286eec35134fe8dd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -481,4 +481,13 @@ Wis de uitvoer van alle berekeningen binnen het faalmechanisme. + + Lognormaal + + + Normaal + + + Verschoven lognormaal + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs =================================================================== diff -u -r394db7c1bd905eb7444b9b2c47bcb5111bb63af6 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision 394db7c1bd905eb7444b9b2c47bcb5111bb63af6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -47,7 +47,7 @@ properties[0] = new SimpleReadonlyPropertyDescriptorItem(Resources.DesignVariableTypeConverter_DestributionType_DisplayName, Resources.DesignVariableTypeConverter_DistributionType_Description, "DistributionType", - DistributionName); + DistributionShortName); for (int i = 0; i < Parameters.Length; i++) { properties[i+1] = CreatePropertyDescriptor(propertyDescriptorCollection, Parameters[i], observableParent); @@ -61,11 +61,16 @@ } /// - /// Gets the name of the distribution. + /// Gets the full name of the distribution. /// protected abstract string DistributionName { get; } /// + /// Gets the short name of the distribution. + /// + protected abstract string DistributionShortName { get; } + + /// /// Gets all parameters available for the given distribution. /// protected abstract ParameterDefinition[] Parameters { get; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r5076e379f409c3b5ba41eb98256e3dd5d140571c -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs (.../LognormalDistributionDesignVariableTypeConverter.cs) (revision 5076e379f409c3b5ba41eb98256e3dd5d140571c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs (.../LognormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -48,6 +48,14 @@ } } + protected override string DistributionShortName + { + get + { + return Resources.LognormalDistribution_ShortName; + } + } + protected override ParameterDefinition[] Parameters { get Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r5076e379f409c3b5ba41eb98256e3dd5d140571c -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs (.../NormalDistributionDesignVariableTypeConverter.cs) (revision 5076e379f409c3b5ba41eb98256e3dd5d140571c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs (.../NormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -48,6 +48,14 @@ } } + protected override string DistributionShortName + { + get + { + return Resources.NormalDistribution_ShortName; + } + } + protected override ParameterDefinition[] Parameters { get Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r5076e379f409c3b5ba41eb98256e3dd5d140571c -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs (.../ShiftedLognormalDistributionDesignVariableTypeConverter.cs) (revision 5076e379f409c3b5ba41eb98256e3dd5d140571c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs (.../ShiftedLognormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -53,6 +53,14 @@ } } + protected override string DistributionShortName + { + get + { + return Resources.ShiftedLognormalDistribution_ShortName; + } + } + protected override ParameterDefinition[] Parameters { get Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingDataTest.cs =================================================================== diff -u -r394db7c1bd905eb7444b9b2c47bcb5111bb63af6 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingDataTest.cs (.../PipingDataTest.cs) (revision 394db7c1bd905eb7444b9b2c47bcb5111bb63af6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingDataTest.cs (.../PipingDataTest.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -60,7 +60,7 @@ Assert.AreEqual(1.0, defaultConstructed.UpliftModelFactor); Assert.AreEqual(1, defaultConstructed.SellmeijerModelFactor); - Assert.AreEqual(0.5, defaultConstructed.CriticalHeaveGradient); + Assert.AreEqual(0.3, defaultConstructed.CriticalHeaveGradient); Assert.AreEqual(0.3, defaultConstructed.SellmeijerReductionFactor); Assert.AreEqual(9.81, defaultConstructed.Gravity); Assert.AreEqual(1.33e-6, defaultConstructed.WaterKinematicViscosity); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r394db7c1bd905eb7444b9b2c47bcb5111bb63af6 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision 394db7c1bd905eb7444b9b2c47bcb5111bb63af6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -96,7 +96,7 @@ Assert.AreEqual("Type verdeling", distributionTypePropertyDescriptor.DisplayName); Assert.AreEqual("De soort kansverdeling waarin deze parameter in gedefiniëerd wordt.", distributionTypePropertyDescriptor.Description); Assert.AreEqual("DistributionType", distributionTypePropertyDescriptor.Name); - Assert.AreEqual("Lognormale verdeling", distributionTypePropertyDescriptor.GetValue(new object())); + Assert.AreEqual("Lognormaal", distributionTypePropertyDescriptor.GetValue(new object())); var meanPropertyDescriptor = properties[1]; Assert.AreEqual(distribution.GetType(), meanPropertyDescriptor.ComponentType); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r394db7c1bd905eb7444b9b2c47bcb5111bb63af6 -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 394db7c1bd905eb7444b9b2c47bcb5111bb63af6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) @@ -95,7 +95,7 @@ Assert.AreEqual("Type verdeling", distributionTypePropertyDescriptor.DisplayName); Assert.AreEqual("De soort kansverdeling waarin deze parameter in gedefiniëerd wordt.", distributionTypePropertyDescriptor.Description); Assert.AreEqual("DistributionType", distributionTypePropertyDescriptor.Name); - Assert.AreEqual("Normale verdeling", distributionTypePropertyDescriptor.GetValue(new object())); + Assert.AreEqual("Normaal", distributionTypePropertyDescriptor.GetValue(new object())); var meanPropertyDescriptor = properties[1]; Assert.AreEqual(distribution.GetType(), meanPropertyDescriptor.ComponentType);