Changeset 10729 for branches

Timestamp:

04/07/14 22:48:28 (11 years ago)

Author:

bburlacu

Message:

#1772: Changed orientation of trees in the SymbolicExpressionTreeTile. Added a graphical bounding rectangle for each tile.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.cs (modified) (1 diff)

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

@@ -157 +157 @@
         }
       }
+
+      // add a bounding rectangle and flip primitives vertically
+      // draw a rectangle to mark the countour of this tile
+      var size = this.Size;
+      var height = size.Height;
+      var rectangle = new Rectangle(this.Chart, new PointD(0, 0), new PointD(size.Width, size.Height)) {
+        Pen = new Pen(Color.Gray),
+        Brush = new SolidBrush(Color.Transparent)
+      };
+      this.Add(rectangle);
+
+      foreach (var primitive in Primitives) {
+        var rpb = primitive as RectangularPrimitiveBase;
+        if (rpb != null) {
+          rpb.SetPosition(rpb.LowerLeft.X, height - rpb.UpperRight.Y, rpb.UpperRight.X, height - rpb.LowerLeft.Y);
+        } else {
+          var line = primitive as LinearPrimitiveBase;
+          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/FragmentGraphView.cs

@@ -29 +29 @@
       InitializeComponent();
 
-      layoutEngine = new ReingoldTilfordLayoutEngine<TileLayoutNode>(n => n.Children);
-      symbolicExpressionEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees);
+      layoutEngine = new ReingoldTilfordLayoutEngine<TileLayoutNode>(n => n.Children) {
+        HorizontalSpacing = 50,
+        VerticalSpacing = 50,
+      };
+      symbolicExpressionEngine = new ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode>(n => n.Subtrees) {
+        HorizontalSpacing = 50,
+        VerticalSpacing = 50,
+        NodeWidth = 80,
+        NodeHeight = 40
+      };
       tileDictionary = new Dictionary<IGenealogyGraphNode<IFragment<ISymbolicExpressionTreeNode>>, TileLayoutNode>();
     }

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

@@ -67 +67 @@
       foreach (var primitive in selectedPrimitives) {
         if (primitive is SymbolicExpressionTreeTile) continue;
-        primitive.Pen = new Pen(Color.Blue);
-        primitive.Pen.Brush = new SolidBrush(Color.Blue);
+        primitive.Pen = new Pen(Color.Blue) { Brush = new SolidBrush(Color.Blue) };
       }
       EnforceUpdate();