Changeset 10730 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

Timestamp:

04/08/14 17:23:51 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved FragmentGraphView.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

@@ -38 +38 @@
     public int PreferredNodeHeight { get; set; }
 
+    private Size size;
     public Size Size {
-      get {
-        int xmin = 0, ymin = 0, xmax = 0, ymax = 0;
-
-        foreach (var p in Primitives.OfType<RectangularPrimitiveBase>()) {
-          if (xmin > p.LowerLeft.X) xmin = (int)Math.Floor(p.LowerLeft.X);
-          if (xmax < p.UpperRight.X) xmax = (int)Math.Ceiling(p.UpperRight.X);
-          if (ymin > p.LowerLeft.Y) ymin = (int)Math.Floor(p.LowerLeft.Y);
-          if (ymax < p.UpperRight.Y) ymax = (int)Math.Ceiling(p.UpperRight.Y);
-        }
-
-        return new Size(xmax - xmin, ymax - ymin);
-      }
+      private set { size = value; }
+      get { return size; }
     }
 
@@ -123 +114 @@
       LayoutEngine.NodeHeight = PreferredNodeHeight;
 
-      var visualNodes = LayoutEngine.CalculateLayout(actualRoot);
+      var visualNodes = LayoutEngine.CalculateLayout(actualRoot).ToList();
 
       var font = new Font(FontFamily.GenericSansSerif, 10, GraphicsUnit.Pixel);
@@ -157 +148 @@
         }
       }
-
-      // add a bounding rectangle and flip primitives vertically
+      int xmin = 0, ymin = 0, xmax = 0, ymax = 0;
+      foreach (var rpb in Primitives.OfType<RectangularPrimitiveBase>()) {
+        if (xmin > rpb.LowerLeft.X) xmin = (int)Math.Floor(rpb.LowerLeft.X);
+        if (xmax < rpb.UpperRight.X) xmax = (int)Math.Ceiling(rpb.UpperRight.X);
+        if (ymin > rpb.LowerLeft.Y) ymin = (int)Math.Floor(rpb.LowerLeft.Y);
+        if (ymax < rpb.UpperRight.Y) ymax = (int)Math.Ceiling(rpb.UpperRight.Y);
+      }
+      Size = new Size(xmax - xmin, ymax - ymin);
+      var width = Size.Width;
+      var height = Size.Height;
       // draw a rectangle to mark the countour of this tile
-      var size = this.Size;
-      var height = size.Height;
-      var rectangle = new Rectangle(this.Chart, new PointD(0, 0), new PointD(size.Width, size.Height)) {
+      var rectangle = new Rectangle(this.Chart, new PointD(0, 0), new PointD(width, height)) {
         Pen = new Pen(Color.Gray),
         Brush = new SolidBrush(Color.Transparent)
@@ -168 +165 @@
       this.Add(rectangle);
 
+      // flip primitives vertically 
       foreach (var primitive in Primitives) {
         var rpb = primitive as RectangularPrimitiveBase;
         if (rpb != null) {
           rpb.SetPosition(rpb.LowerLeft.X, height - rpb.UpperRight.Y, rpb.UpperRight.X, height - rpb.LowerLeft.Y);
+
         } else {
           var line = primitive as LinearPrimitiveBase;