Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -175,11 +175,11 @@ - + UserControl - - HydraulicBoundaryLocationsView.cs + + HydraulicBoundaryCalculationsView.cs @@ -255,8 +255,8 @@ FailureMechanismResultView.cs Designer - - HydraulicBoundaryLocationsView.cs + + HydraulicBoundaryCalculationsView.cs Designer Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -0,0 +1,43 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Ringtoets.Common.Forms.Views +{ + partial class HydraulicBoundaryCalculationsView + { + /// + /// Required designer variable. + /// + protected System.ComponentModel.IContainer components = null; + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + } + + #endregion + } +} Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -0,0 +1,168 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Base; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.IllustrationPoints; +using Ringtoets.Common.Forms.GuiServices; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.Common.Forms.Views +{ + /// + /// Base view for views which should be derived in + /// order to get a consistent look and feel. + /// + public abstract partial class HydraulicBoundaryCalculationsView : CalculationsView + { + private readonly Observer calculationsObserver; + private readonly RecursiveObserver, HydraulicBoundaryLocationCalculation> calculationObserver; + + private readonly ObservableList calculations; + + /// + /// Creates a new instance of . + /// + /// The calculations to show in the view. + /// The assessment section which the calculations belong to. + /// Thrown when any input parameter is null. + protected HydraulicBoundaryCalculationsView(ObservableList calculations, + IAssessmentSection assessmentSection) + { + if (calculations == null) + { + throw new ArgumentNullException(nameof(calculations)); + } + + if (assessmentSection == null) + { + throw new ArgumentNullException(nameof(assessmentSection)); + } + + AssessmentSection = assessmentSection; + + calculationsObserver = new Observer(UpdateDataGridViewDataSource); + calculationObserver = new RecursiveObserver, HydraulicBoundaryLocationCalculation>(HandleHydraulicBoundaryLocationCalculationUpdate, list => list); + + this.calculations = calculations; + + calculationsObserver.Observable = calculations; + calculationObserver.Observable = calculations; + + UpdateDataGridViewDataSource(); + } + + public override object Data { get; set; } + + /// + /// Gets or sets the . + /// + public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; } + + protected override void Dispose(bool disposing) + { + calculationsObserver.Dispose(); + calculationObserver.Dispose(); + + base.Dispose(disposing); + } + + protected override void InitializeDataGridView() + { + base.InitializeDataGridView(); + + dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationRow.IncludeIllustrationPoints), + RingtoetsCommonFormsResources.HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName); + dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Name), + RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Name_DisplayName); + dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Id), + RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Id_DisplayName); + dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Location), + RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Coordinates_DisplayName); + } + + /// + /// Performs the selected . + /// + /// The calculations to perform. + protected abstract void PerformSelectedCalculations(IEnumerable calculations); + + protected override void CalculateForSelectedRows() + { + if (CalculationGuiService == null) + { + return; + } + + PerformSelectedCalculations(GetSelectedCalculatableObjects()); + } + + protected override void SetDataSource() + { + dataGridViewControl.SetDataSource(calculations?.Select(CreateNewRow).ToArray()); + } + + protected override IEnumerable GetIllustrationPointControlItems() + { + DataGridViewRow currentRow = dataGridViewControl.CurrentRow; + if (currentRow == null) + { + return Enumerable.Empty(); + } + + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject; + + HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = hydraulicBoundaryLocationCalculation.Output; + if (hydraulicBoundaryLocationCalculation.HasOutput + && hydraulicBoundaryLocationOutput.HasGeneralResult) + { + return hydraulicBoundaryLocationOutput.GeneralResult.TopLevelIllustrationPoints.Select( + topLevelSubMechanismIllustrationPoint => + { + SubMechanismIllustrationPoint subMechanismIllustrationPoint = + topLevelSubMechanismIllustrationPoint.SubMechanismIllustrationPoint; + return new IllustrationPointControlItem(topLevelSubMechanismIllustrationPoint, + topLevelSubMechanismIllustrationPoint.WindDirection.Name, + topLevelSubMechanismIllustrationPoint.ClosingSituation, + subMechanismIllustrationPoint.Stochasts, + subMechanismIllustrationPoint.Beta); + }).ToArray(); + } + + return Enumerable.Empty(); + } + + /// + /// Creates a new row that is added to the data table. + /// + /// The calculation for which to create a new row. + /// The newly created row. + private HydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocationCalculation calculation) + { + return new HydraulicBoundaryLocationRow(calculation); + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file Fisheye: Tag f56cb22e2e2535c8b05c1e8ac9703e8b53552995 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f56cb22e2e2535c8b05c1e8ac9703e8b53552995 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f56cb22e2e2535c8b05c1e8ac9703e8b53552995 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -138,7 +138,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -0,0 +1,288 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Base; +using Core.Common.Base.Geometry; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Data.TestUtil.IllustrationPoints; +using Ringtoets.Common.Forms.TestUtil; +using Ringtoets.Common.Forms.Views; + +namespace Ringtoets.Common.Forms.Test.Views +{ + [TestFixture] + public class HydraulicBoundaryCalculationsViewTest + { + private const int calculateColumnIndex = 0; + private const int includeIllustrationPointsColumnIndex = 1; + private const int locationNameColumnIndex = 2; + private const int locationIdColumnIndex = 3; + private const int locationColumnIndex = 4; + private Form testForm; + + [SetUp] + public void Setup() + { + testForm = new Form(); + } + + [TearDown] + public void TearDown() + { + testForm.Dispose(); + } + + [Test] + public void Constructor_CalculationsNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new TestHydraulicBoundaryCalculationsView(null, + new ObservableTestAssessmentSectionStub()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("calculations", exception.ParamName); + } + + [Test] + public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new TestHydraulicBoundaryCalculationsView(new ObservableList(), + null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("assessmentSection", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { + // Setup & Call + TestHydraulicBoundaryCalculationsView view = ShowFullyConfiguredTestHydraulicBoundaryLocationsView(); + + // Assert + Assert.IsInstanceOf>(view); + Assert.IsNull(view.Data); + } + + [Test] + public void Constructor_DataGridViewCorrectlyInitialized() + { + // Setup & Call + ShowTestHydraulicBoundaryLocationsView(); + + // Assert + DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + Assert.AreEqual(5, dataGridView.ColumnCount); + + var calculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[calculateColumnIndex]; + Assert.AreEqual("Berekenen", calculateColumn.HeaderText); + + var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex]; + Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText); + + var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex]; + Assert.AreEqual("Naam", locationNameColumn.HeaderText); + + var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex]; + Assert.AreEqual("ID", locationIdColumn.HeaderText); + + var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex]; + Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); + + var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); + Assert.IsFalse(button.Enabled); + } + + [Test] + public void HydraulicBoundaryLocationsView_AssessmentSectionWithData_DataGridViewCorrectlyInitialized() + { + // Setup & Call + ShowFullyConfiguredTestHydraulicBoundaryLocationsView(); + + // Assert + DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridViewRowCollection rows = dataGridView.Rows; + Assert.AreEqual(3, rows.Count); + + DataGridViewCellCollection cells = rows[0].Cells; + Assert.AreEqual(5, cells.Count); + Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue); + Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); + Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue); + Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue); + Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue); + + cells = rows[1].Cells; + Assert.AreEqual(5, cells.Count); + Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue); + Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); + Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue); + Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue); + Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue); + + cells = rows[2].Cells; + Assert.AreEqual(5, cells.Count); + Assert.AreEqual(false, cells[calculateColumnIndex].FormattedValue); + Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); + Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue); + Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue); + Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue); + } + + [Test] + public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException() + { + // Setup + ShowFullyConfiguredTestHydraulicBoundaryLocationsView(); + + DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridViewRowCollection rows = dataGridView.Rows; + rows[0].Cells[calculateColumnIndex].Value = true; + + var button = new ButtonTester("CalculateForSelectedButton", testForm); + + // Call + TestDelegate test = () => button.Click(); + + // Assert + Assert.DoesNotThrow(test); + } + + [Test] + public void GetIllustrationPointControlItems_ViewWithData_ReturnsExpectedControlItems() + { + // Setup + var topLevelIllustrationPoints = new[] + { + new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), + "Regular", + new TestSubMechanismIllustrationPoint()) + }; + + var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); + var output = new TestHydraulicBoundaryLocationOutput(generalResult); + + var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) + { + Output = output + }; + var calculations = new ObservableList + { + calculation + }; + + TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryLocationsView(calculations); + + // Call + IEnumerable actualControlItems = + view.PublicGetIllustrationPointControlItems(); + + // Assert + IEnumerable expectedControlItems = + CreateControlItems(generalResult); + CollectionAssert.AreEqual(expectedControlItems, actualControlItems, + new IllustrationPointControlItemComparer()); + } + + private static IEnumerable CreateControlItems( + GeneralResult generalResult) + { + return generalResult.TopLevelIllustrationPoints + .Select(topLevelIllustrationPoint => + { + SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint; + return new IllustrationPointControlItem(topLevelIllustrationPoint, + topLevelIllustrationPoint.WindDirection.Name, + topLevelIllustrationPoint.ClosingSituation, + illustrationPoint.Stochasts, + illustrationPoint.Beta); + }); + } + + private void ShowTestHydraulicBoundaryLocationsView() + { + ShowTestHydraulicBoundaryLocationsView(new ObservableList()); + } + + private TestHydraulicBoundaryCalculationsView ShowTestHydraulicBoundaryLocationsView(ObservableList calculations) + { + var view = new TestHydraulicBoundaryCalculationsView(calculations, new ObservableTestAssessmentSectionStub()); + + testForm.Controls.Add(view); + testForm.Show(); + + return view; + } + + private TestHydraulicBoundaryCalculationsView ShowFullyConfiguredTestHydraulicBoundaryLocationsView() + { + return ShowTestHydraulicBoundaryLocationsView(new ObservableList + { + new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), + new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) + { + Output = new TestHydraulicBoundaryLocationOutput(1.23) + }, + new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) + { + InputParameters = + { + ShouldIllustrationPointsBeCalculated = true + } + } + }); + } + + private sealed class TestHydraulicBoundaryCalculationsView : HydraulicBoundaryCalculationsView + { + public TestHydraulicBoundaryCalculationsView(ObservableList calculations, + IAssessmentSection assessmentSection) + : base(calculations, assessmentSection) {} + + public IEnumerable PublicGetIllustrationPointControlItems() + { + return GetIllustrationPointControlItems(); + } + + protected override void PerformSelectedCalculations(IEnumerable calculations) + { + throw new NotImplementedException(); + } + + protected override object CreateSelectedItemFromCurrentRow() + { + return null; + } + } + } +} \ No newline at end of file Fisheye: Tag f56cb22e2e2535c8b05c1e8ac9703e8b53552995 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs =================================================================== diff -u -r214f9fbafa2d876c75633dd945f27e2d68b478b1 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 214f9fbafa2d876c75633dd945f27e2d68b478b1) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -38,7 +38,7 @@ /// /// View for presenting and performing design water level calculations for the . /// - public class GrassCoverErosionOutwardsDesignWaterLevelLocationsView : HydraulicBoundaryLocationsView + public class GrassCoverErosionOutwardsDesignWaterLevelLocationsView : HydraulicBoundaryCalculationsView { private readonly GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider messageProvider; private readonly Observer failureMechanismObserver; Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs =================================================================== diff -u -r214f9fbafa2d876c75633dd945f27e2d68b478b1 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 214f9fbafa2d876c75633dd945f27e2d68b478b1) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -38,7 +38,7 @@ /// /// View for presenting and performing wave height calculations for the . /// - public class GrassCoverErosionOutwardsWaveHeightLocationsView : HydraulicBoundaryLocationsView + public class GrassCoverErosionOutwardsWaveHeightLocationsView : HydraulicBoundaryCalculationsView { private readonly GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider messageProvider; private readonly Observer failureMechanismObserver; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -90,7 +90,7 @@ () => 0.01)) { // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); Assert.IsNull(view.Data); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -90,7 +90,7 @@ () => 0.01)) { // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); Assert.IsNull(view.Data); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs =================================================================== diff -u -rac8210d13cf16c93f754711d885e8694fd116818 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision ac8210d13cf16c93f754711d885e8694fd116818) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -35,7 +35,7 @@ /// /// View for presenting and performing design water level calculations. /// - public partial class DesignWaterLevelLocationsView : HydraulicBoundaryLocationsView + public partial class DesignWaterLevelLocationsView : HydraulicBoundaryCalculationsView { private readonly Func getNormFunc; private readonly DesignWaterLevelCalculationMessageProvider messageProvider; Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.resx =================================================================== diff -u -r88b54c7a84796b81e00be068006a84450c782fae -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.resx (.../DesignWaterLevelLocationsView.resx) (revision 88b54c7a84796b81e00be068006a84450c782fae) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.resx (.../DesignWaterLevelLocationsView.resx) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -167,6 +167,6 @@ DesignWaterLevelLocationsView - Ringtoets.Integration.Forms.Views.HydraulicBoundaryLocationsView, Ringtoets.Integration.Forms, Culture=neutral, PublicKeyToken=null + Ringtoets.Integration.Forms.Views.HydraulicBoundaryCalculationsView, Ringtoets.Integration.Forms, Culture=neutral, PublicKeyToken=null \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs =================================================================== diff -u -rac8210d13cf16c93f754711d885e8694fd116818 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision ac8210d13cf16c93f754711d885e8694fd116818) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -35,7 +35,7 @@ /// /// View for presenting and performing wave height calculations. /// - public partial class WaveHeightLocationsView : HydraulicBoundaryLocationsView + public partial class WaveHeightLocationsView : HydraulicBoundaryCalculationsView { private readonly Func getNormFunc; private readonly WaveHeightCalculationMessageProvider messageProvider; Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx =================================================================== diff -u -r88b54c7a84796b81e00be068006a84450c782fae -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx (.../WaveHeightLocationsView.resx) (revision 88b54c7a84796b81e00be068006a84450c782fae) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.resx (.../WaveHeightLocationsView.resx) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -167,6 +167,6 @@ WaveHeightLocationsView - Ringtoets.Integration.Forms.Views.HydraulicBoundaryLocationsView, Ringtoets.Integration.Forms, Culture=neutral, PublicKeyToken=null + Ringtoets.Integration.Forms.Views.HydraulicBoundaryCalculationsView, Ringtoets.Integration.Forms, Culture=neutral, PublicKeyToken=null \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r5322d95053ca8f8c00105df52b97411924f602b4 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 5322d95053ca8f8c00105df52b97411924f602b4) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -1072,9 +1072,9 @@ #endregion - #region HydraulicBoundaryLocationsView ViewInfo + #region HydraulicBoundaryCalculationsView ViewInfo - private static bool CloseHydraulicBoundaryLocationsViewForData(HydraulicBoundaryLocationsView view, object dataToCloseFor) + private static bool CloseHydraulicBoundaryLocationsViewForData(HydraulicBoundaryCalculationsView view, object dataToCloseFor) { IAssessmentSection viewData = view.AssessmentSection; var assessmentSection = dataToCloseFor as IAssessmentSection; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -104,7 +104,7 @@ "Category")) { // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); Assert.IsNull(view.Data); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs =================================================================== diff -u -r8cf808db7be49f9a3c28ae9f9d5dbf283d26c284 -rf56cb22e2e2535c8b05c1e8ac9703e8b53552995 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 8cf808db7be49f9a3c28ae9f9d5dbf283d26c284) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision f56cb22e2e2535c8b05c1e8ac9703e8b53552995) @@ -104,7 +104,7 @@ "Category")) { // Assert - Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); Assert.IsNull(view.Data); } }