Merge branch 'locator_interface' of git://github.com/pelson/matplotlib into pelson-locator_interface

efiring · efiring · commit 551f11b6a3c2 · 2012-08-16T10:09:29.000-10:00
Conflicts:
	lib/matplotlib/__init__.py
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -17,6 +17,18 @@ This page just covers the highlights -- for the full story, see the
 new in matplotlib-1.2
 =====================
 
+Locator interface
+-----------------
+
+Philip Elson exposed the intelligence behind the tick Locator classes with a
+simple interface. For instance, to get no more than 5 sensible steps which
+span the values 10 and 19.5::
+
+    >>> import matplotlib.ticker as mticker
+    >>> locator = mticker.MaxNLocator(nbins=5)
+    >>> print(locator.tick_values(10, 19.5))
+    [ 10.  12.  14.  16.  18.  20.]
+
 Tri-Surface Plots
 -----------------
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1003,27 +1003,29 @@ def tk_window_focus():
 
 default_test_modules = [
     'matplotlib.tests.test_agg',
+    'matplotlib.tests.test_axes',
     'matplotlib.tests.test_backend_svg',
     'matplotlib.tests.test_basic',
     'matplotlib.tests.test_cbook',
-    'matplotlib.tests.test_mlab',
-    'matplotlib.tests.test_transforms',
-    'matplotlib.tests.test_axes',
-    'matplotlib.tests.test_figure',
+    'matplotlib.tests.test_colorbar',
     'matplotlib.tests.test_dates',
-    'matplotlib.tests.test_spines',
+    'matplotlib.tests.test_delaunay',
+    'matplotlib.tests.test_figure',
     'matplotlib.tests.test_image',
-    'matplotlib.tests.test_simplification',
+    'matplotlib.tests.test_legend',
     'matplotlib.tests.test_mathtext',
+    'matplotlib.tests.test_mlab',
+    'matplotlib.tests.test_patches',
+    'matplotlib.tests.test_simplification',
+    'matplotlib.tests.test_spines',
     'matplotlib.tests.test_text',
+    'matplotlib.tests.test_ticker',
     'matplotlib.tests.test_tightlayout',
-    'matplotlib.tests.test_delaunay',
-    'matplotlib.tests.test_legend',
-    'matplotlib.tests.test_colorbar',
-    'matplotlib.tests.test_patches',
     'matplotlib.tests.test_triangulation'
+    'matplotlib.tests.test_transforms',
     ]
 
+
 def test(verbosity=1):
     """run the matplotlib test suite"""
     old_backend = rcParams['backend']
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -999,11 +999,9 @@ def _autolev(self, z, N):
                 self.locator = ticker.LogLocator()
             else:
                 self.locator = ticker.MaxNLocator(N+1)
-        self.locator.create_dummy_axis()
         zmax = self.zmax
         zmin = self.zmin
-        self.locator.set_bounds(zmin, zmax)
-        lev = self.locator()
+        lev = self.locator.tick_values(zmin, zmax)
         self._auto = True
         if self.filled:
             return lev
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -0,0 +1,51 @@
+from __future__ import print_function
+from nose.tools import assert_equal, assert_raises
+from numpy.testing import assert_almost_equal
+import numpy as np
+
+import matplotlib.ticker as mticker
+
+
+def test_MaxNLocator():
+    loc = mticker.MaxNLocator(nbins=5)
+    test_value = np.array([  20.,   40.,   60.,   80.,  100.])
+    assert_almost_equal(loc.tick_values(20, 100), test_value)
+
+    test_value = np.array([ 0., 0.0002, 0.0004, 0.0006, 0.0008, 0.001])
+    assert_almost_equal(loc.tick_values(0.001, 0.0001), test_value)
+
+    test_value = np.array([-1.0e+15, -5.0e+14, 0e+00, 5e+14, 1.0e+15])
+    assert_almost_equal(loc.tick_values(-1e15, 1e15), test_value)
+
+
+def test_LinearLocator():
+    loc = mticker.LinearLocator(numticks=3)
+    test_value = np.array([-0.8, -0.3,  0.2])
+    assert_almost_equal(loc.tick_values(-0.8, 0.2), test_value)
+
+
+def test_MultipleLocator():
+    loc = mticker.MultipleLocator(base=3.147)
+    test_value = np.array([-6.294, -3.147, 0., 3.147, 6.294, 9.441])
+    assert_almost_equal(loc.tick_values(-7, 10), test_value)
+
+
+def test_LogLocator():
+    loc = mticker.LogLocator(numticks=5)
+
+    # make sure the 0 case is covered with an exception
+    with assert_raises(ValueError):
+        loc.tick_values(0, 1000)
+
+    test_value = np.array([1.00000000e-03, 1.00000000e-01, 1.00000000e+01,
+                           1.00000000e+03, 1.00000000e+05, 1.00000000e+07])
+    assert_almost_equal(loc.tick_values(0.001, 1.1e5), test_value)
+
+    loc = mticker.LogLocator(base=2)
+    test_value = np.array([1., 2., 4., 8., 16., 32., 64., 128.])
+    assert_almost_equal(loc.tick_values(1, 100), test_value)
+
+
+if __name__=='__main__':
+    import nose
+    nose.runmodule(argv=['-s','--with-doctest'], exit=False)
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
