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

Timestamp:

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

Author:

bburlacu

Message:

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

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicExpressionChartControl.cs (modified) (4 diffs)

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();
     }
   }