Changeset 10517 for branches/HeuristicLab.EvolutionTracking

Timestamp:

02/26/14 02:19:58 (10 years ago)

Author:

bburlacu

Message:

#1772: Got the lineageExplorerChart to display symbolic expression trees with the correct orientation (vertically flipped).

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerChart.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerView.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

@@ -25 +25 @@
 using HeuristicLab.Visualization;
 using HeuristicLab.Visualization.Primitives;
-using Rectangle = HeuristicLab.Visualization.Rectangle;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -56 +55 @@
       LayoutEngine.CalculateLayout();
 
-      var primitivesMap = new Dictionary<LayoutNode<ISymbolicExpressionTreeNode>, LabeledPrimitive>(); // both Ellipse and Rectangle are derived from the RectangularPrimitiveBase
+      var primitivesMap = new Dictionary<LayoutNode<ISymbolicExpressionTreeNode>, IPrimitive>(); // both Ellipse and Rectangle are derived from the RectangularPrimitiveBase
       var font = new Font(FontFamily.GenericSansSerif, 10, GraphicsUnit.Pixel);
 
       foreach (var node in layoutNodes) {
-        LabeledPrimitive labeledPrimitive;
-        if (node.Children == null || node.Children.Count == 0) {
-          var rectangle = new Rectangle(Chart, node.X, node.Y, node.X + preferredNodeWidth, node.Y + preferredNodeHeight);
-          var textPrimitive = new TextPrimitive(Chart, rectangle.LowerLeft, rectangle.UpperRight) {
-            Font = font,
-            Text = node.Content.ToString()
-          };
-          labeledPrimitive = new LabeledPrimitive(Chart, rectangle, textPrimitive);
+        var lowerLeft = new PointD(node.X, node.Y);
+        var upperRight = new PointD(node.X + preferredNodeWidth, node.Y + preferredNodeHeight);
+
+        RectangularPrimitiveBase rectangularPrimitive;
+        if (node.IsLeaf) {
+          rectangularPrimitive = new LabeledRectangle(Chart, lowerLeft, upperRight) { Font = font, Text = node.Content.ToString() };
         } else {
-          var ellipse = new Ellipse(Chart, node.X, node.Y, node.X + preferredNodeWidth, node.Y + preferredNodeHeight);
-          var textPrimitive = new TextPrimitive(Chart, ellipse.LowerLeft, ellipse.UpperRight) {
-            Font = font,
-            Text = node.Content.ToString()
-          };
-          labeledPrimitive = new LabeledPrimitive(Chart, ellipse, textPrimitive);
+          rectangularPrimitive = new LabeledEllipse(Chart, lowerLeft, upperRight) { Font = font, Text = node.Content.ToString() };
         }
-        this.Add(labeledPrimitive);
-        primitivesMap.Add(node, labeledPrimitive);
+
+        this.Add(rectangularPrimitive);
+        primitivesMap.Add(node, rectangularPrimitive);
       }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerChart.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Drawing;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.Visualization;
 
@@ -7 +8 @@
     public SymbolicDataAnalysisExpressionLineageExplorerChart() {
       InitializeComponent();
-      if (Chart == null) {
-        Chart = new Chart(0, 0, PreferredSize.Width, PreferredSize.Height);
-      }
+      if (Chart == null) { Chart = new Chart(0, 0, PreferredSize.Width, PreferredSize.Height); }
     }
 
@@ -27 +26 @@
       Chart.Group.Draw(graphics);
     }
