Changeset 15351 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines

Timestamp:

09/06/17 20:51:26 (7 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes, add a couple of convenience parameters to the SchemaCreator.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Files:

• . (modified) (1 prop)
• 3.4/LayoutEngines/ReingoldTilfordLayoutEngine.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines/ReingoldTilfordLayoutEngine.cs

@@ -60 +60 @@
       SecondWalk(layoutRoot, -layoutRoot.Prelim);
       NormalizeCoordinates(layoutNodeMap.Values);
-      if (height != 0 && width != 0) {
+      if (width > 0 && height > 0) {
         FitToBounds(width, height, layoutNodeMap.Values);
         Center(width, height, layoutNodeMap.Values);
@@ -178 +178 @@
         if (ymax < y) ymax = y;
       }
-      return new RectangleF(xmin, ymin, xmax + minHorizontalSpacing + NodeWidth, ymax + minVerticalSpacing + NodeHeight);
+      return new RectangleF(xmin, ymin, xmax + NodeWidth, ymax + NodeHeight);
     }