Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r1b4f4720632f9a691837fa97e777a4637b6739c8 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1b4f4720632f9a691837fa97e777a4637b6739c8) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -161,6 +161,15 @@ } /// + /// Looks up a localized string similar to 1/{0:n0}. + /// + public static string ProbabilityPerYearFormat { + get { + return ResourceManager.GetString("ProbabilityPerYearFormat", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Project. /// public static string Project_Constructor_Default_name { Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r1b4f4720632f9a691837fa97e777a4637b6739c8 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 1b4f4720632f9a691837fa97e777a4637b6739c8) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -168,4 +168,7 @@ Vector moet 2 dimensies hebben, maar heeft er {0}. + + 1/{0:n0} + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r53688e428536c55b263900febc397ae8676f9cc3 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 53688e428536c55b263900febc397ae8676f9cc3) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -597,7 +597,7 @@ } /// - /// Looks up a localized string similar to Faalkansruimte [jaar]. + /// Looks up a localized string similar to Faalkansruimte [1/jaar]. /// public static string FailureMechanismContributionView_GridColumn_ProbabilitySpace { get { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r53688e428536c55b263900febc397ae8676f9cc3 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 53688e428536c55b263900febc397ae8676f9cc3) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -581,7 +581,7 @@ ..\Resources\OptionsHS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Faalkansruimte [jaar] + Faalkansruimte [1/jaar] Toegestane bijdrage aan faalkans [%] Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs =================================================================== diff -u -rb57739d9a5fbeef38a55020b0839d444d39cdbf7 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision b57739d9a5fbeef38a55020b0839d444d39cdbf7) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -258,9 +258,12 @@ HeaderText = CommonGuiResources.FailureMechanismContributionView_GridColumn_ProbabilitySpace, Name = string.Format(columnNameFormat, probabilitySpaceName), AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill, - MinimumWidth = 100 + MinimumWidth = 100, + DefaultCellStyle = + { + Format = "1/#,#" + } }; - probabilityDistributionGrid.AutoGenerateColumns = false; probabilityDistributionGrid.Columns.AddRange(assessmentColumn, probabilityColumn, probabilityPerYearColumn); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs =================================================================== diff -u -rb57739d9a5fbeef38a55020b0839d444d39cdbf7 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision b57739d9a5fbeef38a55020b0839d444d39cdbf7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -272,6 +272,7 @@ DataGridViewRow zeroContributionFailureMechanismRow = dataGridView.Rows[0]; DataGridViewCell probabilitySpaceCell = zeroContributionFailureMechanismRow.Cells[2]; + Assert.AreEqual("1/#,#" , probabilitySpaceCell.InheritedStyle.Format); string expectedTextValue = new FailureMechanismContributionItem(failureMechanismStub, norm) .ProbabilitySpace.ToString(probabilitySpaceCell.InheritedStyle.Format, probabilitySpaceCell.InheritedStyle.FormatProvider); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1259,7 +1259,7 @@ } /// - /// Looks up a localized string similar to Kans van voorkomen [jaar]. + /// Looks up a localized string similar to Kans van voorkomen [1/jaar]. /// public static string PipingSemiProbabilisticOutput_HeaveProbability_DisplayName { get { @@ -1313,7 +1313,7 @@ } /// - /// Looks up a localized string similar to Faalkans [jaar]. + /// Looks up a localized string similar to Faalkans [1/jaar]. /// public static string PipingSemiProbabilisticOutput_PipingProbability_DisplayName { get { @@ -1349,7 +1349,7 @@ } /// - /// Looks up a localized string similar to Faalkanseis [jaar]. + /// Looks up a localized string similar to Faalkanseis [1/jaar]. /// public static string PipingSemiProbabilisticOutput_RequiredProbability_DisplayName { get { @@ -1403,7 +1403,7 @@ } /// - /// Looks up a localized string similar to Kans van voorkomen [jaar]. + /// Looks up a localized string similar to Kans van voorkomen [1/jaar]. /// public static string PipingSemiProbabilisticOutput_SellmeijerProbability_DisplayName { get { @@ -1457,7 +1457,7 @@ } /// - /// Looks up a localized string similar to Kans van voorkomen [jaar]. + /// Looks up a localized string similar to Kans van voorkomen [1/jaar]. /// public static string PipingSemiProbabilisticOutput_UpliftProbability_DisplayName { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -593,7 +593,7 @@ De kans dat het faalmechanisme heave optreedt. - Kans van voorkomen [jaar] + Kans van voorkomen [1/jaar] De betrouwbaarheidsindex van het heave faalmechanisme. @@ -605,7 +605,7 @@ De kans dat het faalmechanisme piping optreedt. - Faalkans [jaar] + Faalkans [1/jaar] De betrouwbaarheidsindex van het piping faalmechanisme. @@ -617,7 +617,7 @@ De maximaal toegestane kans dat het faalmechanisme piping optreedt. - Faalkanseis [jaar] + Faalkanseis [1/jaar] De maximaal toegestane betrouwbaarheidsindex voor het faalmechanisme piping. @@ -629,7 +629,7 @@ De kans dat het faalmechanisme Sellmeijer optreedt. - Kans van voorkomen [jaar] + Kans van voorkomen [1/jaar] De betrouwbaarheidsindex van het Sellmeijer faalmechanisme. @@ -641,7 +641,7 @@ De kans dat het faalmechanisme opbarsten optreedt. - Kans van voorkomen [jaar] + Kans van voorkomen [1/jaar] De betrouwbaarheidsindex van het opbarsten faalmechanisme. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs =================================================================== diff -u -r23ecc584602719f982f2206ad49a329fbf5dc028 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs (.../PipingSemiProbabilisticOutputProperties.cs) (revision 23ecc584602719f982f2206ad49a329fbf5dc028) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs (.../PipingSemiProbabilisticOutputProperties.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -4,6 +4,7 @@ using Core.Common.Utils.Attributes; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.Properties; +using CoreCommonResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Piping.Forms.PropertyClasses { @@ -37,11 +38,11 @@ [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftProbability_Description")] [PropertyOrder(3)] - public RoundedDouble UpliftProbability + public string UpliftProbability { get { - return data.UpliftProbability; + return ToProbabilityFormat(data.UpliftProbability); } } @@ -73,11 +74,11 @@ [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_HeaveProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_HeaveProbability_Description")] [PropertyOrder(13)] - public RoundedDouble HeaveProbability + public string HeaveProbability { get { - return data.HeaveProbability; + return ToProbabilityFormat(data.HeaveProbability); } } @@ -109,23 +110,23 @@ [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_SellmeijerProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_SellmeijerProbability_Description")] [PropertyOrder(23)] - public RoundedDouble SellmeijerProbability + public string SellmeijerProbability { get { - return data.SellmeijerProbability; + return ToProbabilityFormat(data.SellmeijerProbability); } } [ResourcesCategory(typeof(Resources), "PipingSemiProbabilisticOutput_Categories_Piping")] [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_RequiredProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_RequiredProbability_Description")] [PropertyOrder(31)] - public RoundedDouble RequiredProbability + public string RequiredProbability { get { - return data.RequiredProbability; + return ToProbabilityFormat(data.RequiredProbability); } } @@ -145,11 +146,11 @@ [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_PipingProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_PipingProbability_Description")] [PropertyOrder(33)] - public RoundedDouble PipingProbability + public string PipingProbability { get { - return data.PipingProbability; + return ToProbabilityFormat(data.PipingProbability); } } @@ -176,5 +177,10 @@ return data.PipingFactorOfSafety; } } + + private static string ToProbabilityFormat(RoundedDouble requiredProbability) + { + return string.Format(CoreCommonResources.ProbabilityPerYearFormat, requiredProbability.Value); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs =================================================================== diff -u -r3721b5bb1ae327907884a90d1a9bd300042e0540 -rd5326f028bd3c83dc0479606ea1e2e1ead914e29 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision 3721b5bb1ae327907884a90d1a9bd300042e0540) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision d5326f028bd3c83dc0479606ea1e2e1ead914e29) @@ -64,18 +64,19 @@ }; // Call & Assert + var probabilityFormat = "1/{0:n0}"; Assert.AreEqual(upliftFactorOfSafety, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy()); Assert.AreEqual(upliftReliability, properties.UpliftReliability, properties.UpliftReliability.GetAccuracy()); - Assert.AreEqual(upliftProbability, properties.UpliftProbability, properties.UpliftProbability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, upliftProbability), properties.UpliftProbability, properties.UpliftProbability); Assert.AreEqual(heaveFactorOfSafety, properties.HeaveFactorOfSafety, properties.HeaveFactorOfSafety.GetAccuracy()); Assert.AreEqual(heaveReliability, properties.HeaveReliability, properties.HeaveReliability.GetAccuracy()); - Assert.AreEqual(heaveProbability, properties.HeaveProbability, properties.HeaveProbability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, heaveProbability), properties.HeaveProbability, properties.HeaveProbability); Assert.AreEqual(sellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety.GetAccuracy()); Assert.AreEqual(sellmeijerReliability, properties.SellmeijerReliability, properties.SellmeijerReliability.GetAccuracy()); - Assert.AreEqual(sellmeijerProbability, properties.SellmeijerProbability, properties.SellmeijerProbability.GetAccuracy()); - Assert.AreEqual(requiredProbability, properties.RequiredProbability, properties.RequiredProbability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, sellmeijerProbability), properties.SellmeijerProbability, properties.SellmeijerProbability); + Assert.AreEqual(string.Format(probabilityFormat, requiredProbability), properties.RequiredProbability, properties.RequiredProbability); Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); - Assert.AreEqual(pipingProbability, properties.PipingProbability, properties.PipingProbability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, pipingProbability), properties.PipingProbability, properties.PipingProbability); Assert.AreEqual(pipingReliability, properties.PipingReliability, properties.PipingReliability.GetAccuracy()); Assert.AreEqual(pipingFactorOfSafety, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy()); }