Changeset 9963 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

Timestamp:

09/13/13 14:42:38 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged changes from the trunk and other branches. Added new ExtendedSymbolicExpressionTreeCanvas control for the visual exploration of tree genealogies. Reorganized some files and folders.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs (modified) (7 diffs)

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

@@ -111 +111 @@
         if (layers[i].Rank.IsAlmost(rank)) {
           var visualTextNode = new VisualGenealogyGraphTextLabel(Chart, x, y + 2, x + Diameter, y + Diameter) {
-            Brush = new SolidBrush(Color.Black),
+            FontBrush = new SolidBrush(Color.Black),
             Font = new Font("Arial", Diameter - 4, FontStyle.Regular, GraphicsUnit.Pixel),
             Text = String.Format("{0:0}", rank)
@@ -154 +154 @@
       }
       // add arcs separately (to avoid some ordering problems)
-      foreach (SymbolicExpressionGenealogyGraphNode node in Graph.Nodes) {
+      foreach (SymbolicExpressionTreeGenealogyGraphNode node in Graph.Nodes) {
         VisualGenealogyGraphNode visualNode = GetVisualGenealogyGraphNode(node);
         if (node.InEdges == null) continue;
@@ -171 +171 @@
 
       //        var brush = new SolidBrush(Color.BlueViolet);
-      //        visualGraphNode.Brush = brush;
+      //        visualGraphNode.FontBrush = brush;
       //      }
 
@@ -267 +267 @@
         arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
         arc.Pen.Color = Color.Transparent;
-        //        arc.Pen.Brush = new SolidBrush(Color.DarkGray);
+        //        arc.Pen.FontBrush = new SolidBrush(Color.DarkGray);
         DrawLineage(nodeSelector(arc), arcSelector, nodeSelector);
       }
@@ -300 +300 @@
     }
 
-    public void HighlightNodes(IEnumerable<SymbolicExpressionGenealogyGraphNode> nodes) {
+    public void HighlightNodes(IEnumerable<SymbolicExpressionTreeGenealogyGraphNode> nodes) {
       Chart.UpdateEnabled = false;
       ClearAllNodes();
@@ -333 +333 @@
     }
 
-    public void HighlightNode(SymbolicExpressionGenealogyGraphNode graphNode, Color color) {
+    public void HighlightNode(SymbolicExpressionTreeGenealogyGraphNode graphNode, Color color) {
       GetVisualGenealogyGraphNode(graphNode).Brush = new SolidBrush(color);
     }
@@ -388 +388 @@
 
   internal static class Util {
-    public static Color GetColor(this SymbolicExpressionGenealogyGraphNode node) {
+    public static Color GetColor(this SymbolicExpressionTreeGenealogyGraphNode node) {
       var colorIndex = (int)(node.Quality * ColorGradient.Colors.Count);
       if (colorIndex >= ColorGradient.Colors.Count) --colorIndex;