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

Timestamp:

05/11/14 21:17:30 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved display of trees and fragments in the FragmentGraphView by displaying the whole tree and highlighting the subtree and the fragment inside it. Changed color scheme to look nicer.

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

@@ -96 +96 @@
         var aPos = aTile.Position;
 
-        if (node.Content.Index1 > 0) {
-          var subtree = node.Content.Root.NodeAt(node.Content.Index1);
+        var fragment = node.Content;
+        if (fragment.Index1 > 0) {
+          var subtree = fragment.Root.NodeAt(fragment.Index1);
           foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
@@ -103 +104 @@
               var rpb = primitive as RectangularPrimitiveBase;
               if (rpb != null) {
-                rpb.Pen = Pens.RoyalBlue;
+                rpb.Pen = new Pen(Color.Black);
               }
             }
           }
+        }
+        if (fragment.Index2 > 0) {
+          var subtree = fragment.Root.NodeAt(fragment.Index2);
+          foreach (var s in subtree.IterateNodesPrefix()) {
+            var primitive = aTile.GetPrimitive(s);
+            if (primitive != null) {
+              var rpb = primitive as RectangularPrimitiveBase;
+              if (rpb != null) {
+                rpb.Brush = new SolidBrush(Color.LightGray);
+              }
+            }
+          }
+        }
+
+        if (node.Parents.Any() && node == node.Parents.First().Children.First()) {
+          var parent = node.Parents.First();
+          var index = fragment.Index1 + (parent.Content.Index2 - parent.Content.Index1);
+          var subtree = fragment.Root.NodeAt(index);
+          var primitive = aTile.GetPrimitive(subtree);
+          primitive.Brush = new SolidBrush(Color.LightCoral);
         }
 
@@ -114 +135 @@
           var bPos = bTile.Position;
 
-          var line = new Line(chart, new PointD(aPos.X + aSize.Width / 2.0, aPos.Y + aSize.Height), new PointD(bPos.X + bSize.Width / 2.0, bPos.Y));
+          var line = new Line(chart, new PointD(aPos.X + aSize.Width / 2.0, aPos.Y + aSize.Height), new PointD(bPos.X + bSize.Width / 2.0, bPos.Y)) {
+            Pen = Pens.DimGray
+          };
           symbolicExpressionChartControl.Add(line);
 
-          if (child == node.Children.First()) {
-            if (node.Content.Index1 > 0) {
-              var subtree = child.Content.Root.NodeAt(node.Content.Index1);
-              foreach (var s in subtree.IterateNodesPrefix()) {
-                var primitive = bTile.GetPrimitive(s);
-                if (primitive != null) {
-                  var rpb = primitive as RectangularPrimitiveBase;
-                  if (rpb != null) {
-                    rpb.Pen = Pens.DarkOrange;
-                  }
-                }
-              }
-            }
-          }
+          //          if (child == node.Children.First()) {
+          //            var subtree = child.Content.Root.NodeAt(fragment.Index2);
+          //            var primitive = bTile.GetPrimitive(subtree);
+          //            if (primitive != null) {
+          //              var rpb = primitive as RectangularPrimitiveBase;
+          //              if (rpb != null) {
+          //                rpb.Pen = new Pen(Color.RoyalBlue);
+          //              }
+          //            }
+          //          }
         }
       }