Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingInput.cs
===================================================================
diff -u -rd2d48d2bd3050679db76ec126d31b8f9d9546395 -r3c5251ed6df34120400ec143c00c8448539b0fa5
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingInput.cs (.../ProbabilisticPipingInput.cs) (revision d2d48d2bd3050679db76ec126d31b8f9d9546395)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingInput.cs (.../ProbabilisticPipingInput.cs) (revision 3c5251ed6df34120400ec143c00c8448539b0fa5)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Core.Common.Base.Data;
namespace Riskeer.Piping.Data.Probabilistic
{
@@ -39,16 +38,6 @@
public ProbabilisticPipingInput(GeneralPipingInput generalInputParameters) : base(generalInputParameters) {}
///
- /// Gets the section name.
- ///
- public string SectionName { get; }
-
- ///
- /// Gets the section length.
- ///
- public RoundedDouble SectionLength { get; }
-
- ///
/// Gets or sets if the illustration points should be calculated.
///
public bool ShouldIllustrationPointsBeCalculated { get; set; }
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs
===================================================================
diff -u -r0c2343c956d063a375393ee8bbc14df94053a039 -r3c5251ed6df34120400ec143c00c8448539b0fa5
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision 0c2343c956d063a375393ee8bbc14df94053a039)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision 3c5251ed6df34120400ec143c00c8448539b0fa5)
@@ -23,11 +23,13 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
+using System.Linq;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.Gui.Attributes;
using Core.Common.Gui.PropertyBag;
using Core.Common.Util.Attributes;
+using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Forms.ChangeHandlers;
using Riskeer.Common.Forms.Helpers;
using Riskeer.Common.Forms.PresentationObjects;
@@ -444,7 +446,8 @@
{
get
{
- return data.WrappedData.SectionName;
+
+ return GetSection().Name ?? "-";
}
}
@@ -453,11 +456,12 @@
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.SectionInformation))]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.SectionLength_DisplayName))]
[ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.SectionLength_Description))]
- public RoundedDouble SectionLength
+ public double SectionLength
{
get
{
- return data.WrappedData.SectionLength;
+ FailureMechanismSection failureMechanismSection = GetSection();
+ return failureMechanismSection == null ? 0d: failureMechanismSection.Length;
}
}
@@ -482,5 +486,12 @@
}
#endregion
+
+ private FailureMechanismSection GetSection()
+ {
+ return data.FailureMechanism
+ .Sections
+ .FirstOrDefault(section => data.PipingCalculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Math2D.ConvertPointsToLineSegments(section.Points)));
+ }
}
}
\ No newline at end of file