Changeset 10561 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines

Timestamp:

03/06/14 15:07:05 (11 years ago)

Author:

bburlacu

Message:

#2076: Updated the way the layout is used in the SymbolicExpressionTreeChart; updated simplifier view accordingly.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines

Files:

• BoxesLayoutEngine.cs (modified) (1 diff)
• ILayoutEngine.cs (modified) (1 diff)
• ReingoldTilfordLayoutEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines/BoxesLayoutEngine.cs

@@ -131 +131 @@
     }
 
+    public IEnumerable<T> GetContentNodes() {
+      return nodeMap.Keys;
+    }
+
     public IEnumerable<VisualTreeNode<T>> GetVisualNodes() {
       return nodeMap.Values;

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines/ILayoutEngine.cs

@@ -22 +22 @@
     Func<T, int> GetDepth { get; set; }
 
+    IEnumerable<T> GetContentNodes();
     IEnumerable<VisualTreeNode<T>> GetVisualNodes();
     Dictionary<T, PointF> GetCoordinates();

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/LayoutEngines/ReingoldTilfordLayoutEngine.cs

@@ -63 +63 @@
         Expand(node);
       }
+    }
+
+    public IEnumerable<T> GetContentNodes() {
+      return nodeMap.Keys;
     }
 
@@ -191 +195 @@
         // reset layout-related parameters 
         layoutNode.Reset();
+        // reset the width and height since they might have been affected by scaling
+        layoutNode.Width = NodeWidth;
+        layoutNode.Height = NodeHeight;
       }
     }