Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rbdfc832a125e7fac88579677e784a29a7ca1340b -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bdfc832a125e7fac88579677e784a29a7ca1340b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -2578,9 +2578,9 @@ /// /// Looks up a localized string similar to -. /// - public static string RoundedRouble_No_result_dash { + public static string RoundedDouble_No_result_dash { get { - return ResourceManager.GetString("RoundedRouble_No_result_dash", resourceCulture); + return ResourceManager.GetString("RoundedDouble_No_result_dash", resourceCulture); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rbdfc832a125e7fac88579677e784a29a7ca1340b -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision bdfc832a125e7fac88579677e784a29a7ca1340b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -247,7 +247,7 @@ Alle berekeningen voor dit vak moeten een geldige uitkomst hebben. - + - Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs =================================================================== diff -u -r68428832c744c0a4a55a51fd81d4e96001060b54 -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs (.../NoProbabilityValueDoubleConverter.cs) (revision 68428832c744c0a4a55a51fd81d4e96001060b54) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoProbabilityValueDoubleConverter.cs (.../NoProbabilityValueDoubleConverter.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -45,19 +45,22 @@ { if (double.IsNaN(doubleValue)) { - return Resources.RoundedRouble_No_result_dash; + return Resources.RoundedDouble_No_result_dash; } + if (double.IsNegativeInfinity(doubleValue)) { return CommonBaseResources.RoundedDouble_ToString_NegativeInfinity; } + if (double.IsPositiveInfinity(doubleValue)) { return CommonBaseResources.RoundedDouble_ToString_PositiveInfinity; } return ProbabilityFormattingHelper.Format(doubleValue); } + return base.ConvertTo(context, culture, value, destinationType); } @@ -66,7 +69,7 @@ var text = value as string; if (text != null) { - if (string.IsNullOrWhiteSpace(text) || text.Trim() == Resources.RoundedRouble_No_result_dash) + if (string.IsNullOrWhiteSpace(text) || text.Trim() == Resources.RoundedDouble_No_result_dash) { return double.NaN; } @@ -77,6 +80,7 @@ { return Convert.ToDouble(text); } + string returnPeriodValue = text.Substring(2).ToLower(); return returnPeriodValue != CommonBaseResources.RoundedDouble_ToString_PositiveInfinity.ToLower() ? 1 / Convert.ToDouble(returnPeriodValue) @@ -93,6 +97,7 @@ exception); } } + return base.ConvertFrom(context, culture, value); } @@ -102,6 +107,7 @@ { return true; } + return base.CanConvertFrom(context, sourceType); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoValueRoundedDoubleConverter.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoValueRoundedDoubleConverter.cs (.../NoValueRoundedDoubleConverter.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TypeConverters/NoValueRoundedDoubleConverter.cs (.../NoValueRoundedDoubleConverter.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -40,11 +40,12 @@ var text = value as string; if (text != null) { - if (string.IsNullOrWhiteSpace(text) || text.Trim() == Resources.RoundedRouble_No_result_dash) + if (string.IsNullOrWhiteSpace(text) || text.Trim() == Resources.RoundedDouble_No_result_dash) { return RoundedDouble.NaN; } } + return base.ConvertFrom(context, culture, value); } @@ -55,9 +56,10 @@ { if (double.IsNaN(roundedDoubleValue)) { - return Resources.RoundedRouble_No_result_dash; + return Resources.RoundedDouble_No_result_dash; } } + return base.ConvertTo(context, culture, value, destinationType); } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs =================================================================== diff -u -r7cb99c5ef5ce489899fcc4b987fce48d98acb6f1 -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs (.../MacroStabilityInwardsScenarioRow.cs) (revision 7cb99c5ef5ce489899fcc4b987fce48d98acb6f1) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenarioRow.cs (.../MacroStabilityInwardsScenarioRow.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -129,7 +129,7 @@ get { return derivedOutput == null - ? RingtoetsCommonFormsResources.RoundedRouble_No_result_dash + ? RingtoetsCommonFormsResources.RoundedDouble_No_result_dash : ProbabilityFormattingHelper.Format(derivedOutput.MacroStabilityInwardsProbability); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs =================================================================== diff -u -r7cb99c5ef5ce489899fcc4b987fce48d98acb6f1 -ra875e5fb4cd5e183164fc0bc9aa5376e7f40d71d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision 7cb99c5ef5ce489899fcc4b987fce48d98acb6f1) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision a875e5fb4cd5e183164fc0bc9aa5376e7f40d71d) @@ -128,7 +128,7 @@ get { return derivedOutput == null - ? RingtoetsCommonFormsResources.RoundedRouble_No_result_dash + ? RingtoetsCommonFormsResources.RoundedDouble_No_result_dash : ProbabilityFormattingHelper.Format(derivedOutput.PipingProbability); } } @@ -142,7 +142,7 @@ get { return derivedOutput == null - ? RingtoetsCommonFormsResources.RoundedRouble_No_result_dash + ? RingtoetsCommonFormsResources.RoundedDouble_No_result_dash : ProbabilityFormattingHelper.Format(derivedOutput.UpliftProbability); } } @@ -156,7 +156,7 @@ get { return derivedOutput == null - ? RingtoetsCommonFormsResources.RoundedRouble_No_result_dash + ? RingtoetsCommonFormsResources.RoundedDouble_No_result_dash : ProbabilityFormattingHelper.Format(derivedOutput.HeaveProbability); } } @@ -170,7 +170,7 @@ get { return derivedOutput == null - ? RingtoetsCommonFormsResources.RoundedRouble_No_result_dash + ? RingtoetsCommonFormsResources.RoundedDouble_No_result_dash : ProbabilityFormattingHelper.Format(derivedOutput.SellmeijerProbability); } }