Changeset 10531

Timestamp:

03/05/14 10:51:38 (11 years ago)

Author:

bburlacu

Message:

#2076: SymbolicExpressionTreeChart: initialize layout when the tree node is changed, not when the tree draw method is called.

Location:

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

Files:

• LayoutEngines/ReingoldTilfordLayoutEngine.cs (modified) (1 diff)
• SymbolicExpressionTreeChart.cs (modified) (7 diffs)

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

@@ -72 +72 @@
         Y = (int)Math.Round(x.Y)
       });
+    }
+
+    public IEnumerable<LayoutNode<T>> GetLayoutNodes() {
+      return nodeMap.Values;
     }
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -50 +50 @@
       this.backgroundColor = Color.White;
       this.textFont = new Font(FontFamily.GenericSansSerif, 12);
-      //      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
-      layoutEngine = new BoxesLayoutEngine<ISymbolicExpressionTreeNode> {
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
         NodeWidth = preferredNodeWidth,
         NodeHeight = preferredNodeHeight,
@@ -107 +106 @@
         tree = value;
         if (tree != null) {
+          //the layout engine needs to be initialized here so that the visualNodes and the visualLines dictionaries are populated 
+          InitializeLayout();
           Repaint();
         }
@@ -235 +236 @@
 
     private void SymbolicExpressionTreeChart_MouseMove(object sender, MouseEventArgs e) {
+
       VisualTreeNode<ISymbolicExpressionTreeNode> visualTreeNode = FindVisualSymbolicExpressionTreeNodeAt(e.X, e.Y);
       if (draggedSymbolicExpressionTree != null &&
@@ -260 +262 @@
     #endregion
 
-    #region methods for painting the symbolic expression tree
-    private void DrawFunctionTree(ISymbolicExpressionTree symbExprTree, Graphics graphics, int preferredWidth, int preferredHeight, int minHDistance, int minVDistance) {
-      var root = symbExprTree.Root;
-      var actualRoot = root.SubtreeCount == 1 ? root.GetSubtree(0) : root;
-      layoutEngine.NodeWidth = preferredWidth;
-      layoutEngine.NodeHeight = preferredHeight;
-      layoutEngine.HorizontalSpacing = minHDistance;
-      layoutEngine.VerticalSpacing = minVDistance;
+    private void InitializeLayout() {
+      var actualRoot = tree.Root.SubtreeCount == 1 ? tree.Root.GetSubtree(0) : tree.Root;
       layoutEngine.Initialize(actualRoot, n => n.Subtrees, n => n.GetLength(), n => n.GetDepth());
-      layoutEngine.CalculateLayout(Width, Height);
-
+      layoutEngine.CalculateLayout(this.Width, this.Height);
       var visualNodes = layoutEngine.GetVisualNodes().ToList();
+      //populate the visual nodes and visual connections dictionaries
       visualTreeNodes = visualNodes.ToDictionary(x => x.Content, x => x);
       visualLines = new Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualTreeNodeConnection>();
@@ -279 +275 @@
         }
       }
-      // draw nodes and connections
+    }
+
+    #region methods for painting the symbolic expression tree
+    private void DrawFunctionTree(ISymbolicExpressionTree symbExprTree, Graphics graphics, int preferredWidth, int preferredHeight, int minHDistance, int minVDistance) {
+      //we assume here that the layout has already been initialized when the symbolic expression tree was changed
+      //recalculate layout according to new node widths and spacing
+      layoutEngine.NodeWidth = preferredWidth;
+      layoutEngine.NodeHeight = preferredHeight;
+      layoutEngine.HorizontalSpacing = minHDistance;
+      layoutEngine.VerticalSpacing = minVDistance;
+      layoutEngine.CalculateLayout(Width, Height);
+      var visualNodes = visualTreeNodes.Values;
+      //draw nodes and connections
       foreach (var visualNode in visualNodes) {
         DrawTreeNode(visualNode);
@@ -375 +383 @@
         VerticalSpacing = minVerticalDistance
       };
+      InitializeLayout();
       Repaint();
     }
@@ -385 +394 @@
         VerticalSpacing = minVerticalDistance
       };
+      InitializeLayout();
       Repaint();
     }