Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r296f8749c44298b42ad22170e0b2e0b935b394bd -r820cebfd76a4993992451b6cdd5697f2510acfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 296f8749c44298b42ad22170e0b2e0b935b394bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 820cebfd76a4993992451b6cdd5697f2510acfc9) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -761,6 +761,34 @@ } /// + /// Looks up a localized string similar to Bijdrage. + /// + public static string PipingCalculationsView_InitializeDataGridView_Contribution { + get { + return ResourceManager.GetString("PipingCalculationsView_InitializeDataGridView_Contribution", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to In eindbeoordeling. + /// + public static string PipingCalculationsView_InitializeDataGridView_In_final_rating { + get { + return ResourceManager.GetString("PipingCalculationsView_InitializeDataGridView_In_final_rating", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bijdrage ondergrond profiel. + /// + public static string PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability { + get { + return ResourceManager.GetString("PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability" + + "", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} mag niet 'null' zijn.. /// public static string PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r296f8749c44298b42ad22170e0b2e0b935b394bd -r820cebfd76a4993992451b6cdd5697f2510acfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 296f8749c44298b42ad22170e0b2e0b935b394bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 820cebfd76a4993992451b6cdd5697f2510acfc9) @@ -733,4 +733,13 @@ Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen. + + In eindbeoordeling + + + Bijdrage + + + Bijdrage ondergrond profiel + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -r820cebfd76a4993992451b6cdd5697f2510acfc9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision c7c07db38829afdc5965c331844e1d39123944ff) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 820cebfd76a4993992451b6cdd5697f2510acfc9) @@ -173,14 +173,14 @@ var relevantColumn = new DataGridViewCheckBoxColumn { DataPropertyName = "IsRelevant", - HeaderText = "In eindbeoordeling", + HeaderText = Resources.PipingCalculationsView_InitializeDataGridView_In_final_rating, Name = "column_IsRelevant" }; var contributionColumn = new DataGridViewTextBoxColumn { DataPropertyName = "Contribution", - HeaderText = "Bijdrage", + HeaderText = Resources.PipingCalculationsView_InitializeDataGridView_Contribution, Name = "column_Contribution" }; @@ -209,6 +209,13 @@ DisplayMember = "DisplayName" }; + var stochasticSoilProfileProbabilityColumn = new DataGridViewTextBoxColumn + { + DataPropertyName = "StochasticSoilProfileProbability", + HeaderText = Resources.PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability, + Name = "column_SoilProfileProbability", + }; + hydraulicBoundaryLocationColumn = new DataGridViewComboBoxColumn { DataPropertyName = "HydraulicBoundaryLocation", @@ -257,6 +264,7 @@ nameColumn, stochasticSoilModelColumn, stochasticSoilProfileColumn, + stochasticSoilProfileProbabilityColumn, hydraulicBoundaryLocationColumn, dampingFactorExitMeanColumn, phreaticLevelExitMeanColumn, @@ -633,6 +641,14 @@ } } + public double StochasticSoilProfileProbability + { + get + { + return pipingCalculation.InputParameters.StochasticSoilProfile != null ? pipingCalculation.InputParameters.StochasticSoilProfile.Probability : 0; + } + } + public DataGridViewComboBoxItemWrapper HydraulicBoundaryLocation { get Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -r820cebfd76a4993992451b6cdd5697f2510acfc9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision c7c07db38829afdc5965c331844e1d39123944ff) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 820cebfd76a4993992451b6cdd5697f2510acfc9) @@ -89,7 +89,7 @@ // Assert Assert.IsFalse(dataGridView.AutoGenerateColumns); - Assert.AreEqual(10, dataGridView.ColumnCount); + Assert.AreEqual(11, dataGridView.ColumnCount); foreach (var column in dataGridView.Columns.OfType()) { @@ -308,7 +308,7 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(10, cells.Count); + Assert.AreEqual(11, cells.Count); Assert.IsTrue((bool) cells[isRelevantColumnIndex].FormattedValue); Assert.AreEqual(0.ToString(CultureInfo.CurrentCulture), cells[contributionColumnIndex].FormattedValue); Assert.AreEqual("Calculation 1", cells[nameColumnIndex].FormattedValue); @@ -321,7 +321,7 @@ Assert.AreEqual(4.44.ToString(CultureInfo.CurrentCulture), cells[exitPointLColumnIndex].FormattedValue); cells = rows[1].Cells; - Assert.AreEqual(10, cells.Count); + Assert.AreEqual(11, cells.Count); Assert.IsTrue((bool)cells[isRelevantColumnIndex].FormattedValue); Assert.AreEqual(0.ToString(CultureInfo.CurrentCulture), cells[contributionColumnIndex].FormattedValue); Assert.AreEqual("Calculation 2", cells[nameColumnIndex].FormattedValue); @@ -774,11 +774,12 @@ private const int nameColumnIndex = 2; private const int stochasticSoilModelsColumnIndex = 3; private const int stochasticSoilProfilesColumnIndex = 4; - private const int hydraulicBoundaryLocationsColumnIndex = 5; - private const int dampingFactorExitMeanColumnIndex = 6; - private const int phreaticLevelExitMeanColumnIndex = 7; - private const int entryPointLColumnIndex = 8; - private const int exitPointLColumnIndex = 9; + private const int stochasticSoilProfilesProbabilityColumnIndex = 5; + private const int hydraulicBoundaryLocationsColumnIndex = 6; + private const int dampingFactorExitMeanColumnIndex = 7; + private const int phreaticLevelExitMeanColumnIndex = 8; + private const int entryPointLColumnIndex = 9; + private const int exitPointLColumnIndex = 10; private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView() { Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -rc7c07db38829afdc5965c331844e1d39123944ff -r820cebfd76a4993992451b6cdd5697f2510acfc9 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision c7c07db38829afdc5965c331844e1d39123944ff) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 820cebfd76a4993992451b6cdd5697f2510acfc9) @@ -107,11 +107,11 @@ private const int nameColumnIndex = 2; private const int stochasticSoilModelsColumnIndex = 3; private const int stochasticSoilProfilesColumnIndex = 4; - private const int hydraulicBoundaryLocationsColumnIndex = 5; - private const int dampingFactorExitMeanColumnIndex = 6; - private const int phreaticLevelExitMeanColumnIndex = 7; - private const int entryPointLColumnIndex = 8; - private const int exitPointLColumnIndex = 9; + private const int hydraulicBoundaryLocationsColumnIndex = 6; + private const int dampingFactorExitMeanColumnIndex = 7; + private const int phreaticLevelExitMeanColumnIndex = 8; + private const int entryPointLColumnIndex = 9; + private const int exitPointLColumnIndex = 10; private void ImportReferenceLine(AssessmentSection assessmentSection) {