Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r02de9412f0e856e0ab90df7d1aeff0278b4d2f07 -r1f42c50a516ae7e3504982c15df0ceb0f80bbc7d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 02de9412f0e856e0ab90df7d1aeff0278b4d2f07)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 1f42c50a516ae7e3504982c15df0ceb0f80bbc7d)
@@ -148,7 +148,6 @@
-
UserControl
Fisheye: Tag 1f42c50a516ae7e3504982c15df0ceb0f80bbc7d refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/GraphNodeItem.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs
===================================================================
diff -u -reef0b9286b0abef756736270c7edb3adcd8221d3 -r1f42c50a516ae7e3504982c15df0ceb0f80bbc7d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs (.../IllustrationPointsFaultTreeControl.cs) (revision eef0b9286b0abef756736270c7edb3adcd8221d3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsFaultTreeControl.cs (.../IllustrationPointsFaultTreeControl.cs) (revision 1f42c50a516ae7e3504982c15df0ceb0f80bbc7d)
@@ -63,18 +63,9 @@
drawnNodes.Clear();
- if (value == null)
- {
- pointedTreeGraphControl.Data = null;
- return;
- }
-
- RegisterNode(data.FaultTreeNodeRoot);
-
- pointedTreeGraphControl.Data = drawnNodes
- .Where(d => d.IllustrationPointNode == data.FaultTreeNodeRoot)
- .Select(d => d.GraphNode)
- .FirstOrDefault();
+ pointedTreeGraphControl.Data = value != null
+ ? RegisterNode(data.FaultTreeNodeRoot)
+ : null;
}
}
@@ -90,32 +81,21 @@
}
}
- private void RegisterNode(IllustrationPointNode node)
+ private GraphNode RegisterNode(IllustrationPointNode node)
{
- var childNodes = new List();
+ List childNodes = node.Children.Select(RegisterNode).ToList();
- foreach (IllustrationPointNode childNode in node.Children)
- {
- RegisterNode(childNode);
-
- foreach (DrawnIllustrationPointNode drawnIllustrationPointNode in drawnNodes)
- {
- if (drawnIllustrationPointNode.IllustrationPointNode == childNode)
- {
- childNodes.Add(drawnIllustrationPointNode.GraphNode);
- break;
- }
- }
- }
-
+ GraphNode graphNode = CreateGraphNode(node.Data, childNodes);
drawnNodes.Add(new DrawnIllustrationPointNode
{
IllustrationPointNode = node,
- GraphNode = CreateGraphNodes(node.Data, childNodes)
+ GraphNode = graphNode
});
+
+ return graphNode;
}
- private static GraphNode CreateGraphNodes(IllustrationPointBase illustrationPoint, IEnumerable childNodes)
+ private static GraphNode CreateGraphNode(IllustrationPointBase illustrationPoint, IEnumerable childNodes)
{
var subMechanismIllustrationPoint = illustrationPoint as SubMechanismIllustrationPoint;
if (subMechanismIllustrationPoint != null)
Fisheye: Tag 1f42c50a516ae7e3504982c15df0ceb0f80bbc7d refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GraphNodeItemTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r02de9412f0e856e0ab90df7d1aeff0278b4d2f07 -r1f42c50a516ae7e3504982c15df0ceb0f80bbc7d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 02de9412f0e856e0ab90df7d1aeff0278b4d2f07)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 1f42c50a516ae7e3504982c15df0ceb0f80bbc7d)
@@ -88,7 +88,6 @@
-