Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r88ba44b92caad86cf1343d9c191bc22761463c8c -r3d92d0715a889b25fcf76e04d6536168d670328c
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 88ba44b92caad86cf1343d9c191bc22761463c8c)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 3d92d0715a889b25fcf76e04d6536168d670328c)
@@ -134,22 +134,25 @@
"traject_6-3_vakken.shx"))
{
IFailureMechanism[] failureMechanisms = demoAssessmentSection.GetFailureMechanisms().ToArray();
+
+ string filePath = Path.Combine(embeddedResourceFileWriter.TargetFolderPath,
+ "traject_6-3_vakken.shp");
+
for (var i = 0; i < failureMechanisms.Length; i++)
{
-
if (i == 0)
{
+
var importer = new FailureMechanismSectionsImporter(failureMechanisms[i],
demoAssessmentSection.ReferenceLine,
- Path.Combine(embeddedResourceFileWriter.TargetFolderPath,
- "traject_6-3_vakken.shp"));
+ filePath);
importer.Import();
}
else
{
// Copy same FailureMechanismSection instances to other failure mechanisms
FailureMechanismSection[] clonedSections = failureMechanisms[0].Sections.Select(DeepCloneSection).ToArray();
- failureMechanisms[i].SetSections(clonedSections, string.Empty);
+ failureMechanisms[i].SetSections(clonedSections, filePath);
}
}
}
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r861bcd1d9466ea7a592bf5fbc75595728e9dcee1 -r3d92d0715a889b25fcf76e04d6536168d670328c
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 861bcd1d9466ea7a592bf5fbc75595728e9dcee1)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 3d92d0715a889b25fcf76e04d6536168d670328c)
@@ -29,6 +29,7 @@
using Core.Common.Controls.Commands;
using Core.Common.Gui;
using Core.Common.Gui.Commands;
+using Core.Common.Util.IO;
using Demo.Ringtoets.Commands;
using NUnit.Framework;
using Rhino.Mocks;
@@ -110,6 +111,7 @@
foreach (IFailureMechanism failureMechanism in demoAssessmentSection.GetFailureMechanisms())
{
Assert.AreEqual(283, failureMechanism.Sections.Count());
+ Assert.IsTrue(failureMechanism.FailureMechanismSectionSourcePath.Contains("traject_6-3_vakken.shp"));
}
AssertGrassCoverErosionInwardsFailureMechanism(demoAssessmentSection);
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj
===================================================================
diff -u -r8b8e62bfddfca997d2ed5df4a0c9c72648f1b5b4 -r3d92d0715a889b25fcf76e04d6536168d670328c
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 8b8e62bfddfca997d2ed5df4a0c9c72648f1b5b4)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 3d92d0715a889b25fcf76e04d6536168d670328c)
@@ -55,6 +55,10 @@
{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}
Core.Common.Gui
+
+ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}
+ Core.Common.Util
+
{2465cca1-c505-4827-9454-4fd5fd9194cd}
Core.Components.Chart.Forms