Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -raeb1cd4411d0b141176963c03d05bab56df2b794 -rabed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision aeb1cd4411d0b141176963c03d05bab56df2b794)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision abed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1)
@@ -336,6 +336,16 @@
}
///
+ /// Looks up a localized string similar to dempingsfactor bij uitredepunt
+ ///[-].
+ ///
+ public static string PipingCalculationsView_DampingFactorExit_DisplayName {
+ get {
+ return ResourceManager.GetString("PipingCalculationsView_DampingFactorExit_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Bijdrage aan
///scenario
///[%].
@@ -356,7 +366,9 @@
}
///
- /// Looks up a localized string similar to Aandeel van schematisatie in het stochastische ondergrondmodel [%].
+ /// Looks up a localized string similar to Aandeel van schematisatie
+ ///in het stochastische ondergrondmodel
+ ///[%].
///
public static string PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability {
get {
@@ -366,6 +378,16 @@
}
///
+ /// Looks up a localized string similar to polderpeil
+ ///[m+NAP].
+ ///
+ public static string PipingCalculationsView_PhreaticLevelExit_DisplayName {
+ get {
+ return ResourceManager.GetString("PipingCalculationsView_PhreaticLevelExit_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Dempingsfactor relateert respons van stijghoogte bij binnenteen aan buitenwaterstand..
///
public static string PipingInput_DampingFactorExit_Description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -raeb1cd4411d0b141176963c03d05bab56df2b794 -rabed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision aeb1cd4411d0b141176963c03d05bab56df2b794)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision abed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1)
@@ -394,7 +394,9 @@
[%]
- Aandeel van schematisatie in het stochastische ondergrondmodel [%]
+ Aandeel van schematisatie
+in het stochastische ondergrondmodel
+[%]
Kans op
@@ -505,4 +507,12 @@
De locatie van het bestand waaruit de profielschematisaties zijn geïmporteerd.
+
+ dempingsfactor bij uitredepunt
+[-]
+
+
+ polderpeil
+[m+NAP]
+
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r3860db11c483c9bd2de58f9795a57b3a85ab5be6 -rabed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 3860db11c483c9bd2de58f9795a57b3a85ab5be6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision abed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1)
@@ -231,19 +231,13 @@
nameof(DataGridViewComboBoxItemWrapper.This),
nameof(DataGridViewComboBoxItemWrapper.DisplayName));
- string dampingFactorExitHeader = Resources.PipingInput_DampingFactorExit_DisplayName;
- dampingFactorExitHeader = char.ToLowerInvariant(dampingFactorExitHeader[0]) + dampingFactorExitHeader.Substring(1);
-
dataGridViewControl.AddTextBoxColumn(
nameof(PipingCalculationRow.DampingFactorExitMean),
- $"{Resources.Probabilistics_Mean_Symbol} {dampingFactorExitHeader}");
+ $"{Resources.Probabilistics_Mean_Symbol}\r\n{Resources.PipingCalculationsView_DampingFactorExit_DisplayName}");
- string phreaticLevelExitHeader = Resources.PipingInput_PhreaticLevelExit_DisplayName;
- phreaticLevelExitHeader = char.ToLowerInvariant(phreaticLevelExitHeader[0]) + phreaticLevelExitHeader.Substring(1);
-
dataGridViewControl.AddTextBoxColumn(
nameof(PipingCalculationRow.PhreaticLevelExitMean),
- $"{Resources.Probabilistics_Mean_Symbol} {phreaticLevelExitHeader}");
+ $"{Resources.Probabilistics_Mean_Symbol}\r\n{Resources.PipingCalculationsView_PhreaticLevelExit_DisplayName}");
dataGridViewControl.AddTextBoxColumn(
nameof(PipingCalculationRow.EntryPointL),
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r83fcbece167de3f930a274a6b0c26dafef7ec771 -rabed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision abed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using System.Globalization;
using System.Linq;
using System.Threading;
@@ -107,6 +108,39 @@
}
[Test]
+ public void Constructor_DataGridViewControlColumnHeadersCorrectlyInitialized_()
+ {
+ // Setup
+ using (ShowPipingCalculationsView())
+ {
+ // Call
+ var dataGridViewControl = (DataGridViewControl)new ControlTester("dataGridViewControl").TheObject;
+
+ // Assert
+ DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
+ Assert.AreEqual("Naam", nameColumn.HeaderText);
+ DataGridViewColumn stochasticSoilModelsColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilModelsColumnIndex);
+ Assert.AreEqual("Stochastisch ondergrondmodel", stochasticSoilModelsColumn.HeaderText);
+ DataGridViewColumn stochasticSoilProfilesColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesColumnIndex);
+ Assert.AreEqual("Ondergrondschematisatie", stochasticSoilProfilesColumn.HeaderText);
+ DataGridViewColumn stochasticSoilProfilesProbabilityColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesProbabilityColumnIndex);
+ Assert.AreEqual("Aandeel van schematisatie\r\nin het stochastische ondergrondmodel\r\n[%]", stochasticSoilProfilesProbabilityColumn.HeaderText);
+ DataGridViewColumn hydraulicBoundaryLocationColumn = dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationsColumnIndex);
+ Assert.AreEqual("Hydraulische belastingenlocatie", hydraulicBoundaryLocationColumn.HeaderText);
+ DataGridViewColumn dampingFactorExitMeanColumn = dataGridViewControl.GetColumnFromIndex(dampingFactorExitMeanColumnIndex);
+ Assert.AreEqual("Verwachtingswaarde\r\ndempingsfactor bij uitredepunt\r\n[-]", dampingFactorExitMeanColumn.HeaderText);
+ DataGridViewColumn phreaticLevelExitMeanColumn = dataGridViewControl.GetColumnFromIndex(phreaticLevelExitMeanColumnIndex);
+ Assert.AreEqual("Verwachtingswaarde\r\npolderpeil\r\n[m+NAP]", phreaticLevelExitMeanColumn.HeaderText);
+ DataGridViewColumn entryPointLColumn = dataGridViewControl.GetColumnFromIndex(entryPointLColumnIndex);
+ Assert.AreEqual("Intredepunt", entryPointLColumn.HeaderText);
+ DataGridViewColumn exitPointLColumn = dataGridViewControl.GetColumnFromIndex(exitPointLColumnIndex);
+ Assert.AreEqual("Uittredepunt", exitPointLColumn.HeaderText);
+
+ Assert.Throws(() => dataGridViewControl.GetColumnFromIndex(exitPointLColumnIndex + 1));
+ }
+ }
+
+ [Test]
public void Constructor_ListBoxCorrectlyInitialized()
{
// Call