Changeset 10797 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

05/05/14 17:04:25 (10 years ago)

Author:

bburlacu

Message:

#1772: Added text labels to SymbolicExpressionTreeTiles so that the generation number is also displayed.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs

@@ -2 +2 @@
 using System.Drawing;
 using System.Linq;
-using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -51 +50 @@
         var tile = new SymbolicExpressionTreeTile(chart);
         tile.LayoutEngine = symbolicExpressionEngine;
+        tile.Label = "Generation " + node.Rank;
         tile.Root = node.Content.Root;
         var tileNode = new TileLayoutNode { Tile = tile };
@@ -94 +94 @@
         var aPos = aTile.Position;
 
-        if (node.Rank.IsAlmost(0)) {
-          foreach (var s in node.Content.Root.IterateNodesPrefix()) {
+        if (node.Content.Index1 > 0) {
+          var subtree = node.Content.Root.NodeAt(node.Content.Index1);
+          foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
             if (primitive != null) {
               var rpb = primitive as RectangularPrimitiveBase;
               if (rpb != null) {
-                rpb.Pen = new Pen(Color.ForestGreen);
-              }
-            }
-          }
-        } else {
-
-          if (node.Content.Index1 > 0) {
-            var subtree = node.Content.Root.NodeAt(node.Content.Index1);
-            foreach (var s in subtree.IterateNodesPrefix()) {
-              var primitive = aTile.GetPrimitive(s);
-              if (primitive != null) {
-                var rpb = primitive as RectangularPrimitiveBase;
-                if (rpb != null) {
-                  rpb.Pen = new Pen(Color.RoyalBlue);
-                }
+                rpb.Pen = new Pen(Color.RoyalBlue);
               }
             }