Changeset 10728 for branches

Timestamp:

04/07/14 17:05:31 (11 years ago)

Author:

bburlacu

Message:

#1772: Improved aspect of visual components of the FragmentGraphView.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisExpressionLineageExplorerView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.cs (modified) (4 diffs)

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

@@ -35 +35 @@
   /// </summary>
   public class SymbolicExpressionTreeTile : Group {
-    public double PreferredNodeWidth { get; set; }
-    public double PreferredNodeHeight { get; set; }
+    public int PreferredNodeWidth { get; set; }
+    public int PreferredNodeHeight { get; set; }
 
     public Size Size {
@@ -119 +119 @@
       var actualRoot = Root;
       if (Root.Symbol is ProgramRootSymbol && Root.SubtreeCount == 1) { actualRoot = Root.GetSubtree(0); }
+
+      LayoutEngine.NodeWidth = PreferredNodeWidth;
+      LayoutEngine.NodeHeight = PreferredNodeHeight;
+
       var visualNodes = LayoutEngine.CalculateLayout(actualRoot);
 
@@ -139 +143 @@
         this.Add(rectangularPrimitive);
 
-        //        int x = Position.X, y = Position.Y;
-        //        if (x > rectangularPrimitive.LowerLeft.X) {
-        //          x = (int)Math.Floor(rectangularPrimitive.LowerLeft.X);
-        //        }
-        //        if (y > rectangularPrimitive.LowerLeft.Y) {
-        //          y = (int)Math.Floor(rectangularPrimitive.LowerLeft.Y);
-        //        }
-        //        Position = new Point(x, y);
-        //        int w = Size.Width, h = Size.Height;
-
-
         if (rectangularPrimitive.Size.Width.IsAlmost(0) || rectangularPrimitive.Size.Height.IsAlmost(0)) {
           throw new Exception("Primitive size cannot be zero.");

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

@@ -54 +54 @@
 
       var fragmentRoot = tileDictionary[root];
+      int maxTileWidth = 0, maxTileHeight = 0;
+      foreach (var tile in Content.Nodes.Select(x => tileDictionary[x].Tile)) {
+        var size = tile.Size;
+        if (maxTileWidth < size.Width) maxTileWidth = size.Width;
+        if (maxTileHeight < size.Height) maxTileHeight = size.Height;
+      }
+      layoutEngine.NodeWidth = maxTileWidth;
+      layoutEngine.NodeHeight = maxTileHeight;
+      layoutEngine.HorizontalSpacing = PreferredSpacing;
+      layoutEngine.VerticalSpacing = PreferredSpacing;
+
       var visualNodes = layoutEngine.CalculateLayout(fragmentRoot);
 
@@ -62 +73 @@
         symbolicExpressionChartControl.Add(tile);
       }
+      //      symbolicExpressionChartControl.FlipVertical();
       symbolicExpressionChartControl.UpdateEnabled = true;
       symbolicExpressionChartControl.EnforceUpdate();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -231 +231 @@
       <DependentUpon>SymboldDataAnalysisGenealogyView.cs</DependentUpon>
     </Compile>
-    <Compile Include="SymbolicDataAnalysisExpressionGenealogyGraphChart.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="SymbolicDataAnalysisExpressionGenealogyGraphChart.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionGenealogyGraphChart.Designer.cs">
       <DependentUpon>SymbolicDataAnalysisExpressionGenealogyGraphChart.cs</DependentUpon>

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

@@ -81 +81 @@
       symbolicExpressionChartControl.UpdateEnabled = false;
       symbolicExpressionChartControl.Add(tile);
-      symbolicExpressionChartControl.FlipVertical();
+      //      symbolicExpressionChartControl.FlipVertical();
       symbolicExpressionChartControl.UpdateEnabled = true;
       symbolicExpressionChartControl.EnforceUpdate();

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+      this.SuspendLayout();
+      // 
+      // SymbolicExpressionChartControl
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.DoubleBuffered = true;
+      this.Name = "SymbolicExpressionChartControl";
+      this.Controls.SetChildIndex(this.pictureBox, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+      this.ResumeLayout(false);
+
     }
 

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

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
@@ -25 +27 @@
 
     public void Draw(Graphics graphics) {
+      graphics.SmoothingMode = SmoothingMode.HighQuality;
       Chart.Group.Draw(graphics);
     }
@@ -38 +41 @@
 
     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);
-        }
+      foreach (var p in Chart.Group.Primitives.OfType<SymbolicExpressionTreeTile>().SelectMany(x => x.Primitives)) {
+        FlipPrimitive(p);
       }
     }
@@ -67 +63 @@
 
       var selectedPrimitives = Chart.GetAllPrimitives(point);
-      // first primitive in the list should be the tile, the second one should be the actual primitive representing a tree node
-      var tile = (SymbolicExpressionTreeTile)selectedPrimitives[0];
-      var selectedPrimitive = (RectangularPrimitiveBase)selectedPrimitives[1];
-      var tree = tile.SymbolicExpressionTree; // use the tree to get the genealogy graph node and the fragments used for tracing building blocks
+      if (!selectedPrimitives.Any()) return;
 
-      var pen = new Pen(Color.Blue);
-      using (var g = Graphics.FromImage(pictureBox.Image)) {
-        g.DrawRectangle(pen, (float)selectedPrimitive.LowerLeft.X, (float)selectedPrimitive.LowerLeft.Y, (float)selectedPrimitive.Size.Width, (float)selectedPrimitive.Size.Height);
+      foreach (var primitive in selectedPrimitives) {
+        if (primitive is SymbolicExpressionTreeTile) continue;
+        primitive.Pen = new Pen(Color.Blue);
+        primitive.Pen.Brush = new SolidBrush(Color.Blue);
       }
+      EnforceUpdate();
     }
   }