Changeset 9963 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphTextLabel.cs

Timestamp:

09/13/13 14:42:38 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged changes from the trunk and other branches. Added new ExtendedSymbolicExpressionTreeCanvas control for the visual exploration of tree genealogies. Reorganized some files and folders.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphTextLabel.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphTextLabel.cs

@@ -1 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using HeuristicLab.Visualization;
 using Rectangle = HeuristicLab.Visualization.Rectangle;
@@ -12 +11 @@
     public Font Font { get { return font; } set { font = value; } }
 
-    private Brush brush;
-    public Brush Brush { get { return brush; } set { brush = value; } }
+    private Brush fontBrush;
+    public Brush FontBrush { get { return fontBrush; } set { fontBrush = value; } }
 
     public VisualGenealogyGraphTextLabel(IChart chart, PointD lowerLeft, PointD upperRight)
@@ -34 +33 @@
       float fontSize = s.Height;
       font = new Font(font.Name, fontSize, Font.Style, GraphicsUnit.Pixel);
-      graphics.DrawString(text, font, brush, p.X, p.Y);
+      graphics.DrawString(text, font, fontBrush, p.X, p.Y);
     }
 
-    public EventHandler Update;
-    protected virtual void OnUpdate() {
-      if ((UpdateEnabled) && (Update != null)) {
-        Update(this, new EventArgs());
+    protected override void OnUpdate() {
+      if ((UpdateEnabled)) {
+        base.OnUpdate();
       }
-      base.OnUpdate();
     }
   }