Changeset 10730 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

Timestamp:

04/08/14 17:23:51 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved FragmentGraphView.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

@@ -196 +196 @@
         // new node has been selected, clean up
         Chart.UpdateEnabled = false;
-        if (ModifierKeys != Keys.Shift)
+        if (ModifierKeys != Keys.Shift) {
           // clear colors
           ClearPrimitives();
+        }
         // use a rectangle to highlight the currently selected genealogy graph node
         var gNode = SelectedVisualNode.Data;
@@ -222 +223 @@
     #endregion
 
-    private void DrawLineage(VisualGenealogyGraphNode node, Func<VisualGenealogyGraphNode, IEnumerable<VisualGenealogyGraphArc>> arcSelector, Func<VisualGenealogyGraphArc, VisualGenealogyGraphNode> nodeSelector) {
+    private static void DrawLineage(VisualGenealogyGraphNode node, Func<VisualGenealogyGraphNode, IEnumerable<VisualGenealogyGraphArc>> arcSelector, Func<VisualGenealogyGraphArc, VisualGenealogyGraphNode> nodeSelector) {
       if (node.Brush != null) return;
       node.Brush = new SolidBrush(node.Data.GetColor());
-      var arcs = arcSelector(node);
-      if (arcs == null) return;
-
+      var arcs = arcSelector(node).ToList();
       foreach (var arc in arcs) {
         var source = arc.Source.Data;
@@ -235 +234 @@
         arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
         arc.Pen.Color = Color.Transparent;
-        //        arc.Pen.FontBrush = new SolidBrush(Color.DarkGray);
+        //        if (arc == arcs[0]) { arc.Pen.Width = 2; } // mark connection to the root parent
         DrawLineage(nodeSelector(arc), arcSelector, nodeSelector);
       }