Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs (.../LognormalDistribution.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs (.../LognormalDistribution.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -39,7 +39,7 @@ { if (value <= 0) { - throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero); + throw new ArgumentException(Resources.StandardDeviation_Should_be_greater_then_zero); } standardDeviation = value; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -39,7 +39,7 @@ { if (value <= 0) { - throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero); + throw new ArgumentException(Resources.StandardDeviation_Should_be_greater_then_zero); } standardDeviation = value; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -81,9 +81,9 @@ /// /// Looks up a localized string similar to Standaard afwijking (σ) moet groter zijn dan 0.. /// - internal static string NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero { + internal static string StandardDeviation_Should_be_greater_then_zero { get { - return ResourceManager.GetString("NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero", resourceCulture); + return ResourceManager.GetString("StandardDeviation_Should_be_greater_then_zero", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -123,7 +123,7 @@ Geen lagen gevonden voor het profiel. - + Standaard afwijking (σ) moet groter zijn dan 0. \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6526eba0f59e1b68c79711dd6b59cf831ae45f2c -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6526eba0f59e1b68c79711dd6b59cf831ae45f2c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -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. @@ -135,6 +135,24 @@ } /// + /// Looks up a localized string similar to Lognormale verdeling. + /// + public static string LognormalDistribution_DisplayName { + get { + return ResourceManager.GetString("LognormalDistribution_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Normale verdeling. + /// + public static string NormalDistribution_DisplayName { + get { + return ResourceManager.GetString("NormalDistribution_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Piping. /// public static string PipingCalculationInputsProperties_DisplayName { @@ -887,6 +905,60 @@ } /// + /// Looks up a localized string similar to De gemiddelde waarde van de {0}.. + /// + public static string Probabilistics_Mean_description_for_Distribution_0_ { + get { + return ResourceManager.GetString("Probabilistics_Mean_description_for_Distribution_0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to μ. + /// + public static string Probabilistics_Mean_Symbol { + get { + return ResourceManager.GetString("Probabilistics_Mean_Symbol", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De verschuiving van de lognormale verdeling.. + /// + public static string Probabilistics_Shift_Description { + get { + return ResourceManager.GetString("Probabilistics_Shift_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verschuiving. + /// + public static string Probabilistics_Shift_Symbol { + get { + return ResourceManager.GetString("Probabilistics_Shift_Symbol", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De standaardafwijking van de {0}.. + /// + public static string Probabilistics_StandardDeviation_description_for_Distribution_0_ { + get { + return ResourceManager.GetString("Probabilistics_StandardDeviation_description_for_Distribution_0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to σ. + /// + public static string Probabilistics_StandardDeviation_Symbol { + get { + return ResourceManager.GetString("Probabilistics_StandardDeviation_Symbol", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Dwarsdoorsnede. /// public static string RingtoetsPipingSurfaceLine_DisplayName { @@ -932,6 +1004,15 @@ } /// + /// Looks up a localized string similar to Verschoven lognormale verdeling. + /// + public static string ShiftedLognormalDistribution_DisplayName { + get { + return ResourceManager.GetString("ShiftedLognormalDistribution_DisplayName", 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 -r6526eba0f59e1b68c79711dd6b59cf831ae45f2c -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6526eba0f59e1b68c79711dd6b59cf831ae45f2c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -430,4 +430,31 @@ ..\Resources\PlayHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Lognormale verdeling + + + μ + + + σ + + + De gemiddelde waarde van de {0}. + + + De standaardafwijking van de {0}. + + + Normale verdeling + + + Verschuiving + + + Verschoven lognormale verdeling + + + De verschuiving van de lognormale verdeling. + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionTypeConverter.cs =================================================================== diff -u -r1c0beecf8f66061bd2091f570db25198585c86d6 -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionTypeConverter.cs (.../LognormalDistributionTypeConverter.cs) (revision 1c0beecf8f66061bd2091f570db25198585c86d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionTypeConverter.cs (.../LognormalDistributionTypeConverter.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -1,6 +1,8 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using Ringtoets.Piping.Data.Probabilistics; +using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Forms.PropertyClasses; namespace Ringtoets.Piping.Forms.TypeConverters @@ -11,7 +13,7 @@ /// /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. - public class LognormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter + public sealed class LognormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter { private readonly ParameterDefinition[] parameters; @@ -20,15 +22,20 @@ /// public LognormalDistributionTypeConverter() { + var lowerCaseDistributionName = DistributionName.ToLower(); parameters = new[] { new ParameterDefinition(d => d.Mean) { - Symbol = "\u03BC", Description = "De gemiddelde waarde van de lognormale verdeling." + Symbol = Resources.Probabilistics_Mean_Symbol, + Description = String.Format(Resources.Probabilistics_Mean_description_for_Distribution_0_, + lowerCaseDistributionName) }, new ParameterDefinition(d => d.StandardDeviation) { - Symbol = "\u03C3", Description = "De standaardafwijking van de lognormale verdeling." + Symbol = Resources.Probabilistics_StandardDeviation_Symbol, + Description = String.Format(Resources.Probabilistics_StandardDeviation_description_for_Distribution_0_, + lowerCaseDistributionName) } }; } @@ -37,7 +44,7 @@ { get { - return "Lognormale verdeling"; + return Resources.LognormalDistribution_DisplayName; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionTypeConverter.cs =================================================================== diff -u -r1c0beecf8f66061bd2091f570db25198585c86d6 -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionTypeConverter.cs (.../NormalDistributionTypeConverter.cs) (revision 1c0beecf8f66061bd2091f570db25198585c86d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionTypeConverter.cs (.../NormalDistributionTypeConverter.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -1,6 +1,8 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using Ringtoets.Piping.Data.Probabilistics; +using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Forms.PropertyClasses; namespace Ringtoets.Piping.Forms.TypeConverters @@ -11,7 +13,7 @@ /// /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. - public class NormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter + public sealed class NormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter { private readonly ParameterDefinition[] parameters; @@ -20,15 +22,20 @@ /// public NormalDistributionTypeConverter() { + var lowerCaseDistributionName = DistributionName.ToLower(); parameters = new[] { new ParameterDefinition(d => d.Mean) { - Symbol = "\u03BC", Description = "De gemiddelde waarde van de normale verdeling." + Symbol = Resources.Probabilistics_Mean_Symbol, + Description = String.Format(Resources.Probabilistics_Mean_description_for_Distribution_0_, + lowerCaseDistributionName) }, new ParameterDefinition(d => d.StandardDeviation) { - Symbol = "\u03C3", Description = "De standaardafwijking van de normale verdeling." + Symbol = Resources.Probabilistics_StandardDeviation_Symbol, + Description = String.Format(Resources.Probabilistics_StandardDeviation_description_for_Distribution_0_, + lowerCaseDistributionName) } }; } @@ -37,7 +44,7 @@ { get { - return "Normale verdeling"; + return Resources.NormalDistribution_DisplayName; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ProbabilisticDistributionTypeConverter.cs =================================================================== diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ProbabilisticDistributionTypeConverter.cs (.../ProbabilisticDistributionTypeConverter.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ProbabilisticDistributionTypeConverter.cs (.../ProbabilisticDistributionTypeConverter.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -38,7 +38,7 @@ { IObservable observableParent = GetObservableOwnerOfDistribution(context); - var propertyDescriptorCollection = TypeDescriptor.GetProperties(value); + PropertyDescriptorCollection propertyDescriptorCollection = TypeDescriptor.GetProperties(value); var properties = new PropertyDescriptor[Parameters.Length]; for (int i = 0; i < Parameters.Length; i++) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionTypeConverter.cs =================================================================== diff -u -r1c0beecf8f66061bd2091f570db25198585c86d6 -r6068726f0aa9bd51834c05eecb34fb0d3ecaf27e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionTypeConverter.cs (.../ShiftedLognormalDistributionTypeConverter.cs) (revision 1c0beecf8f66061bd2091f570db25198585c86d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionTypeConverter.cs (.../ShiftedLognormalDistributionTypeConverter.cs) (revision 6068726f0aa9bd51834c05eecb34fb0d3ecaf27e) @@ -1,6 +1,8 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using Ringtoets.Piping.Data.Probabilistics; +using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Forms.PropertyClasses; namespace Ringtoets.Piping.Forms.TypeConverters @@ -11,7 +13,7 @@ /// /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. - public class ShiftedLognormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter + public sealed class ShiftedLognormalDistributionTypeConverter : ProbabilisticDistributionTypeConverter { private readonly ParameterDefinition[] parameters; @@ -20,19 +22,25 @@ /// public ShiftedLognormalDistributionTypeConverter() { + var lowerCaseDistributionName = DistributionName.ToLower(); parameters = new[] { new ParameterDefinition(d => d.Mean) { - Symbol = "\u03BC", Description = "De gemiddelde waarde van de verschoven lognormale verdeling." + Symbol = Resources.Probabilistics_Mean_Symbol, + Description = String.Format(Resources.Probabilistics_Mean_description_for_Distribution_0_, + lowerCaseDistributionName) }, new ParameterDefinition(d => d.StandardDeviation) { - Symbol = "\u03C3", Description = "De standaardafwijking van de verschoven lognormale verdeling." + Symbol = Resources.Probabilistics_StandardDeviation_Symbol, + Description = String.Format(Resources.Probabilistics_StandardDeviation_description_for_Distribution_0_, + lowerCaseDistributionName) }, new ParameterDefinition(d => d.Shift) { - Symbol = "Verschuiving", Description = "De verschuiving van de lognormale verdeling." + Symbol = Resources.Probabilistics_Shift_Symbol, + Description = Resources.Probabilistics_Shift_Description }, }; } @@ -41,7 +49,7 @@ { get { - return "Verschoven lognormale verdeling"; + return Resources.ShiftedLognormalDistribution_DisplayName; } }