Changeset 10732 for branches

Timestamp:

04/08/14 23:54:27 (11 years ago)

Author:

bburlacu

Message:

#1772: Some improvements on the way the genealogy graph and the lineages are drawn.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (7 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.cs (modified) (2 diffs)

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

@@ -111 +111 @@
 
         foreach (var node in nodes) {
-          var pen = new Pen(Color.LightGray);
-
-          var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + diameter, y + diameter, pen, null) {
+          var pen = new Pen(Color.DarkGray);
+          var brush = new SolidBrush(node.GetColor());
+
+          var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + diameter, y + diameter, pen, brush) {
             Data = node,
             ToolTipText = "Rank: " + node.Rank + nl +
@@ -129 +130 @@
 
       // add arcs
-      foreach (var node in GenealogyGraph.Nodes.Cast<IGenealogyGraphNode>()) {
-        if (node.InArcs == null) continue;
-        var visualNode = nodeMap[node];
+      foreach (var node in GenealogyGraph.Nodes) {
+        if (!node.InArcs.Any()) continue;
+        var visualNode = GetMappedNode(node);
         if (visualNode == null) continue;
         foreach (var arc in node.InArcs) {
@@ -184 +185 @@
       }
       var visualNodes = Chart.GetAllPrimitives(e.Location).Where(p => p is VisualGenealogyGraphNode).ToList();
-      if (visualNodes.Count <= 0) {
+      if (!visualNodes.Any()) {
         SelectedVisualNode = null;
         return;
@@ -201 +202 @@
         }
         // use a rectangle to highlight the currently selected genealogy graph node
-        var gNode = SelectedVisualNode.Data;
-        var visualNode = GetMappedNode(gNode);
+        var graphNode = SelectedVisualNode.Data;
+        var visualNode = GetMappedNode(graphNode);
 
         DrawLineage(visualNode, n => SimpleLineages ? n.IncomingArcs.Take(1) : n.IncomingArcs, a => a.Source);
-        visualNode.Brush = null;
         DrawLineage(visualNode, n => n.OutgoingArcs, a => a.Target);
       }
@@ -224 +224 @@
 
     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 brush = (SolidBrush)node.Brush;
+      brush.Color = node.Data.GetColor();
       var arcs = arcSelector(node).ToList();
       foreach (var arc in arcs) {
@@ -267 +267 @@
         if (primitive is VisualGenealogyGraphArc) {
           primitive.Pen.Brush = new SolidBrush(Color.Transparent);
-        } else {
-          primitive.Brush = null;
+        } else if (primitive is VisualGenealogyGraphNode) {
+          var brush = (SolidBrush)primitive.Brush;
+          brush.Color = Color.Transparent;
+          primitive.Pen.Color = Color.DarkGray;
         }
       }
@@ -303 +305 @@
   internal static class Util {
     public static Color GetColor(this IGenealogyGraphNode node) {
-      var colorIndex = (int)(node.Quality * ColorGradient.Colors.Count);
-      return colorIndex < ColorGradient.Colors.Count ? ColorGradient.Colors[colorIndex] : Color.Transparent;
+      var colorIndex = (int)Math.Round(node.Quality * ColorGradient.Colors.Count);
+      if (colorIndex >= ColorGradient.Colors.Count) return ColorGradient.Colors.Last();
+      return ColorGradient.Colors[colorIndex];
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.cs

@@ -3 +3 @@
 using System.Drawing.Drawing2D;
 using System.Linq;
-using System.Windows.Forms;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.Visualization;
@@ -56 +55 @@
       }
     }
-
-    protected override void pictureBox_MouseUp(object sender, MouseEventArgs e) {
-      base.pictureBox_MouseUp(sender, e);
-      // get the selected primitive and update it's graphics
-      var point = new Point(e.X, e.Y);
-
-      var selectedPrimitives = Chart.GetAllPrimitives(point);
-      if (!selectedPrimitives.Any()) return;
-
-      foreach (var primitive in selectedPrimitives) {
-        if (primitive is SymbolicExpressionTreeTile) continue;
-        primitive.Pen = new Pen(Color.Blue) { Brush = new SolidBrush(Color.Blue) };
-      }
-      EnforceUpdate();
-    }
   }
 }