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

Timestamp:

02/28/09 21:21:59 (16 years ago)

Author:

mstoeger

Message:

General housekeeping (#498) Removed some old unused Z-Order values. Replaced some var types by concrete types. Renamed some LineShape properties. Added caching of Pens and Brushes in LineShape and RectangleShape. Put axis tick calculation algorithm into its own class.

File:

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

trunk/sources/HeuristicLab.Visualization/XAxis.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
 using System.Drawing;
 using HeuristicLab.Visualization.LabelProvider;
@@ -7 +5 @@
   public class XAxis : WorldShape {
     public const int PixelsPerInterval = 100;
+    
     private ILabelProvider labelProvider = new ContinuousLabelProvider("0.####");
 
@@ -14 +13 @@
     }
 
-    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;
-      }
-    }
-
     public override void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
       shapes.Clear();
 
-      foreach (double x in GetTicks(PixelsPerInterval, viewport.Width, ClippingArea.Width, ClippingArea.X1)) {
+      foreach (double x in AxisTicks.GetTicks(PixelsPerInterval, viewport.Width,
+                                              ClippingArea.Width,
+                                              ClippingArea.X1)) {
         TextShape label = new TextShape(x, ClippingArea.Height - 3,
                                         labelProvider.GetLabel(x));