Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs
===================================================================
diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -40,7 +40,7 @@
/// Creates a new instance of .
///
/// The to wrap.
- /// Thrown when any input parameter is null.
+ /// Thrown when is null.
public DuneLocationCalculationRow(DuneLocationCalculation duneLocationCalculation)
: base(duneLocationCalculation) {}
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs
===================================================================
diff -u -rf727dddbab1341efc114b1f0fe590bd683fc2356 -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision f727dddbab1341efc114b1f0fe590bd683fc2356)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using Core.Common.Base;
@@ -38,23 +37,23 @@
///
public partial class DuneLocationCalculationsView : DuneLocationCalculationsViewBase
{
- private readonly Observer duneLocationsObserver;
private readonly Observer failureMechanismObserver;
+ private readonly Observer duneLocationCalculationsObserver;
private readonly IObservableEnumerable calculations;
private readonly Func getNormFunc;
- private readonly RecursiveObserver, DuneLocationCalculation> duneLocationObserver;
+ private readonly RecursiveObserver, DuneLocationCalculation> duneLocationCalculationObserver;
///
/// Creates a new instance of .
///
- /// The calculations to show in the view
+ /// The calculations to show in the view.
/// The failure mechanism which the calculations belong to.
/// The assessment section which the calculations belong to.
/// for getting the norm to use during calculations.
/// Thrown when any parameter is null.
public DuneLocationCalculationsView(IObservableEnumerable calculations,
DuneErosionFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection,
+ IAssessmentSection assessmentSection,
Func getNormFunc)
{
if (calculations == null)
@@ -84,11 +83,11 @@
FailureMechanism = failureMechanism;
AssessmentSection = assessmentSection;
- duneLocationsObserver = new Observer(UpdateDataGridViewDataSource)
+ duneLocationCalculationsObserver = new Observer(UpdateDataGridViewDataSource)
{
Observable = calculations
};
- duneLocationObserver = new RecursiveObserver, DuneLocationCalculation>(dataGridViewControl.RefreshDataGridView, list => list)
+ duneLocationCalculationObserver = new RecursiveObserver, DuneLocationCalculation>(dataGridViewControl.RefreshDataGridView, list => list)
{
Observable = calculations
};
@@ -109,7 +108,7 @@
///
/// Gets the for which the
- /// locations are shown.
+ /// calculations are shown.
///
public DuneErosionFailureMechanism FailureMechanism { get; }
@@ -121,8 +120,8 @@
protected override void Dispose(bool disposing)
{
- duneLocationsObserver.Dispose();
- duneLocationObserver.Dispose();
+ duneLocationCalculationsObserver.Dispose();
+ duneLocationCalculationObserver.Dispose();
failureMechanismObserver.Dispose();
base.Dispose(disposing);
@@ -166,8 +165,10 @@
{
if (CalculationGuiService != null)
{
- IEnumerable selectedCalculations = GetSelectedCalculatableObjects();
- HandleCalculateSelectedLocations(selectedCalculations);
+ CalculationGuiService.Calculate(GetSelectedCalculatableObjects(),
+ AssessmentSection.HydraulicBoundaryDatabase.FilePath,
+ AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
+ getNormFunc());
}
}
@@ -180,13 +181,5 @@
return base.ValidateCalculatableObjects();
}
-
- private void HandleCalculateSelectedLocations(IEnumerable calculations)
- {
- CalculationGuiService.Calculate(calculations,
- AssessmentSection.HydraulicBoundaryDatabase.FilePath,
- AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
- getNormFunc());
- }
}
}
\ No newline at end of file
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs
===================================================================
diff -u -r60e31a4d64f102398b83b082294299d0ce44a4a8 -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs (.../DuneLocationCalculationsViewBase.cs) (revision 60e31a4d64f102398b83b082294299d0ce44a4a8)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationCalculationsViewBase.cs (.../DuneLocationCalculationsViewBase.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -31,7 +31,7 @@
namespace Ringtoets.DuneErosion.Forms.Views
{
///
- /// Base view for selecting calculatable calculations and starting calculation for said objects.
+ /// Base view for selecting dune location calculations and starting a calculation for said objects.
///
public abstract partial class DuneLocationCalculationsViewBase : UserControl, ISelectionProvider, IView
{
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -128,11 +128,11 @@
GetViewName = (view, context) => context.WrappedData.Name,
Image = RingtoetsCommonFormsResources.CalculationIcon,
CloseForData = CloseFailureMechanismViewForData,
- CreateInstance = (context) => new DuneErosionFailureMechanismView(context.WrappedData, context.Parent),
+ CreateInstance = context => new DuneErosionFailureMechanismView(context.WrappedData, context.Parent),
AdditionalDataCheck = context => context.WrappedData.IsRelevant
};
- yield return new ViewInfo, DuneLocationCalculationsView>
+ yield return new ViewInfo, DuneLocationCalculationsView>
{
GetViewName = (view, context) => $"{RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName} - {context.CategoryBoundaryName}",
Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs
===================================================================
diff -u -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -38,7 +38,7 @@
[Test]
[TestCase(34.1)]
[TestCase(34.0)]
- public void Constructor_WithOutput_ExpectedValues(double offSet)
+ public void Constructor_DuneLocationCalculationWithOutput_ExpectedValues(double offSet)
{
// Setup
var duneLocation = new DuneLocation(1, "test location", new Point2D(3.3, 4.4), new DuneLocation.ConstructionProperties
@@ -82,7 +82,7 @@
}
[Test]
- public void Constructor_WithoutOutput_ExpectedValues()
+ public void Constructor_DuneLocationCalculationWithoutOutput_ExpectedValues()
{
// Setup
var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -rce71b2d9a32bdfdf511ebfa82d5d26d2af0fdc6b -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision ce71b2d9a32bdfdf511ebfa82d5d26d2af0fdc6b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -50,7 +50,7 @@
[TestFixture]
public class DuneLocationCalculationsViewTest
{
- private const int locationCalculateColumnIndex = 0;
+ private const int calculateColumnIndex = 0;
private const int waterLevelColumnIndex = 6;
private const int waveHeightColumnIndex = 7;
private const int wavePeriodColumnIndex = 8;
@@ -281,7 +281,7 @@
}
[Test]
- public void Selection_WithSelectedCalculation_ReturnsSelectedCalculationWrappedInContext()
+ public void Selection_WithSelectedCalculation_ReturnsSelectedCalculation()
{
// Setup
var assessmentSection = mocks.Stub();
@@ -290,14 +290,14 @@
using (DuneLocationCalculationsView view = ShowFullyConfiguredDuneLocationCalculationsView(assessmentSection))
{
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
- DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
+ DataGridViewRow selectedCalculationRow = dataGridView.Rows[0];
// Call
- selectedLocationRow.Cells[0].Value = true;
+ selectedCalculationRow.Cells[0].Value = true;
// Assert
var selection = view.Selection as DuneLocationCalculation;
- var dataBoundItem = selectedLocationRow.DataBoundItem as DuneLocationCalculationRow;
+ var dataBoundItem = selectedCalculationRow.DataBoundItem as DuneLocationCalculationRow;
Assert.NotNull(selection);
Assert.NotNull(dataBoundItem);
@@ -433,7 +433,7 @@
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
object originalDataSource = dataGridView.DataSource;
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
calculations.Attach(calculationsObserver);
@@ -467,8 +467,8 @@
Assert.AreSame(originalDataSource, dataGridView.DataSource);
- Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
- Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value);
+ Assert.IsTrue((bool) rows[0].Cells[calculateColumnIndex].Value);
+ Assert.IsFalse((bool) rows[1].Cells[calculateColumnIndex].Value);
}
}
}
@@ -484,7 +484,7 @@
{
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
var button = new ButtonTester("CalculateForSelectedButton", testForm);
@@ -516,7 +516,7 @@
{
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
}
if (contributionZero)
@@ -570,7 +570,7 @@
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
@@ -631,7 +631,7 @@
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
@@ -693,7 +693,7 @@
testForm.Show();
var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0];
DataGridViewRowCollection rows = dataGridView.Rows;
- rows[0].Cells[locationCalculateColumnIndex].Value = true;
+ rows[0].Cells[calculateColumnIndex].Value = true;
var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs
===================================================================
diff -u -r53906164cce5013cd047b7a72f3c7179a089eef2 -r8fe9bd87da92837297afa5cc804ccdac8b64900d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision 53906164cce5013cd047b7a72f3c7179a089eef2)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using Core.Common.Base;
@@ -89,7 +88,7 @@
Type viewDataType = info.ViewDataType;
// Assert
- Assert.AreEqual(typeof(IEnumerable), viewDataType);
+ Assert.AreEqual(typeof(IObservableEnumerable), viewDataType);
}
[Test]