+
+    public bool UpdateEnabled {
+      get { return Chart.UpdateEnabled; }
+      set { Chart.UpdateEnabled = value; }
+    }
+
+    public void EnforceUpdate() {
+      Chart.EnforceUpdate();
+    }
+
+    public void FlipVertical() {
+      foreach (var primitive in Chart.Group.Primitives) {
+        var tile = primitive as SymbolicExpressionTreeTile;
+        if (tile != null) {
+          foreach (var p in tile.Primitives) {
+            FlipPrimitive(p);
+          }
+        } else {
+          FlipPrimitive(primitive);
+        }
+      }
+    }
+
+    public void FlipPrimitive(IPrimitive primitive) {
+      var height = pictureBox.Height;
+      var rect = primitive as RectangularPrimitiveBase;
+      var line = primitive as LinearPrimitiveBase;
+      if (rect != null) {
+        rect.SetPosition(rect.LowerLeft.X, height - rect.UpperRight.Y, rect.UpperRight.X, height - rect.LowerLeft.Y);
+      } else if (line != null) {
+        line.SetPosition(line.Start.X, height - line.Start.Y, line.End.X, height - line.End.Y);
+      }
+    }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerView.Designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       this.treeView = new System.Windows.Forms.TreeView();
-      this.symbolicDataAnalysisExpressionLineageExplorerChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.SymbolicDataAnalysisExpressionLineageExplorerChart();
+      this.lineageExplorerChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.SymbolicDataAnalysisExpressionLineageExplorerChart();
       this.SuspendLayout();
       // 
@@ -38 +38 @@
       this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
       // 
-      // symbolicDataAnalysisExpressionLineageExplorerChart
+      // lineageExplorerChart
       // 
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+      this.lineageExplorerChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.AutoSize = true;
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.BackColor = System.Drawing.SystemColors.Control;
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.Chart = null;
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.Location = new System.Drawing.Point(176, 3);
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.Name = "symbolicDataAnalysisExpressionLineageExplorerChart";
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.ScaleOnResize = true;
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.Size = new System.Drawing.Size(657, 593);
-      this.symbolicDataAnalysisExpressionLineageExplorerChart.TabIndex = 1;
+      this.lineageExplorerChart.AutoSize = true;
+      this.lineageExplorerChart.BackColor = System.Drawing.SystemColors.Control;
+      this.lineageExplorerChart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.lineageExplorerChart.Chart = null;
+      this.lineageExplorerChart.Location = new System.Drawing.Point(176, 3);
+      this.lineageExplorerChart.Name = "lineageExplorerChart";
+      this.lineageExplorerChart.ScaleOnResize = true;
+      this.lineageExplorerChart.Size = new System.Drawing.Size(657, 593);
+      this.lineageExplorerChart.TabIndex = 1;
       // 
       // SymbolicDataAnalysisExpressionLineageExplorerView
@@ -57 +57 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.symbolicDataAnalysisExpressionLineageExplorerChart);
+      this.Controls.Add(this.lineageExplorerChart);
       this.Controls.Add(this.treeView);
       this.DoubleBuffered = true;
@@ -70 +70 @@
 
     private System.Windows.Forms.TreeView treeView;
-    private SymbolicDataAnalysisExpressionLineageExplorerChart symbolicDataAnalysisExpressionLineageExplorerChart;
+    private SymbolicDataAnalysisExpressionLineageExplorerChart lineageExplorerChart;
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerView.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Drawing.Text;
 using System.Globalization;
 using System.Linq;
