Changeset 9993

Timestamp:

09/19/13 14:24:47 (11 years ago)

Author:

bburlacu

Message:

#2076: Improved tree aspect by calculating maximum visual node width per level.

File:

• branches/HeuristicLab.ReingoldTilfordTreeLayout/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (2 diffs)

branches/HeuristicLab.ReingoldTilfordTreeLayout/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -277 +277 @@
       layoutEngine.CalculateLayout();
       var bounds = layoutEngine.Bounds();
-      double sx = this.Width / bounds.Width;
+      double sx = this.Width / (bounds.Width + preferredWidth);
       if (sx > 1) sx = 1;
-      double sy = this.Height / bounds.Height;
+      double sy = this.Height / (bounds.Height + preferredHeight);
       if (sy > 1) sy = 1;
-      double dx = (this.Width - bounds.Width) / 2;
+      double dx = (this.Width - bounds.Width + preferredWidth) / 2;
       if (dx < 0) dx = 0;
-      double dy = (this.Height - bounds.Height) / 2;
+      double dy = (this.Height - bounds.Height + preferredHeight) / 2;
       if (dy < 0) dy = 0;
-      var levels = layoutEngine.Nodes.GroupBy(n => n.Value.Level, n => n.Value);
+
+      var levels = layoutNodes.GroupBy(n => n.Level, n => n);
 
       foreach (var level in levels) {
-        double width = (level.Max(n => n.X) - level.Min(n => n.X) + preferredWidth);
-        double ssx = this.Width / width;
-        if (ssx > 1) ssx = 1;
+        var nodes = level.ToList();
+        double min = 0;
+        for (int i = 0; i < nodes.Count - 1; ++i) {
+          var w = (nodes[i + 1].X - nodes[i].X) * sx - preferredWidth;
+          if (w < min) min = w;
+        }
+        if (min > 0) min = 0;
+
         foreach (var layoutNode in level) {
-          var node = layoutNode.Content;
-          var visualNode = visualTreeNodes[node];
-          visualNode.Width = (int)Math.Round(preferredWidth * ssx);
+          var visualNode = visualTreeNodes[layoutNode.Content];
+          visualNode.Width = (int)Math.Round(preferredWidth + min) - 2; // -2 to allow enough padding (1px on each side) for the node contour to be drawn
           visualNode.Height = (int)Math.Round(preferredHeight * sy);
           visualNode.X = (int)(Math.Round(layoutNode.X * sx + dx));
@@ -301 +306 @@
         }
       }
+
       graphics.ResetClip(); // reset clip region
+      // draw node connections
       foreach (var visualNode in visualTreeNodes.Values) {
         var node = visualNode.SymbolicExpressionTreeNode;