Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs =================================================================== diff -u -r244dd8357f6de439ff2364fa675a9e128da84b5c -r9c8a4be86a9b3659738256e8f1c0542339d7b16a --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision 244dd8357f6de439ff2364fa675a9e128da84b5c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision 9c8a4be86a9b3659738256e8f1c0542339d7b16a) @@ -39,25 +39,30 @@ /// Properties for the illustration points. /// [TypeConverter(typeof(ExpandableObjectConverter))] - public class IllustrationPointProperties : ObjectProperties + public class IllustrationPointProperties : ObjectProperties { - private readonly string name; + private readonly IEnumerable childNodes; /// /// Creates a new instance of . /// - /// The data to use for the properties. + /// The data to use for the properties. + /// The child nodes that belongs to the . /// String containing the wind direction for this illustration point. /// String containing the name of the closing situation. If empty /// the property will not be visible. /// Thrown when any input parameter is null. - public IllustrationPointProperties( - IllustrationPointNode illustrationPointNode, string windDirection, string closingSituation) + public IllustrationPointProperties(IllustrationPointBase illustrationPoint, IEnumerable childNodes, + string windDirection, string closingSituation) { - if (illustrationPointNode == null) + if (illustrationPoint == null) { - throw new ArgumentNullException(nameof(illustrationPointNode)); + throw new ArgumentNullException(nameof(illustrationPoint)); } + if (childNodes == null) + { + throw new ArgumentNullException(nameof(childNodes)); + } if (windDirection == null) { throw new ArgumentNullException(nameof(windDirection)); @@ -66,10 +71,10 @@ { throw new ArgumentNullException(nameof(closingSituation)); } - data = illustrationPointNode; + data = illustrationPoint; + this.childNodes = childNodes; WindDirection = windDirection; ClosingSituation = closingSituation; - name = data.Data.Name; } [PropertyOrder(0)] @@ -81,7 +86,7 @@ { get { - return StatisticsConverter.ReliabilityToProbability(data.Data.Beta); + return StatisticsConverter.ReliabilityToProbability(data.Beta); } } @@ -94,7 +99,7 @@ { get { - return data.Data.Beta; + return data.Beta; } } @@ -123,17 +128,21 @@ get { var points = new List(); - foreach (IllustrationPointNode illustrationPointNode in data.Children) + foreach (IllustrationPointNode illustrationPointNode in childNodes) { if (illustrationPointNode.Data is FaultTreeIllustrationPoint) { - points.Add(new FaultTreeIllustrationPointProperties(illustrationPointNode, WindDirection, ClosingSituation)); + points.Add(new FaultTreeIllustrationPointProperties(illustrationPointNode.Data, + illustrationPointNode.Children, + WindDirection, ClosingSituation)); continue; } if (illustrationPointNode.Data is SubMechanismIllustrationPoint) { - points.Add(new SubMechanismIllustrationPointProperties(illustrationPointNode, WindDirection, ClosingSituation)); + points.Add(new SubMechanismIllustrationPointProperties(illustrationPointNode.Data, + illustrationPointNode.Children, + WindDirection, ClosingSituation)); continue; } @@ -150,7 +159,7 @@ { if (propertyName.Equals(nameof(IllustrationPoints))) { - return data.Children.Any(); + return childNodes.Any(); } if (propertyName.Equals(nameof(ClosingSituation))) @@ -163,7 +172,7 @@ public override string ToString() { - return $"{name}"; + return $"{data.Name}"; } } } \ No newline at end of file