Changeset 1038 for trunk/sources/HeuristicLab.Visualization/XAxis.cs

Timestamp:

12/18/08 23:17:23 (16 years ago)

Author:

mstoeger

Message:

Modified the XAxis labels so they are always visible at the bottom. (#433)
Added simple layout management to the line chart's root shape containing a title-, lines- and xaxis-area. (#345)

File:

• trunk/sources/HeuristicLab.Visualization/XAxis.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/XAxis.cs

@@ -5 +5 @@
   // TODO move to own file
   public class TextShape : IShape {
-    private readonly double x;
-    private readonly double y;
+    private double x;
+    private double y;
     private string text;
 
-    private Font font = new Font("Arial", 8);
-    private Brush brush = new SolidBrush(Color.Blue);
+    private Font font;
+    private Color color;
+    private Brush brush;
 
-    public TextShape(double x, double y, string text) {
+    public TextShape(double x, double y, string text) : this(x, y, text, 8) {}
+
+    public TextShape(double x, double y, string text, int fontSize) {
       this.x = x;
       this.y = y;
       this.text = text;
+      this.font = new Font("Arial", fontSize);
+
+      this.Color = Color.Blue;
     }
 
@@ -33 +39 @@
       set { text = value; }
     }
+
+    public double X {
+      get { return x; }
+      set { x = value; }
+    }
+
+    public double Y {
+      get { return y; }
+      set { y = value; }
+    }
+
+    public Color Color {
+      get { return color; }
+      set {
+        this.color = value;
+        this.brush = new SolidBrush(color);
+      }
+    }
   }
 
-  public class XAxis : CompositeShape {
-    private readonly List<TextShape> labels = new List<TextShape>();
-    private readonly LineShape axisLine = new LineShape(0, 0, 0, 0, 0, Color.Black, 1, DrawingStyle.Solid);
+  public class XAxis : WorldShape {
+    private readonly IDictionary<int, TextShape> labels = new Dictionary<int, TextShape>();
+
+    public XAxis(RectangleD clippingArea, RectangleD boundingBox)
+      : base(clippingArea, boundingBox) {}
 
     public void ClearLabels() {
-      shapes.Clear();
       labels.Clear();
+    }
 
-      shapes.Add(axisLine);
+    public void SetLabel(int i, string text) {
+      labels[i] = new TextShape(i, 0, text);
     }
 
     public override void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
-      axisLine.X1 = Transform.ToWorldX(viewport.Left, viewport, clippingArea);
-      axisLine.X2 = Transform.ToWorldX(viewport.Right, viewport, clippingArea);
+      shapes.Clear();
+
+      for (int i = (int)(ClippingArea.X1 - 1); i <= ClippingArea.X2 + 1; i++) {
+        TextShape label;
+
+        if (labels.ContainsKey(i)) {
+          label = labels[i];
+        } else {
+          label = new TextShape(i, 0, i.ToString());
+        }
+
+        label.Y = ClippingArea.Height - 3;
+
+        shapes.Add(label);
+      }
 
       base.Draw(graphics, viewport, clippingArea);
     }
-
-    public void SetLabel(int i, string text) {
-      while (i >= labels.Count) {
-        TextShape label = new TextShape(i, 0, i.ToString());
-        labels.Add(label);
-        AddShape(label);
-      }
-      labels[i].Text = text;
-    }
   }
 }