Changeset 1323

Timestamp:

Jan 16, 2011, 11:08:34 PM (10 years ago)

Author:

Peter Johansson

Message:

fixes #490

Location:

trunk

Files:

• .release_year (modified) (1 diff)
• lib/Graph.cc (modified) (1 diff)

trunk/.release_year

@@ -1 @@
-2010
+2011

trunk/lib/Graph.cc

@@ -220 +220 @@
   unsigned int Graph::tick_spacing(const double range) const
   {
-    double frac=range/5;
-    unsigned char characteristic= static_cast<unsigned char>(std::log10(frac));
-    unsigned int power=static_cast<unsigned int>(std::pow(10.0, characteristic));
-    unsigned char msn=static_cast<unsigned char>(frac/power);
-    return power*msn;
+    // range = msn * 10^characteristic = msn * power 
+    unsigned char characteristic= static_cast<unsigned char>(std::log10(range));
+    double power = std::pow(10.0, characteristic);
+    double msn = range/power;
+    if (msn>=5.0)
+      return power;
+    if (msn>=2.0)
+      return 0.5 * power;
+    return 0.2 * power;
   }