Changeset 10565 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

Timestamp:

03/07/14 16:23:41 (11 years ago)

Author:

mkommend

Message:

#2076: Simplified the API of the tree layout engines.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (9 diffs)

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

@@ -27 +27 @@
 using System.Linq;
 using System.Windows.Forms;
-using Point = System.Drawing.Point;
+
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -50 +50 @@
       this.backgroundColor = Color.White;
       this.textFont = new Font(FontFamily.GenericSansSerif, 12);
-      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
+
+      visualTreeNodes = new Dictionary<ISymbolicExpressionTreeNode, VisualTreeNode<ISymbolicExpressionTreeNode>>();
+      visualLines = new Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualTreeNodeConnection>();
+
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees) {
         NodeWidth = preferredNodeWidth,
         NodeHeight = preferredNodeHeight,
@@ -56 +60 @@
         VerticalSpacing = minVerticalDistance
       };
-    }
-
-    private ILayoutEngine<ISymbolicExpressionTreeNode> TreeLayoutEngine {
-      get { return layoutEngine; }
-      set {
-        layoutEngine = value;
-        InitializeLayout();
-        Repaint();
-      }
-    }
+      reingoldTilfordToolStripMenuItem.Checked = true;
+    }
+
+    //private ILayoutEngine<ISymbolicExpressionTreeNode> TreeLayoutEngine {
+    //  get { return layoutEngine; }
+    //  set {
+    //    layoutEngine = value;
+    //    InitializeLayout();
+    //    Repaint();
+    //  }
+    //}
 
     public SymbolicExpressionTreeChart(ISymbolicExpressionTree tree)
@@ -114 +119 @@
       set {
         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();
-        }
+        Repaint();
       }
     }
@@ -285 +286 @@
     #endregion
 
-    #region initialize the layout
-    private void InitializeLayout() {
+    private void CalculateLayout(int preferredWidth, int preferredHeight, int minHDistance, int minVDistance) {
+      layoutEngine.NodeWidth = preferredWidth;
+      layoutEngine.NodeHeight = preferredHeight;
+      layoutEngine.HorizontalSpacing = minHDistance;
+      layoutEngine.VerticalSpacing = minVDistance;
+
       var actualRoot = tree.Root;
       if (actualRoot.Symbol is ProgramRootSymbol && actualRoot.SubtreeCount == 1) {
         actualRoot = tree.Root.GetSubtree(0);
       }
-      layoutEngine.Initialize(actualRoot, n => n.Subtrees, n => n.GetLength(), n => n.GetDepth());
-      layoutEngine.CalculateLayout(this.Width, this.Height);
-      UpdateDictionaries();
-    }
-
-    private void UpdateDictionaries() {
-      var visualNodes = layoutEngine.GetVisualNodes().ToList();
-      //populate the visual nodes and visual connections dictionaries
+
+      var visualNodes = layoutEngine.CalculateLayout(actualRoot, Width, Height).ToList();
       visualTreeNodes = visualNodes.ToDictionary(x => x.Content, x => x);
       visualLines = new Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualTreeNodeConnection>();
@@ -307 +306 @@
       }
     }
-    #endregion
+
     #region methods for painting the symbolic expression tree
     private void DrawFunctionTree(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);
-      UpdateDictionaries();//this will reset the visual nodes, therefore colors will be reset to default values
+      CalculateLayout(preferredWidth, preferredHeight, minHDistance, minVDistance);
       var visualNodes = visualTreeNodes.Values;
       //draw nodes and connections
@@ -420 +412 @@
 
     private void reingoldTilfordToolStripMenuItem_Click(object sender, EventArgs e) {
-      TreeLayoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
+      layoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees) {
         NodeWidth = preferredNodeWidth,
         NodeHeight = preferredNodeHeight,
@@ -426 +418 @@
         VerticalSpacing = minVerticalDistance
       };
+      reingoldTilfordToolStripMenuItem.Checked = true;
+      boxesToolStripMenuItem.Checked = false;
+      Repaint();
     }
 
     private void boxesToolStripMenuItem_Click(object sender, EventArgs e) {
-      TreeLayoutEngine = new BoxesLayoutEngine<ISymbolicExpressionTreeNode> {
+      layoutEngine = new BoxesLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees, n => n.GetLength(), n => n.GetDepth()) {
         NodeWidth = preferredNodeWidth,
         NodeHeight = preferredNodeHeight,
@@ -435 +430 @@
         VerticalSpacing = minVerticalDistance
       };
+      reingoldTilfordToolStripMenuItem.Checked = false;
+      boxesToolStripMenuItem.Checked = true;
+      Repaint();
     }
   }