Ignore:
Timestamp:
09/13/13 14:42:38 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

    r9835 r9963  
    111111        if (layers[i].Rank.IsAlmost(rank)) {
    112112          var visualTextNode = new VisualGenealogyGraphTextLabel(Chart, x, y + 2, x + Diameter, y + Diameter) {
    113             Brush = new SolidBrush(Color.Black),
     113            FontBrush = new SolidBrush(Color.Black),
    114114            Font = new Font("Arial", Diameter - 4, FontStyle.Regular, GraphicsUnit.Pixel),
    115115            Text = String.Format("{0:0}", rank)
     
    154154      }
    155155      // add arcs separately (to avoid some ordering problems)
    156       foreach (SymbolicExpressionGenealogyGraphNode node in Graph.Nodes) {
     156      foreach (SymbolicExpressionTreeGenealogyGraphNode node in Graph.Nodes) {
    157157        VisualGenealogyGraphNode visualNode = GetVisualGenealogyGraphNode(node);
    158158        if (node.InEdges == null) continue;
     
    171171
    172172      //        var brush = new SolidBrush(Color.BlueViolet);
    173       //        visualGraphNode.Brush = brush;
     173      //        visualGraphNode.FontBrush = brush;
    174174      //      }
    175175
     
    267267        arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
    268268        arc.Pen.Color = Color.Transparent;
    269         //        arc.Pen.Brush = new SolidBrush(Color.DarkGray);
     269        //        arc.Pen.FontBrush = new SolidBrush(Color.DarkGray);
    270270        DrawLineage(nodeSelector(arc), arcSelector, nodeSelector);
    271271      }
     
    300300    }
    301301
    302     public void HighlightNodes(IEnumerable<SymbolicExpressionGenealogyGraphNode> nodes) {
     302    public void HighlightNodes(IEnumerable<SymbolicExpressionTreeGenealogyGraphNode> nodes) {
    303303      Chart.UpdateEnabled = false;
    304304      ClearAllNodes();
     
    333333    }
    334334
    335     public void HighlightNode(SymbolicExpressionGenealogyGraphNode graphNode, Color color) {
     335    public void HighlightNode(SymbolicExpressionTreeGenealogyGraphNode graphNode, Color color) {
    336336      GetVisualGenealogyGraphNode(graphNode).Brush = new SolidBrush(color);
    337337    }
     
    388388
    389389  internal static class Util {
    390     public static Color GetColor(this SymbolicExpressionGenealogyGraphNode node) {
     390    public static Color GetColor(this SymbolicExpressionTreeGenealogyGraphNode node) {
    391391      var colorIndex = (int)(node.Quality * ColorGradient.Colors.Count);
    392392      if (colorIndex >= ColorGradient.Colors.Count) --colorIndex;
Note: See TracChangeset for help on using the changeset viewer.