Index: Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs
===================================================================
diff -u -r684b8c0ca681ea2da3cc988bd60e9223037e5a16 -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs (.../WrappedObjectContextBase.cs) (revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
+++ Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs (.../WrappedObjectContextBase.cs) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -37,7 +37,7 @@
/// Initializes a new instance of the class.
///
/// The wrapped data.
- /// When is null.
+ /// When is null.
protected WrappedObjectContextBase(T wrappedData)
{
if (wrappedData == null)
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs
===================================================================
diff -u -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs (.../FailureMechanismContributionContext.cs) (revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs (.../FailureMechanismContributionContext.cs) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Core.Common.Base;
using Core.Common.Controls.PresentationObjects;
using Ringtoets.Common.Data.AssessmentSection;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs
===================================================================
diff -u -r3ba42e2c8b6380227f4b2e1d1897135ec962beab -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs (.../DefaultFailureMechanismTreeNodeInfo.cs) (revision 3ba42e2c8b6380227f4b2e1d1897135ec962beab)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs (.../DefaultFailureMechanismTreeNodeInfo.cs) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -105,10 +105,10 @@
new object[0];
}
- return GetDisbledFailureMechanismChildNodeObjects(failureMechanismContext);
+ return GetDisabledFailureMechanismChildNodeObjects(failureMechanismContext);
}
- private static object[] GetDisbledFailureMechanismChildNodeObjects(TContext failureMechanismContext)
+ private static object[] GetDisabledFailureMechanismChildNodeObjects(TContext failureMechanismContext)
{
return new object[]
{
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj
===================================================================
diff -u -r2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5 -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -82,6 +82,7 @@
{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
Core.Common.Controls
+ False
{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -rbae4f8741e1a0155753e3b3734de500712ee4182 -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision bae4f8741e1a0155753e3b3734de500712ee4182)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -157,7 +157,7 @@
if (e.ColumnIndex == probabilityPerYearColumn.Index)
{
var contributionItem = data.Distribution.ElementAt(e.RowIndex);
- if (contributionItem.Contribution == 0.0)
+ if (Math.Abs(contributionItem.Contribution) < 1e-6)
{
e.Value = RingtoetsIntegrationFormsResources.FailureMechanismContributionView_ProbabilityPerYear_Not_applicable;
e.FormattingApplied = true;
@@ -219,12 +219,11 @@
{
if (ViewCommands != null)
{
- foreach (var failureMechanism in assessmentSection.GetFailureMechanisms())
+ var irrelevantFailureMechanisms = assessmentSection.GetFailureMechanisms().Where(failureMechanism => !failureMechanism.IsRelevant);
+
+ foreach (var failureMechanism in irrelevantFailureMechanisms)
{
- if (!failureMechanism.IsRelevant)
- {
- ViewCommands.RemoveAllViewsForItem(failureMechanism);
- }
+ ViewCommands.RemoveAllViewsForItem(failureMechanism);
}
}
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rfd98bcf5d1811dbcad2cc0e292a4349f8402b83a -r54bb4197ebc3b67e9ba167a6669791726c33e12e
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision fd98bcf5d1811dbcad2cc0e292a4349f8402b83a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 54bb4197ebc3b67e9ba167a6669791726c33e12e)
@@ -243,15 +243,12 @@
var assessmentSection = o as IAssessmentSection;
var pipingFailureMechanism = o as PipingFailureMechanism;
- var viewPipingFailureMechanismContext = (PipingFailureMechanismContext)view.Data;
+ var viewPipingFailureMechanismContext = (PipingFailureMechanismContext) view.Data;
var viewPipingFailureMechanism = viewPipingFailureMechanismContext.WrappedData;
- if (assessmentSection != null)
- {
- return ReferenceEquals(viewPipingFailureMechanismContext.Parent, assessmentSection);
- }
-
- return ReferenceEquals(viewPipingFailureMechanism, pipingFailureMechanism);
+ return assessmentSection != null
+ ? ReferenceEquals(viewPipingFailureMechanismContext.Parent, assessmentSection)
+ : ReferenceEquals(viewPipingFailureMechanism, pipingFailureMechanism);
}
# endregion