Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj =================================================================== diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj (.../Ringtoets.StabilityPointStructures.Data.csproj) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj (.../Ringtoets.StabilityPointStructures.Data.csproj) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -52,7 +52,6 @@ - Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs =================================================================== diff -u -r786f934bd6d2b1151b8561f55fcebc1bded458ed -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs (.../StabilityPointStructuresCalculation.cs) (revision 786f934bd6d2b1151b8561f55fcebc1bded458ed) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs (.../StabilityPointStructuresCalculation.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -21,6 +21,7 @@ using Core.Common.Base; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.StabilityPointStructures.Data.Properties; namespace Ringtoets.StabilityPointStructures.Data @@ -45,9 +46,9 @@ public StabilityPointStructuresInput InputParameters { get; private set; } /// - /// Gets or sets , which contains the results of a calculation. + /// Gets or sets , which contains the results of a calculation. /// - public StabilityPointStructuresOutput Output { get; set; } + public ProbabilityAssessmentOutput Output { get; set; } public string Comments { get; set; } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs =================================================================== diff -u -r12444a58a30c10422af52418a1cebb586f4fdc69 -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 12444a58a30c10422af52418a1cebb586f4fdc69) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -23,6 +23,7 @@ using System.Linq; using Core.Common.Base; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.StabilityPointStructures.Data.Properties; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -47,6 +48,7 @@ GeneralInput = new GeneralStabilityPointStructuresInput(); StabilityPointStructures = new ObservableList(); sectionResults = new List(); + ForeshoreProfiles = new ObservableList(); } public override IEnumerable Calculations @@ -67,6 +69,11 @@ /// public ObservableList StabilityPointStructures { get; private set; } + /// + /// Gets the available foreshore profiles for this instance. + /// + public ObservableList ForeshoreProfiles { get; private set; } + public CalculationGroup CalculationsGroup { get; private set; } public IEnumerable SectionResults Fisheye: Tag 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rc7cb9812ba255ba88d28b65f1a146dcf7454f63d -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision c7cb9812ba255ba88d28b65f1a146dcf7454f63d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -124,15 +124,6 @@ .AddPropertiesItem() .Build() }; - - yield return new TreeNodeInfo - { - Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, - Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddPropertiesItem() - .Build() - }; } #region ViewInfo Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj =================================================================== diff -u -r803fbebd35cdc089c8167604fc4580c1ff90d7c3 -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj (.../Ringtoets.StabilityPointStructures.Data.Test.csproj) (revision 803fbebd35cdc089c8167604fc4580c1ff90d7c3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj (.../Ringtoets.StabilityPointStructures.Data.Test.csproj) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -58,7 +58,6 @@ - Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs =================================================================== diff -u -rc7da0846a135f849273407e16fe52237371e8f7a -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs (.../StabilityPointStructuresCalculationTest.cs) (revision c7da0846a135f849273407e16fe52237371e8f7a) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs (.../StabilityPointStructuresCalculationTest.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -22,6 +22,7 @@ using Core.Common.Base; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; namespace Ringtoets.StabilityPointStructures.Data.Test { @@ -173,6 +174,9 @@ Assert.AreSame(output, calculationOutput); } - private class TestStabilityPointStructuresOutput : StabilityPointStructuresOutput {} + private class TestStabilityPointStructuresOutput : ProbabilityAssessmentOutput + { + public TestStabilityPointStructuresOutput() : base(0, 0, 0, 0, 0) {} + } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs =================================================================== diff -u -r803fbebd35cdc089c8167604fc4580c1ff90d7c3 -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision 803fbebd35cdc089c8167604fc4580c1ff90d7c3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -52,6 +52,7 @@ CollectionAssert.IsEmpty(failureMechanism.Calculations); CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.StabilityPointStructures); + CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); } [Test] Fisheye: Tag 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj =================================================================== diff -u -rc7cb9812ba255ba88d28b65f1a146dcf7454f63d -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj (.../Ringtoets.StabilityPointStructures.Forms.Test.csproj) (revision c7cb9812ba255ba88d28b65f1a146dcf7454f63d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj (.../Ringtoets.StabilityPointStructures.Forms.Test.csproj) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -70,7 +70,6 @@ - Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rfd1f6126ab10cbe29592671b32a81b6cabd630ec -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision fd1f6126ab10cbe29592671b32a81b6cabd630ec) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -143,7 +143,7 @@ var calculation = new StabilityPointStructuresCalculation { - Output = new StabilityPointStructuresOutput() + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) }; var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculationContext = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); @@ -162,7 +162,7 @@ Assert.IsNotNull(stabilityPointStructuresInputContext); Assert.AreSame(calculationContext.WrappedData.InputParameters, stabilityPointStructuresInputContext.WrappedData); - var output = children[2] as StabilityPointStructuresOutput; + var output = children[2] as ProbabilityAssessmentOutput; Assert.IsNotNull(output); } Fisheye: Tag 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresOutputTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs =================================================================== diff -u -rc7cb9812ba255ba88d28b65f1a146dcf7454f63d -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision c7cb9812ba255ba88d28b65f1a146dcf7454f63d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660) @@ -68,15 +68,14 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(8, treeNodeInfos.Length); + Assert.AreEqual(7, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresFailureMechanismContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructure))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresCalculationGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresCalculationContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresInputContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresOutput))); } mocks.VerifyAll();