Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs
===================================================================
diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -27,6 +27,7 @@
using Core.Common.Gui.Selection;
using Core.Common.Utils.Extensions;
using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Forms.GuiServices;
using Ringtoets.HydraRing.Data;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -71,6 +72,8 @@
///
public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; }
+ public abstract IAssessmentSection AssessmentSection { get; set; }
+
public virtual object Data
{
get
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs (.../WaveHeightLocationRow.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs (.../WaveHeightLocationRow.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -36,7 +36,7 @@
///
/// Creates a new instance of .
///
- /// The for this row.
+ /// The for this row.
/// Thrown when is null.
public WaveHeightLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) { }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs
===================================================================
diff -u -r1e9a35d13ae40069200f8b1e6c1aa91bb54ce086 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 1e9a35d13ae40069200f8b1e6c1aa91bb54ce086)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -438,6 +438,7 @@
}
public IEnumerable LocationsToCalculate { get; private set; }
+ public override IAssessmentSection AssessmentSection { get; set; }
public object CreateForSelection { get; set; }
protected override TestHydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocation location)
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -136,7 +136,7 @@
}
///
- /// Looks up a localized string similar to Golfhoogte bij doorsnede-eis [m+NAP].
+ /// Looks up a localized string similar to Golfhoogte bij doorsnede-eis [m].
///
public static string GrassCoverErosionOutwardsHydraulicBoundaryLocation_WaveHeight_DisplayName {
get {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -154,7 +154,7 @@
Berekende golfhoogte bij doorsnede-eis.
- Golfhoogte bij doorsnede-eis [m+NAP]
+ Golfhoogte bij doorsnede-eis [m]
De berekende waterstanden en golfhoogtes bij doorsnede-eis voor alle hydraulische randvoorwaarden locaties zijn verwijderd.
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -37,7 +37,7 @@
public GrassCoverErosionOutwardsDesignWaterLevelLocationsView()
{
- hydraulicBoundaryLocationsObserver = new Observer(UpdateDataGridViewDataSource);
+ hydraulicBoundaryLocationsObserver = new Observer(UpdateHydraulicBoundaryLocations);
}
public override object Data
@@ -48,8 +48,9 @@
}
set
{
- base.Data = value;
- hydraulicBoundaryLocationsObserver.Observable = value as IObservable;
+ var data = (IObservable) value;
+ base.Data = data;
+ hydraulicBoundaryLocationsObserver.Observable = data;
}
}
@@ -58,7 +59,7 @@
return new DesignWaterLevelLocationRow(location);
}
- public IAssessmentSection AssessmentSection { get; set; }
+ public override IAssessmentSection AssessmentSection { get; set; }
protected override void InitializeDataGridView()
{
@@ -91,5 +92,36 @@
((IObservable)Data).NotifyObservers();
}
}
+
+ private void UpdateHydraulicBoundaryLocations()
+ {
+ if (IsDataGridDataSourceChanged())
+ {
+ UpdateDataGridViewDataSource();
+ }
+ else
+ {
+ dataGridViewControl.RefreshDataGridView();
+ }
+ }
+
+ private bool IsDataGridDataSourceChanged()
+ {
+ var locations = (ObservableList) Data;
+ var count = dataGridViewControl.Rows.Count;
+ if (count != locations.Count)
+ {
+ return true;
+ }
+ for (int i = 0; i < count; i++)
+ {
+ var locationFromGrid = ((DesignWaterLevelLocationRow) dataGridViewControl.Rows[i].DataBoundItem).HydraulicBoundaryLocation;
+ if (!ReferenceEquals(locationFromGrid, locations[i]))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -33,7 +33,7 @@
{
///
/// View for the with
- ///
+ /// for the
public class GrassCoverErosionOutwardsWaveHeightLocationsView : HydraulicBoundaryLocationsView
{
private readonly Observer hydraulicBoundaryLocationObserver;
@@ -43,7 +43,7 @@
///
public GrassCoverErosionOutwardsWaveHeightLocationsView()
{
- hydraulicBoundaryLocationObserver = new Observer(UpdateDataGridViewDataSource);
+ hydraulicBoundaryLocationObserver = new Observer(UpdateHydraulicBoundaryLocations);
}
public override object Data
@@ -54,12 +54,13 @@
}
set
{
- base.Data = value;
- hydraulicBoundaryLocationObserver.Observable = value as IObservable;
+ var data = (IObservable) value;
+ base.Data = data;
+ hydraulicBoundaryLocationObserver.Observable = data;
}
}
- public IAssessmentSection AssessmentSection { get; set; }
+ public override IAssessmentSection AssessmentSection { get; set; }
protected override WaveHeightLocationRow CreateNewRow(HydraulicBoundaryLocation location)
{
@@ -69,9 +70,9 @@
protected override object CreateSelectedItemFromCurrentRow()
{
var currentRow = dataGridViewControl.CurrentRow;
-
+
return currentRow != null ?
- new GrassCoverErosionOutwardsWaveHeightLocationContext((ObservableList)Data,
+ new GrassCoverErosionOutwardsWaveHeightLocationContext((ObservableList) Data,
((WaveHeightLocationRow) currentRow.DataBoundItem).HydraulicBoundaryLocation) :
null;
}
@@ -91,21 +92,52 @@
if (successFullCalculation)
{
- ((IObservable)Data).NotifyObservers();
+ ((IObservable) Data).NotifyObservers();
}
}
protected override void InitializeDataGridView()
{
base.InitializeDataGridView();
dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName(row => row.WaveHeight),
- Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_DesignWaterLevel_DisplayName);
+ Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_WaveHeight_DisplayName);
}
protected override void Dispose(bool disposing)
{
hydraulicBoundaryLocationObserver.Dispose();
base.Dispose(disposing);
}
+
+ private void UpdateHydraulicBoundaryLocations()
+ {
+ if (IsDataGridDataSourceChanged())
+ {
+ UpdateDataGridViewDataSource();
+ }
+ else
+ {
+ dataGridViewControl.RefreshDataGridView();
+ }
+ }
+
+ private bool IsDataGridDataSourceChanged()
+ {
+ var locations = (ObservableList) Data;
+ var count = dataGridViewControl.Rows.Count;
+ if (count != locations.Count)
+ {
+ return true;
+ }
+ for (int i = 0; i < count; i++)
+ {
+ var locationFromGrid = ((WaveHeightLocationRow) dataGridViewControl.Rows[i].DataBoundItem).HydraulicBoundaryLocation;
+ if (!ReferenceEquals(locationFromGrid, locations[i]))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -91,6 +91,8 @@
yield return new PropertyInfo();
yield return new PropertyInfo();
+
+ yield return new PropertyInfo();
}
public override IEnumerable GetViewInfos()
@@ -126,7 +128,7 @@
IEnumerable,
GrassCoverErosionOutwardsWaveHeightLocationsView>
{
- GetViewName = (v, o) => RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_WaveHeight_DisplayName,
+ GetViewName = (v, o) => RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaveHeightLocationsContext_DisplayName,
GetViewData = context => context.WrappedData,
CloseForData = CloseGrassCoverErosionOutwardsLocationsViewForData,
Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
@@ -315,18 +317,48 @@
private static bool CloseGrassCoverErosionOutwardsLocationsViewForData(GrassCoverErosionOutwardsWaveHeightLocationsView view, object dataToCloseFor)
{
- var section = dataToCloseFor as IAssessmentSection;
- var failureMechanismContext = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanismContext;
+ return CloseHydraulicBoundaryLocationsViewForData(view.AssessmentSection, dataToCloseFor);
+ }
- var viewAssessmentSection = view.AssessmentSection;
- var closeForFailureMechanism = failureMechanismContext != null && ReferenceEquals(failureMechanismContext.Parent, viewAssessmentSection);
- var closeForSection = section != null && ReferenceEquals(section, viewAssessmentSection);
+ #endregion
- return closeForSection || closeForFailureMechanism;
+ #region: CloseDesignWaterLevelLocationsViewForData
+
+ private static bool CloseDesignWaterLevelLocationsViewForData(GrassCoverErosionOutwardsDesignWaterLevelLocationsView view, object dataToCloseFor)
+ {
+ return CloseHydraulicBoundaryLocationsViewForData(view.AssessmentSection, dataToCloseFor);
}
#endregion
+ private static bool CloseHydraulicBoundaryLocationsViewForData(IAssessmentSection viewAssessmentSection,
+ object dataToCloseFor)
+ {
+ GrassCoverErosionOutwardsFailureMechanism viewFailureMechanism = null;
+ if (viewAssessmentSection != null)
+ {
+ viewFailureMechanism = viewAssessmentSection.GetFailureMechanisms().OfType().Single();
+ }
+
+
+ var failureMechanismContext = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanismContext;
+ var assessmentSection = dataToCloseFor as IAssessmentSection;
+ var failureMechanism = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanism;
+
+ if (assessmentSection != null)
+ {
+ failureMechanism = ((IAssessmentSection)dataToCloseFor).GetFailureMechanisms().OfType().Single();
+ return failureMechanism != null && ReferenceEquals(failureMechanism, viewFailureMechanism);
+ }
+
+ if (failureMechanismContext != null)
+ {
+ failureMechanism = failureMechanismContext.Parent.GetFailureMechanisms().OfType().Single();
+
+ }
+ return failureMechanism != null && ReferenceEquals(failureMechanism, viewFailureMechanism);
+ }
+
#endregion
#region TreeNodeInfos
@@ -476,18 +508,6 @@
.Build();
}
- private bool CloseDesignWaterLevelLocationsViewForData(GrassCoverErosionOutwardsDesignWaterLevelLocationsView view, object dataToCloseFor)
- {
- var section = dataToCloseFor as IAssessmentSection;
- var failureMechanismContext = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanismContext;
-
- var viewAssessmentSection = view.AssessmentSection;
- var closeForFailureMechanism = failureMechanismContext != null && ReferenceEquals(failureMechanismContext.Parent, viewAssessmentSection);
- var closeForSection = section != null && ReferenceEquals(section, viewAssessmentSection);
-
- return closeForSection || closeForFailureMechanism;
- }
-
#endregion
#region GrassCoverErosionOutwardsWaveHeightLocationsContext TreeNodeInfo
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -r61a95ca656c72706f706099cfd00e9d57d7e45a1 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs) (revision 61a95ca656c72706f706099cfd00e9d57d7e45a1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -126,7 +126,7 @@
const string expectedNameDescription = "Naam van de hydraulische randvoorwaardenlocatie.";
const string expectedLocationDisplayName = "Coördinaten [m]";
const string expectedLocationDescription = "Coördinaten van de hydraulische randvoorwaardenlocatie.";
- const string expectedWaveHeightDisplayName = "Golfhoogte bij doorsnede-eis [m+NAP]";
+ const string expectedWaveHeightDisplayName = "Golfhoogte bij doorsnede-eis [m]";
const string expectedWaveHeightDescription = "Berekende golfhoogte bij doorsnede-eis.";
const string expectedConvergenceDisplayName = "Convergentie";
const string expectedConvergenceDescription = "Is convergentie bereikt in de berekening van de golfhoogte bij doorsnede-eis?";
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
@@ -110,7 +111,32 @@
Assert.IsFalse(button.Enabled);
}
+
[Test]
+ public void WaveHeightLocationsView_WithNonIObservableList_ThrowsInvalidCastException()
+ {
+ // Setup
+ var view = ShowDesignWaterLevelLocationsView();
+
+ List locations = new List();
+ locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
+ locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+ {
+ WaveHeight = (RoundedDouble)1.23
+ });
+ locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+ {
+ DesignWaterLevel = (RoundedDouble)2.45
+ });
+
+ // Call
+ TestDelegate action = () => view.Data = locations;
+
+ // Assert
+ Assert.Throws(action);
+ }
+
+ [Test]
public void DesignWaterLevelLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
{
// Setup & Call
@@ -155,6 +181,7 @@
// Precondition
var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+ var dataGridViewSource = dataGridView.DataSource;
var rows = dataGridView.Rows;
Assert.AreEqual(3, rows.Count);
@@ -178,6 +205,7 @@
Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
+ Assert.AreNotSame(dataGridViewSource, dataGridView.DataSource);
}
[Test]
@@ -216,6 +244,7 @@
GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
ObservableList locations = (ObservableList)view.Data;
var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+ var dataGridViewSource = dataGridView.DataSource;
var rows = dataGridView.Rows;
rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -260,6 +289,7 @@
Assert.AreEqual(1, calculatedLocations.Length);
HydraulicBoundaryLocation expectedLocation = locations.First();
Assert.AreEqual(expectedLocation, calculatedLocations.First());
+ Assert.AreSame(dataGridViewSource, dataGridView.DataSource);
mockRepository.VerifyAll();
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
@@ -102,11 +103,35 @@
Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
- const string expectedLocationWaveHeightHeaderText = "Waterstand bij doorsnede-eis [m+NAP]";
+ const string expectedLocationWaveHeightHeaderText = "Golfhoogte bij doorsnede-eis [m]";
Assert.AreEqual(expectedLocationWaveHeightHeaderText, locationWaveHeightColumn.HeaderText);
}
[Test]
+ public void WaveHeightLocationsView_WithNonIObservableList_ThrowsInvalidCastException()
+ {
+ // Setup
+ var view = ShowWaveHeightLocationsView();
+
+ List locations = new List();
+ locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
+ locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
+ {
+ WaveHeight = (RoundedDouble)1.23
+ });
+ locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
+ {
+ DesignWaterLevel = (RoundedDouble)2.45
+ });
+
+ // Call
+ TestDelegate action = () => view.Data = locations;
+
+ // Assert
+ Assert.Throws(action);
+ }
+
+ [Test]
public void WaveHeightLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized()
{
// Setup & Call
@@ -151,6 +176,7 @@
// Precondition
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+ var dataGridViewSource = dataGridView.DataSource;
var rows = dataGridView.Rows;
Assert.AreEqual(3, rows.Count);
@@ -174,6 +200,7 @@
Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
Assert.AreEqual(hydraulicBoundaryLocation.WaveHeight, cells[locationWaveHeightColumnIndex].Value);
+ Assert.AreNotSame(dataGridViewSource, dataGridView.DataSource);
}
[Test]
@@ -211,6 +238,7 @@
GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
ObservableList locations = (ObservableList) view.Data;
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+ var dataGridViewSource = dataGridView.DataSource;
var rows = dataGridView.Rows;
rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -254,6 +282,7 @@
Assert.AreEqual(1, calculatedLocations.Length);
HydraulicBoundaryLocation expectedLocation = locations.First();
Assert.AreEqual(expectedLocation, calculatedLocations.First());
+ Assert.AreSame(dataGridViewSource, dataGridView.DataSource);
mockRepository.VerifyAll();
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -116,7 +116,7 @@
PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
// Assert
- Assert.AreEqual(6, propertyInfos.Length);
+ Assert.AreEqual(7, propertyInfos.Length);
PropertyInfo grassCoverErosionOutwardsFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
@@ -159,6 +159,13 @@
typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties));
Assert.IsNull(grassCoverErosionDesignWaterLevelLocationContextProperties.AdditionalDataCheck);
Assert.IsNull(grassCoverErosionDesignWaterLevelLocationContextProperties.AfterCreate);
+
+ var grasCoverErosionWaveHeightWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
+ propertyInfos,
+ typeof(GrassCoverErosionOutwardsWaveHeightLocationContext),
+ typeof(GrassCoverErosionOutwardsWaveHeightLocationContextProperties));
+ Assert.IsNull(grasCoverErosionWaveHeightWaterLevelLocationContextProperties.AdditionalDataCheck);
+ Assert.IsNull(grasCoverErosionWaveHeightWaterLevelLocationContextProperties.AfterCreate);
}
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Plugin.Test.csproj) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -99,6 +99,10 @@
{4D840673-3812-4338-A352-84854E32B8A0}
Ringtoets.Common.Forms
+
+ {90DE728E-48EF-4665-AB38-3D88E41D9F4D}
+ Ringtoets.GrassCoverErosionInwards.Data
+
{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}
Ringtoets.HydraRing.Data
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -94,6 +94,10 @@
// Setup
var mocks = new MockRepository();
var assessmentSection = mocks.Stub();
+ assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
mocks.ReplayAll();
using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView())
@@ -118,6 +122,17 @@
var mocks = new MockRepository();
var assessmentSectionA = mocks.Stub();
var assessmentSectionB = mocks.Stub();
+
+ assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+
+ assessmentSectionB.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+
mocks.ReplayAll();
using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView())
@@ -141,10 +156,14 @@
// Setup
var mocks = new MockRepository();
var assessmentSection = mocks.Stub();
+ assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
mocks.ReplayAll();
var grassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
- new GrassCoverErosionOutwardsFailureMechanism(),
+ new GrassCoverErosionOutwardsFailureMechanism(),
assessmentSection);
using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView())
@@ -169,6 +188,16 @@
var mocks = new MockRepository();
var assessmentSectionA = mocks.Stub();
var assessmentSectionB = mocks.Stub();
+
+ assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+
+ assessmentSectionB.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
mocks.ReplayAll();
var grassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs) (revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -25,12 +25,12 @@
using Core.Common.Gui;
using Core.Common.Gui.Forms.MainWindow;
using Core.Common.Gui.Plugin;
-using Core.Common.Gui.TestUtil;
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Forms.GuiServices;
+using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
@@ -54,7 +54,7 @@
Assert.AreEqual(typeof(IEnumerable), info.ViewDataType);
Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightLocationsView), info.ViewType);
TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, info.Image);
- Assert.AreEqual(Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_WaveHeight_DisplayName, info.GetViewName(null, null));
+ Assert.AreEqual(Resources.GrassCoverErosionOutwardsWaveHeightLocationsContext_DisplayName, info.GetViewName(null, null));
}
}
@@ -88,6 +88,176 @@
mockRepository.VerifyAll();
}
+
+ [Test]
+ public void CloseViewForData_ForMatchingAssessmentSection_ReturnsTrue()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+ mocks.ReplayAll();
+
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+ view.AssessmentSection = assessmentSection;
+
+ // Call
+ var closeForData = info.CloseForData(view, assessmentSection);
+
+ // Assert
+ Assert.IsTrue(closeForData);
+ }
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void CloseViewForData_ForNonMatchingAssessmentSection_ReturnsFalse()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSectionA = mocks.Stub();
+ var assessmentSectionB = mocks.Stub();
+
+ assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+
+ assessmentSectionB.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+ mocks.ReplayAll();
+
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+ view.AssessmentSection = assessmentSectionA;
+
+ // Call
+ var closeForData = info.CloseForData(view, assessmentSectionB);
+
+ // Assert
+ Assert.IsFalse(closeForData);
+ }
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void CloseViewForData_ForMatchingFailureMechanismContext_ReturnsTrue()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+ mocks.ReplayAll();
+
+ var grassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
+ new GrassCoverErosionOutwardsFailureMechanism(),
+ assessmentSection);
+
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+ view.AssessmentSection = assessmentSection;
+
+ // Call
+ var closeForData = info.CloseForData(view, grassCoverErosionOutwardsFailureMechanismContext);
+
+ // Assert
+ Assert.IsTrue(closeForData);
+ }
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void CloseViewForData_ForNonMatchingFailureMechanismContext_ReturnsFalse()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSectionA = mocks.Stub();
+ var assessmentSectionB = mocks.Stub();
+
+ assessmentSectionA.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+ assessmentSectionB.Stub(a => a.GetFailureMechanisms()).Return(new[]
+ {
+ new GrassCoverErosionOutwardsFailureMechanism()
+ });
+ mocks.ReplayAll();
+
+ var grassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
+ new GrassCoverErosionOutwardsFailureMechanism(),
+ assessmentSectionB);
+
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+ view.AssessmentSection = assessmentSectionA;
+
+ // Call
+ var closeForData = info.CloseForData(view, grassCoverErosionOutwardsFailureMechanismContext);
+
+ // Assert
+ Assert.IsFalse(closeForData);
+ }
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void CloseViewForData_ForOtherObjectType_ReturnsFalse()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSectionA = mocks.Stub();
+ mocks.ReplayAll();
+
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+ view.Data = assessmentSectionA;
+
+ // Call
+ var closeForData = info.CloseForData(view, new object());
+
+ // Assert
+ Assert.IsFalse(closeForData);
+ }
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void CloseViewForData_ViewDataNull_ReturnsFalse()
+ {
+ // Setup
+ using (var view = new GrassCoverErosionOutwardsWaveHeightLocationsView())
+ using (var plugin = new GrassCoverErosionOutwardsPlugin())
+ {
+ var info = GetInfo(plugin);
+
+ // Call
+ var closeForData = info.CloseForData(view, new object());
+
+ // Assert
+ Assert.IsFalse(closeForData);
+ }
+ }
+
private ViewInfo GetInfo(PluginBase plugin)
{
return plugin.GetViewInfos().FirstOrDefault(vi => vi.ViewType == typeof(GrassCoverErosionOutwardsWaveHeightLocationsView));
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs
===================================================================
diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -r2e1466c5ff960c69484f4e4bac08f7b3a3b17493
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 2e1466c5ff960c69484f4e4bac08f7b3a3b17493)
@@ -36,6 +36,7 @@
private const string overtoppingStart = "Submechanism = Overtopping RTO";
private const string overflowStart = "Submechanism = Overflow";
private const string combineWindDirectionStart = "Status = Combined over wind directions";
+ private const string governingWindDirectionStart = "Governing wind direction";
private const string overtoppingWaveHeight = "Wave height (Hs)";
private const string windDirection = "Wind direction";
private const string closingSituation = "Closing situation";
@@ -44,7 +45,7 @@
private readonly List overtoppingResults;
private readonly List overflowResults;
- private int governingWindDirection;
+ private int governingWindDirection = -1;
///
/// Creates a new instance of .
@@ -108,7 +109,7 @@
string currentLine = file.ReadLine();
TryParseOvertoppingSection(currentLine, file);
TryParseOverflowSection(currentLine, file);
- TryParseGoverningWindDirection(currentLine, file);
+ TryParseCombinationWindDirectionSection(currentLine, file);
}
}
}
@@ -147,11 +148,22 @@
}
}
- private void TryParseGoverningWindDirection(string startLine, StreamReader file)
+ private void TryParseCombinationWindDirectionSection(string startLine, StreamReader file)
{
if (startLine.Contains(combineWindDirectionStart))
{
- string line = file.ReadLine();
+ while (!file.EndOfStream &&