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

Timestamp:

05/09/14 15:11:16 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed persistence errors in the GenealogyAnalyzer and the instrumented operators, tweaked display code in the GenealogyGraphChart.

File:

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

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

@@ -53 +53 @@
 
     private void Clear() {
-      if (nodeMap == null)
-        nodeMap = new Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode>();
-      else nodeMap.Clear();
-
-      if (arcMap == null)
-        arcMap = new Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc>();
-      else arcMap.Clear();
+      nodeMap = new Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode>();
+      arcMap = new Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc>();
 
       Chart.Group.Clear();
@@ -118 +113 @@
         foreach (var node in nodes) {
           var brush = new SolidBrush(node.GetColor());
-
           var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + diameter, y + diameter, defaultPen, brush) {
             Data = node,
@@ -145 +139 @@
           var pen = Pens.Transparent;
           var visualArc = AddArc(Chart, visualParent, visualNode, pen);
-          if (!arcMap.ContainsKey(Tuple.Create(visualParent, visualNode)))
+          if (!arcMap.ContainsKey(Tuple.Create(visualParent, visualNode))) {
             arcMap.Add(Tuple.Create(visualParent, visualNode), visualArc);
+          }
         }
       }
@@ -233 +228 @@
       brush.Color = node.Data.GetColor();
       var arcs = arcSelector(node);
+      var pen = new Pen(Color.Transparent);
       foreach (var arc in arcs) {
         var source = arc.Source.Data;
@@ -238 +234 @@
         var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
         var end = new Point((int)arc.End.X, (int)arc.End.Y);
-        arc.Pen = new Pen(Color.Transparent);
+        arc.Pen = pen;
         arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
         DrawLineage(nodeSelector(arc), arcSelector, nodeSelector);
@@ -273 +269 @@
           primitive.Pen = Pens.Transparent;
         } else if (primitive is VisualGenealogyGraphNode) {
-          primitive.Brush = Brushes.Transparent;
-          primitive.Pen = Pens.DarkGray;
+          primitive.Brush = new SolidBrush(Color.Transparent);
+          primitive.Pen = new Pen(Color.DarkGray);
         }
       }