Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs
===================================================================
diff -u -re68cc1771406b97ed942838b3bf28d0f1ab3f3c5 -r25dfcb234230ea91032011e683553be6bee37b99
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs (.../HydraulicBoundaryLocationCalculationRow.cs) (revision e68cc1771406b97ed942838b3bf28d0f1ab3f3c5)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs (.../HydraulicBoundaryLocationCalculationRow.cs) (revision 25dfcb234230ea91032011e683553be6bee37b99)
@@ -37,7 +37,7 @@
///
/// The for this row.
/// The name of the hydraulic boundary database the
- /// belongs to.
+ /// is associated with.
/// Thrown when is null.
internal HydraulicBoundaryLocationCalculationRow(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
string hydraulicBoundaryDatabaseFileName)
@@ -47,7 +47,7 @@
}
///
- /// Gets the file name of the hydraulic boundary database the calculation belongs to.
+ /// Gets the file name of the hydraulic boundary database the calculation is associated with.
///
public string HydraulicBoundaryDatabaseFileName { get; }
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs
===================================================================
diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -r25dfcb234230ea91032011e683553be6bee37b99
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 25dfcb234230ea91032011e683553be6bee37b99)
@@ -40,9 +40,20 @@
/// Creates a new instance of .
///
/// The to wrap.
+ /// The name of the hydraulic boundary database the
+ /// is associated with.
/// Thrown when is null.
- public DuneLocationCalculationRow(DuneLocationCalculation duneLocationCalculation)
- : base(duneLocationCalculation) {}
+ public DuneLocationCalculationRow(DuneLocationCalculation duneLocationCalculation,
+ string hydraulicBoundaryDatabaseFileName)
+ : base(duneLocationCalculation)
+ {
+ HydraulicBoundaryDatabaseFileName = hydraulicBoundaryDatabaseFileName;
+ }
+
+ ///
+ /// Gets the file name of the hydraulic boundary database the calculation is associated with.
+ ///
+ public string HydraulicBoundaryDatabaseFileName { get; }
///
/// Gets the .
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs
===================================================================
diff -u -r21f561c73f0a7dcee27f6989b84da9d40868069c -r25dfcb234230ea91032011e683553be6bee37b99
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 21f561c73f0a7dcee27f6989b84da9d40868069c)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 25dfcb234230ea91032011e683553be6bee37b99)
@@ -278,7 +278,7 @@
private void SetDataSource()
{
- dataGridViewControl.SetDataSource(calculations?.Select(calc => new DuneLocationCalculationRow(calc)).ToArray());
+ dataGridViewControl.SetDataSource(calculations?.Select(calc => new DuneLocationCalculationRow(calc, string.Empty)).ToArray());
}
private void CalculateForSelectedRows()
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs
===================================================================
diff -u -r664ea533634f90fcabc7ec85ee0808714936abba -r25dfcb234230ea91032011e683553be6bee37b99
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 664ea533634f90fcabc7ec85ee0808714936abba)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 25dfcb234230ea91032011e683553be6bee37b99)
@@ -41,6 +41,8 @@
public void Constructor_DuneLocationCalculationWithOutput_ExpectedValues(double offSet)
{
// Setup
+ const string fileName = "HRD FileName";
+
var duneLocation = new DuneLocation("test location", new TestHydraulicBoundaryLocation(), new DuneLocation.ConstructionProperties
{
CoastalAreaId = 2,
@@ -60,11 +62,12 @@
};
// Call
- var row = new DuneLocationCalculationRow(duneLocationCalculation);
+ var row = new DuneLocationCalculationRow(duneLocationCalculation, fileName);
// Assert
Assert.IsInstanceOf>(row);
Assert.AreSame(duneLocationCalculation, row.CalculatableObject);
+ Assert.AreEqual(fileName, row.HydraulicBoundaryDatabaseFileName);
Assert.AreEqual(duneLocation.Id, row.Id);
Assert.AreEqual(duneLocation.Name, row.Name);
Assert.AreSame(duneLocation.Location, row.Location);
@@ -98,7 +101,7 @@
var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
// Call
- var row = new DuneLocationCalculationRow(duneLocationCalculation);
+ var row = new DuneLocationCalculationRow(duneLocationCalculation, string.Empty);
// Assert
Assert.IsNaN(row.WaterLevel);