Changeset 1182 for trunk/sources

Timestamp:

01/27/09 23:50:10 (16 years ago)

Author:

mstoeger

Message:

Implemented X/Y-Axes and a Grid. (#433)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• ChartDataRowsModel.cs (modified) (1 diff)
• DefaultLabelProvider.cs (added)
• Grid.cs (added)
• HeuristicLab.Visualization.csproj (modified) (2 diffs)
• ILabelProvider.cs (added)
• LineChart.cs (modified) (8 diffs)
• TextShape.cs (modified) (4 diffs)
• WorldShape.cs (modified) (1 diff)
• XAxis.cs (modified) (2 diffs)
• YAxis.cs (added)

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModel.cs

@@ -12 +12 @@
 
   public class ChartDataRowsModel : ChartDataModelBase, IChartDataRowsModel{
-    private string title;
+    private string title = "Title";
     private string xAxisLabel;
 

trunk/sources/HeuristicLab.Visualization/HeuristicLab.Visualization.csproj

@@ -81 +81 @@
     <Compile Include="CompositeShape.cs" />
     <Compile Include="ChartDataRowsModelDataCollector.cs" />
+    <Compile Include="DefaultLabelProvider.cs" />
+    <Compile Include="Grid.cs" />
+    <Compile Include="ILabelProvider.cs" />
     <Compile Include="IMouseEventListener.cs" />
     <Compile Include="PanListener.cs" />
@@ -109 +112 @@
     <Compile Include="WorldShape.cs" />
     <Compile Include="XAxis.cs" />
+    <Compile Include="YAxis.cs" />
     <Compile Include="ZoomListener.cs" />
   </ItemGroup>

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.Visualization {
-  public class LinesShape : WorldShape {
-    private readonly RectangleShape background = new RectangleShape(0, 0, 1, 1, Color.FromArgb(240, 240, 240));
-
-    public LinesShape(RectangleD clippingArea, RectangleD boundingBox)
-      : base(clippingArea, boundingBox) {
-      AddShape(background);
-    }
-
-    public override void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
-      UpdateLayout();
-      base.Draw(graphics, viewport, clippingArea);
-    }
-
-    private void UpdateLayout() {
-      background.Rectangle = ClippingArea;
-    }
-  }
+  public class LinesShape : WorldShape { }
 
   public partial class LineChart : ViewBase {
@@ -37 +21 @@
 
     private readonly XAxis xAxis;
+    private readonly YAxis yAxis;
+    private readonly Grid grid;
 
     /// <summary>
@@ -56 +42 @@
       //TODO: correct Rectangle to fit
 
-      RectangleD dummy = new RectangleD(0, 0, 1, 1);
-
-      root = new WorldShape(dummy, dummy);
-
-      linesShape = new LinesShape(dummy, dummy);
+      root = new WorldShape();
+
+      grid = new Grid();
+      root.AddShape(grid);
+
+      linesShape = new LinesShape();
       root.AddShape(linesShape);
 
@@ -69 +56 @@
       root.AddShape(legendShape);
 
-      xAxis = new XAxis(dummy, dummy);
+      xAxis = new XAxis();
       root.AddShape(xAxis);
 
-      titleShape = new TextShape(0, 0, "Title", 15);
+      yAxis = new YAxis();
+      root.AddShape(yAxis);
+
+      titleShape = new TextShape(0, 0, model.Title, 15);
       root.AddShape(titleShape);
 
@@ -100 +90 @@
       titleShape.Y = canvas.Height - 10;
 
-      linesShape.BoundingBox = new RectangleD(0, 20, canvas.Width, canvas.Height);
+      const int yAxisWidth = 100;
+      const int xAxisHeight = 20;
+
+      linesShape.BoundingBox = new RectangleD(yAxisWidth,
+                                              xAxisHeight,
+                                              canvas.Width,
+                                              canvas.Height);
+      
+      grid.BoundingBox = linesShape.BoundingBox;
+
+      yAxis.BoundingBox = new RectangleD(0,
+                                         linesShape.BoundingBox.Y1,
+                                         linesShape.BoundingBox.X1,
+                                         linesShape.BoundingBox.Y2);
 
       xAxis.BoundingBox = new RectangleD(linesShape.BoundingBox.X1,
@@ -170 +173 @@
     private void SetLineClippingArea(RectangleD clippingArea) {
       linesShape.ClippingArea = clippingArea;
+      
+      grid.ClippingArea = linesShape.ClippingArea;
+
       xAxis.ClippingArea = new RectangleD(linesShape.ClippingArea.X1,
                                           xAxis.BoundingBox.Y1,
                                           linesShape.ClippingArea.X2,
                                           xAxis.BoundingBox.Y2);
+      
+      yAxis.ClippingArea = new RectangleD(yAxis.BoundingBox.X1,
+                                          linesShape.ClippingArea.Y1,
+                                          yAxis.BoundingBox.X2,
+                                          linesShape.ClippingArea.Y2);
     }
 
@@ -206 +217 @@
     // TODO use action parameter
     private void OnRowValueChanged(IDataRow row, double value, int index, Action action) {
-      xAxis.SetLabel(index, index.ToString());
-
       List<LineShape> lineShapes = rowToLineShapes[row];
       maxDataValue = Math.Max(value, maxDataValue);
@@ -248 +257 @@
     }
 
-    private void OnModelChanged() {}
+    private void OnModelChanged() {
+      titleShape.Text = model.Title;
+
+      Invalidate();
+    }
 
     #endregion

trunk/sources/HeuristicLab.Visualization/TextShape.cs

@@ -1 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 
 namespace HeuristicLab.Visualization {
+  public enum AnchorPositionX {
+    Left, Middle, Right
+  }
+
+  public enum AnchorPositionY {
+    Bottom, Middle, Top
+  }
+
   public class TextShape : IShape {
     private Font font;
@@ -9 +18 @@
     private double x;
     private double y;
+
+    private AnchorPositionX anchorPositionX = AnchorPositionX.Left;
+    private AnchorPositionY anchorPositionY = AnchorPositionY.Top;
 
     public TextShape(double x, double y, string text) : this(x, y, text, 8) {}
@@ -44 +56 @@
     }
 
+    public AnchorPositionX AnchorPositionX {
+      get { return anchorPositionX; }
+      set { anchorPositionX = value; }
+    }
+
+    public AnchorPositionY AnchorPositionY {
+      get { return anchorPositionY; }
+      set { anchorPositionY = value; }
+    }
+
     #region IShape Members
 
@@ -49 +71 @@
       int screenX = Transform.ToScreenX(x, viewport, clippingArea);
       int screenY = Transform.ToScreenY(y, viewport, clippingArea);
+
+      SizeF size = graphics.MeasureString(text, font);
+
+      switch (AnchorPositionX) {
+        case AnchorPositionX.Left:
+          break;
+        case AnchorPositionX.Middle:
+          screenX -= (int)(size.Width/2);
+          break;
+        case AnchorPositionX.Right:
+          screenX -= (int)size.Width;
+          break;
+        default:
+          throw new NotSupportedException("Unknown anchor position: " + AnchorPositionX);
+      }
+
+      switch (AnchorPositionY) {
+        case AnchorPositionY.Top:
+          break;
+        case AnchorPositionY.Middle:
+          screenY -= (int)(size.Height/2);
+          break;
+        case AnchorPositionY.Bottom:
+          screenY -= (int)size.Height;
+          break;
+        default:
+          throw new NotSupportedException("Unknown anchor position: " + AnchorPositionX);
+      }
 
       graphics.DrawString(text, font, brush, screenX, screenY);

trunk/sources/HeuristicLab.Visualization/WorldShape.cs

@@ -9 +9 @@
 
     protected readonly List<IShape> shapes = new List<IShape>();
+
+    public WorldShape()
+      : this(new RectangleD(0, 0, 1, 1), new RectangleD(0, 0, 1, 1)) {}
 
     public WorldShape(RectangleD clippingArea, RectangleD boundingBox) {

trunk/sources/HeuristicLab.Visualization/XAxis.cs

@@ +1 @@
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 
 namespace HeuristicLab.Visualization {
+  public class XAxis : WorldShape {
+    public const int PixelsPerInterval = 100;
+    private ILabelProvider labelProvider = new DefaultLabelProvider("0.##");
 
-  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() {
-      labels.Clear();
+    public ILabelProvider LabelProvider {
+      get { return labelProvider; }
+      set { labelProvider = value; }
     }
 
-    public void SetLabel(int i, string text) {
-      labels[i] = new TextShape(i, 0, text);
+    public static IEnumerable<double> GetTicks(int pixelsPerInterval, int screenSize, double worldSize, double worldStart) {
+      int intervals = screenSize/pixelsPerInterval;
+
+      if (intervals > 0) {
+        double step = worldSize/intervals;
+        step = Math.Pow(10, Math.Floor(Math.Log10(step)));
+        if (worldSize/(step*5) > intervals)
+          step = step*5;
+        else if (worldSize/(step*2) > intervals)
+          step = step*2;
+
+        for (double x = Math.Floor(worldStart/step)*step;
+             x <= worldStart + worldSize;
+             x += step)
+          yield return x;
+      }
     }
 
@@ -21 +34 @@
       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;
-
+      foreach (double x in GetTicks(PixelsPerInterval, viewport.Width, ClippingArea.Width, ClippingArea.X1)) {
+        TextShape label = new TextShape(x, ClippingArea.Height - 3,
+                                        labelProvider.GetLabel(x));
+        label.AnchorPositionX = AnchorPositionX.Middle;
+        label.AnchorPositionY = AnchorPositionY.Top;
         shapes.Add(label);
       }