Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r5889ad3491022eb0bc27a4f2aa8a8eb5a708f2f0
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs (.../HydraulicBoundaryLocationCalculationRow.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryLocationCalculationRow.cs (.../HydraulicBoundaryLocationCalculationRow.cs) (revision 5889ad3491022eb0bc27a4f2aa8a8eb5a708f2f0)
@@ -37,11 +37,22 @@
/// Creates a new instance of .
///
/// The for this row.
+ /// The name of the hydraulic boundary database the
+ /// belongs to.
/// Thrown when is null.
- internal HydraulicBoundaryLocationCalculationRow(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
- : base(hydraulicBoundaryLocationCalculation) {}
+ internal HydraulicBoundaryLocationCalculationRow(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
+ string hydraulicBoundaryDatabaseFileName)
+ : base(hydraulicBoundaryLocationCalculation)
+ {
+ HydraulicBoundaryDatabaseFileName = hydraulicBoundaryDatabaseFileName;
+ }
///
+ /// Gets the file name of the hydraulic boundary database the calculation belongs to.
+ ///
+ public string HydraulicBoundaryDatabaseFileName { get; }
+
+ ///
/// Gets or sets the value indicating whether the illustration points need to be included.
///
public bool IncludeIllustrationPoints
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r5889ad3491022eb0bc27a4f2aa8a8eb5a708f2f0
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs (.../HydraulicBoundaryLocationCalculationRowTest.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs (.../HydraulicBoundaryLocationCalculationRowTest.cs) (revision 5889ad3491022eb0bc27a4f2aa8a8eb5a708f2f0)
@@ -42,12 +42,13 @@
const string locationName = "LocationName";
const double coordinateX = 1.0;
const double coordinateY = 2.0;
+ const string fileName = "HRD FileName";
var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationName, coordinateX, coordinateY);
var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
// Call
- var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+ var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, fileName);
// Assert
Assert.IsInstanceOf>(row);
@@ -56,6 +57,8 @@
Assert.AreEqual(locationName, row.Name);
Assert.AreSame(hydraulicBoundaryLocation.Location, row.Location);
+ Assert.AreEqual(fileName, row.HydraulicBoundaryDatabaseFileName);
+
TestHelper.AssertTypeConverter(nameof(HydraulicBoundaryLocationCalculationRow.Result));
Assert.IsNaN(row.Result);
@@ -75,7 +78,7 @@
var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
- var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+ var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, "HRD FileName");
row.CalculatableObject.Attach(observer);
@@ -95,7 +98,7 @@
// Setup
var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
- var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation);
+ var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation, "HRD FileName");
var random = new Random(432);
var output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble());