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

Timestamp:

04/14/14 17:15:32 (10 years ago)

Author:

bburlacu

Message:

#1772: Small improvements to FragmentGraphView, moved tracking classes to separate folder.

Location:

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

Files:

• . (added)
• FragmentGraphView.cs (moved) (moved from branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs) (5 diffs)

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

@@ -13 +13 @@
   [Content(typeof(IGenealogyGraph<IFragment<ISymbolicExpressionTreeNode>>), IsDefaultView = true)]
   public sealed partial class FragmentGraphView : ItemView {
-    private int PreferredSpacing = 50;
+    private const int PreferredHorizontalSpacing = 10;
+    private const int PreferredVerticalSpacing = 25;
 
     private ReingoldTilfordLayoutEngine<TileLayoutNode> layoutEngine;
@@ -31 +32 @@
 
       layoutEngine = new ReingoldTilfordLayoutEngine<TileLayoutNode>(n => n.Children) {
-        HorizontalSpacing = 50,
-        VerticalSpacing = 50,
+        HorizontalSpacing = PreferredHorizontalSpacing,
+        VerticalSpacing = PreferredVerticalSpacing,
       };
       symbolicExpressionEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees) {
-        HorizontalSpacing = 50,
-        VerticalSpacing = 50,
+        HorizontalSpacing = PreferredHorizontalSpacing,
+        VerticalSpacing = PreferredVerticalSpacing,
         NodeWidth = 80,
         NodeHeight = 40
@@ -74 +75 @@
       layoutEngine.NodeWidth = maxTileWidth;
       layoutEngine.NodeHeight = maxTileHeight;
-      layoutEngine.HorizontalSpacing = PreferredSpacing;
-      layoutEngine.VerticalSpacing = PreferredSpacing;
+      layoutEngine.HorizontalSpacing = PreferredHorizontalSpacing;
+      layoutEngine.VerticalSpacing = PreferredVerticalSpacing;
 
       var visualNodes = layoutEngine.CalculateLayout(fragmentRoot);
@@ -92 +93 @@
         var aPos = aTile.Position;
 
-        var lowerLeftMarker = new FixedSizeCircle(chart, aTile.Position, 5, new Pen(Color.Red), new SolidBrush(Color.Transparent));
-        var upperRightMarker = new FixedSizeCircle(chart, new PointD(aPos.X + aSize.Width, aPos.Y + aSize.Height), 5,
-          new Pen(Color.Blue), new SolidBrush(Color.Transparent));
-        symbolicExpressionChartControl.Add(lowerLeftMarker); symbolicExpressionChartControl.Add(upperRightMarker);
+        // mark swapped fragment
+        if (node.Content.Index != 0) {
+          var subtree = node.Content.Root.NodeAt(node.Content.Index);
+          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);
+              }
+            }
+          }
+        }
+
+        // mark the subtree that was replaced by the fragment
+        if (node.Children.Any() && node.Content.Index != 0) {
+          var child = node.Children.First();
+          {
+            var subtree = child.Content.Root.NodeAt(node.Content.Index);
+            var tile = tileDictionary[child].Tile;
+            foreach (var s in subtree.IterateNodesPrefix()) {
+              var primitive = tile.GetPrimitive(s);
+              if (primitive != null) {
+                var rpb = primitive as RectangularPrimitiveBase;
+                if (rpb != null) {
+                  rpb.Pen = new Pen(Color.DarkOrange);
+                }
+              }
+            }
+          }
+        }
 
         foreach (var child in node.Children) {
@@ -104 +132 @@
           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));
           symbolicExpressionChartControl.Add(line);
+
+
         }
       }
-      //      symbolicExpressionChartControl.FlipVertical();
       symbolicExpressionChartControl.UpdateEnabled = true;
       symbolicExpressionChartControl.EnforceUpdate();