@@ -15 +14 @@
   [Content(typeof(IGenealogyGraph), false)]
   public partial class SymbolicDataAnalysisExpressionLineageExplorerView : AsynchronousContentView {
-    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> SymbolicExpressionTreeNodeLayoutEngine;
-    private readonly SymbolicExpressionTreeLayoutAdapter SymbolicExpressionTreeLayoutAdapter;
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> symbolicExpressionTreeNodeLayoutEngine;
+    private readonly SymbolicExpressionTreeLayoutAdapter symbolicExpressionTreeLayoutAdapter;
 
-    private readonly Dictionary<TreeNode, ISymbolicExpressionTree> TreeMap;
+    private readonly Dictionary<TreeNode, ISymbolicExpressionTree> treeMap;
 
     private const int MinHorizontalSpacing = 50;
@@ -32 +31 @@
     public SymbolicDataAnalysisExpressionLineageExplorerView() {
       InitializeComponent();
-      SymbolicExpressionTreeNodeLayoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
+      symbolicExpressionTreeNodeLayoutEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> {
         MinHorizontalSpacing = MinHorizontalSpacing + PreferredNodeWidth,
         MinVerticalSpacing = MinVerticalSpacing + PreferredNodeHeight
       };
-      SymbolicExpressionTreeLayoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
-      TreeMap = new Dictionary<TreeNode, ISymbolicExpressionTree>();
-      double width = symbolicDataAnalysisExpressionLineageExplorerChart.PreferredSize.Width;
-      double height = symbolicDataAnalysisExpressionLineageExplorerChart.PreferredSize.Height;
-      if (symbolicDataAnalysisExpressionLineageExplorerChart.Chart == null) {
-        symbolicDataAnalysisExpressionLineageExplorerChart.Chart = new Chart(0, 0, width, height);
+      symbolicExpressionTreeLayoutAdapter = new SymbolicExpressionTreeLayoutAdapter();
+      treeMap = new Dictionary<TreeNode, ISymbolicExpressionTree>();
+      double width = lineageExplorerChart.PreferredSize.Width;
+      double height = lineageExplorerChart.PreferredSize.Height;
+      if (lineageExplorerChart.Chart == null) {
+        lineageExplorerChart.Chart = new Chart(0, 0, width, height);
       }
     }
@@ -60 +59 @@
     private void updateTreeView() {
       var lastGen = Content.Ranks.OrderBy(x => x.Key).Last().Value.ToList();
-      TreeMap.Clear();
-      symbolicDataAnalysisExpressionLineageExplorerChart.Clear();
+      treeMap.Clear();
+      lineageExplorerChart.Clear();
       foreach (var g in lastGen) {
         var treeNode = new TreeNode(g.Quality.ToString(CultureInfo.InvariantCulture));
         treeView.Nodes.Add(treeNode);
-        TreeMap.Add(treeNode, (ISymbolicExpressionTree)g.Content);
+        treeMap.Add(treeNode, (ISymbolicExpressionTree)g.Content);
       }
     }
 
     private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
-      symbolicDataAnalysisExpressionLineageExplorerChart.Clear();
+      lineageExplorerChart.Clear();
       var selectedNode = treeView.SelectedNode;
-      var symbolicExpressionTree = TreeMap[selectedNode];
-      var tile = new SymbolicExpressionTreeTile(this.symbolicDataAnalysisExpressionLineageExplorerChart.Chart) {
-        LayoutAdapter = SymbolicExpressionTreeLayoutAdapter,
-        LayoutEngine = SymbolicExpressionTreeNodeLayoutEngine,
+      var symbolicExpressionTree = treeMap[selectedNode];
+      var chart = lineageExplorerChart.Chart;
+      var tile = new SymbolicExpressionTreeTile(chart) {
+        LayoutAdapter = symbolicExpressionTreeLayoutAdapter,
+        LayoutEngine = symbolicExpressionTreeNodeLayoutEngine,
         PreferredNodeWidth = PreferredNodeWidth,
-        PreferredNodeHeight = PreferredNodeHeight
+        PreferredNodeHeight = PreferredNodeHeight,
+        SymbolicExpressionTree = symbolicExpressionTree
       };
-      tile.SymbolicExpressionTree = symbolicExpressionTree;
-      symbolicDataAnalysisExpressionLineageExplorerChart.Add(tile);
-
-      //      graphics.TranslateTransform(0, symbolicDataAnalysisExpressionLineageExplorerChart.Height);
-      //      graphics.ScaleTransform(1f, -1f); // flip vertically (because the visualization plugin is upside-down
-      //      graphics.RotateTransform(180F);
-      var graphics = symbolicDataAnalysisExpressionLineageExplorerChart.CreateGraphics();
-      graphics.ScaleTransform(1f, -1f); // flip vertically (because the visualization plugin is upside-down
-      graphics.TextRenderingHint = TextRenderingHint.AntiAlias;
-      symbolicDataAnalysisExpressionLineageExplorerChart.Draw(graphics);
+      lineageExplorerChart.UpdateEnabled = false;
+      lineageExplorerChart.Add(tile);
+      lineageExplorerChart.FlipVertical();
+      lineageExplorerChart.UpdateEnabled = true;
+      lineageExplorerChart.EnforceUpdate();
     }
   }