Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs
===================================================================
diff -u -rfb7d1c7fd44684526a1a9ab6ec9b0b6f0e18fe73 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision fb7d1c7fd44684526a1a9ab6ec9b0b6f0e18fe73)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -71,6 +71,7 @@
Style = GetRevetmentBoundaryStyle()
};
}
+
///
/// Create with default styling for revetment.
///
@@ -104,9 +105,38 @@
: RingtoetsCommonFormsResources.Foreshore_DisplayName;
}
+ ///
+ /// Create with default styling for lower boundary water levels.
+ ///
+ /// The created .
+ public static ChartLineData CreateLowerWaterLevelsBoundaryChartdata()
+ {
+ return new ChartLineData(Resources.WaveConditionsChartDataFactory_LowerBoundaryWaterLevels_DisplayName)
+ {
+ Style = GetWaterLevelBoundaryStyle()
+ };
+ }
+
+ ///
+ /// Create with default styling for upper boundary water levels.
+ ///
+ /// The created .
+ public static ChartLineData CreateUpperWaterLevelsBoundaryChartdata()
+ {
+ return new ChartLineData(Resources.WaveConditionsChartDataFactory_UpperBoundaryWaterLevelsDisplayName)
+ {
+ Style = GetWaterLevelBoundaryStyle()
+ };
+ }
+
private static ChartLineStyle GetRevetmentBoundaryStyle()
{
return new ChartLineStyle(Color.Gray, 2, DashStyle.Solid);
}
+
+ private static ChartLineStyle GetWaterLevelBoundaryStyle()
+ {
+ return new ChartLineStyle(Color.Blue, 2, DashStyle.Solid);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r58b9c20cc8547f70a680045776e917b33422cd95 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 58b9c20cc8547f70a680045776e917b33422cd95)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -163,6 +163,15 @@
}
///
+ /// Looks up a localized string similar to Ondergrens waterstanden.
+ ///
+ public static string WaveConditionsChartDataFactory_LowerBoundaryWaterLevels_DisplayName {
+ get {
+ return ResourceManager.GetString("WaveConditionsChartDataFactory_LowerBoundaryWaterLevels_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Bekleding.
///
public static string WaveConditionsChartDataFactory_Revetment_DisplayName {
@@ -181,6 +190,15 @@
}
///
+ /// Looks up a localized string similar to Bovengrens waterstanden.
+ ///
+ public static string WaveConditionsChartDataFactory_UpperBoundaryWaterLevelsDisplayName {
+ get {
+ return ResourceManager.GetString("WaveConditionsChartDataFactory_UpperBoundaryWaterLevelsDisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Ondergrens van de bekleding..
///
public static string WaveConditionsInput_LowerBoundaryRevetment_Description {
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx
===================================================================
diff -u -r58b9c20cc8547f70a680045776e917b33422cd95 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 58b9c20cc8547f70a680045776e917b33422cd95)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -258,4 +258,10 @@
Bekleding
+
+ Ondergrens waterstanden
+
+
+ Bovengrens waterstanden
+
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs
===================================================================
diff -u -r39359f299a246ff0e9e41ef17dbbdb0168dc79d8 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 39359f299a246ff0e9e41ef17dbbdb0168dc79d8)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -46,6 +46,9 @@
private readonly ChartLineData revetmentChartData;
private readonly ChartLineData revetmentBaseChartData;
+ private readonly ChartLineData lowerBoundaryWaterLevelsChartData;
+ private readonly ChartLineData upperBoundaryWaterLevelsChartData;
+
private IWaveConditionsCalculation data;
///
@@ -65,11 +68,16 @@
revetmentChartData = WaveConditionsChartDataFactory.CreateRevetmentChartData();
revetmentBaseChartData = WaveConditionsChartDataFactory.CreateRevetmentBaseChartData();
+ lowerBoundaryWaterLevelsChartData = WaveConditionsChartDataFactory.CreateLowerWaterLevelsBoundaryChartdata();
+ upperBoundaryWaterLevelsChartData = WaveConditionsChartDataFactory.CreateUpperWaterLevelsBoundaryChartdata();
+
chartDataCollection.Add(foreshoreChartData);
chartDataCollection.Add(lowerBoundaryRevetmentChartData);
chartDataCollection.Add(upperBoundaryRevetmentChartData);
chartDataCollection.Add(revetmentChartData);
chartDataCollection.Add(revetmentBaseChartData);
+ chartDataCollection.Add(lowerBoundaryWaterLevelsChartData);
+ chartDataCollection.Add(upperBoundaryWaterLevelsChartData);
}
public object Data
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs
===================================================================
diff -u -rfb7d1c7fd44684526a1a9ab6ec9b0b6f0e18fe73 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision fb7d1c7fd44684526a1a9ab6ec9b0b6f0e18fe73)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -82,6 +82,28 @@
}
[Test]
+ public void CreateLowerWaterLevelBoundaryChartData_ReturnsEmptyChartLineDataWithDefaultStyling()
+ {
+ // Call
+ ChartLineData data = WaveConditionsChartDataFactory.CreateLowerWaterLevelsBoundaryChartdata();
+ // Assert
+ Assert.IsEmpty(data.Points);
+ Assert.AreEqual("Ondergrens waterstanden", data.Name);
+ AssertEqualStyle(data.Style, Color.Blue, 2, DashStyle.Solid);
+ }
+
+ [Test]
+ public void CreateUpperWaterLevelBoundaryChartData_ReturnsEmptyChartLineDataWithDefaultStyling()
+ {
+ // Call
+ ChartLineData data = WaveConditionsChartDataFactory.CreateUpperWaterLevelsBoundaryChartdata();
+ // Assert
+ Assert.IsEmpty(data.Points);
+ Assert.AreEqual("Bovengrens waterstanden", data.Name);
+ AssertEqualStyle(data.Style, Color.Blue, 2, DashStyle.Solid);
+ }
+
+ [Test]
public void UpdateForeshoreGeometryChartDataName_InputNull_NameSetToDefaultName()
{
// Setup
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
===================================================================
diff -u -r39359f299a246ff0e9e41ef17dbbdb0168dc79d8 -r2a00fd15de1fcdd317234f2f490fe298905979a4
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 39359f299a246ff0e9e41ef17dbbdb0168dc79d8)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 2a00fd15de1fcdd317234f2f490fe298905979a4)
@@ -44,6 +44,8 @@
private const int upperBoundaryRevetmentChartDataIndex = 2;
private const int revetmentChartDataIndex = 3;
private const int revetmentBaseChartDataIndex = 4;
+ private const int lowerBoundaryWaterLevelsChartDataIndex = 5;
+ private const int upperBoundaryWaterLevelsChartDataIndex = 6;
[Test]
public void Constructor_ExpectedValues()
@@ -119,7 +121,7 @@
})
{
// Precondition
- Assert.AreEqual(5, view.Chart.Data.Collection.Count());
+ Assert.AreEqual(7, view.Chart.Data.Collection.Count());
Assert.AreEqual("Nieuwe berekening", view.Chart.ChartTitle);
// Call
@@ -168,7 +170,9 @@
new Point2D(2.0, 2.0)
}),
LowerBoundaryRevetment = (RoundedDouble) 5,
- UpperBoundaryRevetment = (RoundedDouble) 8
+ UpperBoundaryRevetment = (RoundedDouble) 8,
+ LowerBoundaryWaterLevels = (RoundedDouble) 3,
+ UpperBoundaryWaterLevels = (RoundedDouble) 9
}
};
@@ -181,7 +185,8 @@
ChartDataCollection chartData = view.Chart.Data;
Assert.IsInstanceOf(chartData);
- Assert.AreEqual(5, chartData.Collection.Count());
+ Assert.AreEqual(7, chartData.Collection.Count());
+
AssertForeshoreChartData(calculation.InputParameters.ForeshoreProfile, chartData.Collection.ElementAt(foreShoreChartDataIndex));
AssertRevetmentChartData(calculation.InputParameters.ForeshoreGeometry.Last(),
calculation.InputParameters.LowerBoundaryRevetment,
@@ -378,25 +383,31 @@
List chartDatasList = chartDataCollection.Collection.ToList();
- Assert.AreEqual(5, chartDatasList.Count);
+ Assert.AreEqual(7, chartDatasList.Count);
var foreshoreData = (ChartLineData) chartDatasList[foreShoreChartDataIndex];
var lowerBoundaryRevetmentData = (ChartLineData) chartDatasList[lowerBoundaryRevetmentChartDataIndex];
var upperBoundaryRevetmentData = (ChartLineData) chartDatasList[upperBoundaryRevetmentChartDataIndex];
var revetmentData = (ChartLineData) chartDatasList[revetmentChartDataIndex];
var revetmentBaseData = (ChartLineData) chartDatasList[revetmentBaseChartDataIndex];
+ var lowerBoundaryWaterLevelsData = (ChartLineData) chartDatasList[lowerBoundaryWaterLevelsChartDataIndex];
+ var upperBoundaryWaterLevelsData = (ChartLineData) chartDatasList[upperBoundaryWaterLevelsChartDataIndex];
CollectionAssert.IsEmpty(foreshoreData.Points);
CollectionAssert.IsEmpty(lowerBoundaryRevetmentData.Points);
CollectionAssert.IsEmpty(upperBoundaryRevetmentData.Points);
CollectionAssert.IsEmpty(revetmentData.Points);
CollectionAssert.IsEmpty(revetmentBaseData.Points);
+ CollectionAssert.IsEmpty(lowerBoundaryWaterLevelsData.Points);
+ CollectionAssert.IsEmpty(upperBoundaryWaterLevelsData.Points);
Assert.AreEqual("Voorlandprofiel", foreshoreData.Name);
Assert.AreEqual("Ondergrens bekleding", lowerBoundaryRevetmentData.Name);
Assert.AreEqual("Bovengrens bekleding", upperBoundaryRevetmentData.Name);
Assert.AreEqual("Bekleding", revetmentData.Name);
Assert.AreEqual("Bekleding", revetmentBaseData.Name);
+ Assert.AreEqual("Ondergrens waterstanden", lowerBoundaryWaterLevelsData.Name);
+ Assert.AreEqual("Bovengrens waterstanden", upperBoundaryWaterLevelsData.Name);
}
private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile, ChartData chartData)
@@ -472,7 +483,7 @@
ChartData chartData)
{
Assert.IsInstanceOf(chartData);
- var revetmentChartData = (ChartLineData)chartData;
+ var revetmentChartData = (ChartLineData) chartData;
var expectedGeometry = new[]
{