SF.net SVN: matplotlib:[8444] trunk/matplotlib/lib/mpl_toolkits/axisartist/ grid_finder.py

[<lee...@us...>]

Revision: 8444
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8444&view=rev
Author:   leejjoon
Date:     2010-06-20 20:05:49 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
mpl_toolkits.axisartist.grid_finder.MaxNLocator supports factor

Modified Paths:
--------------
    trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py

Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2010-06-20 16:46:34 UTC (rev 8443)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2010-06-20 20:05:49 UTC (rev 8444)
@@ -260,14 +260,22 @@
                                      trim=trim, integer=integer,
                                      symmetric=symmetric, prune=prune)
         self.create_dummy_axis()
+        self._factor = None
 
-
     def __call__(self, v1, v2):
-        self.set_bounds(v1, v2)
-        locs = mticker.MaxNLocator.__call__(self)
-        return np.array(locs), len(locs), None
+        if self._factor is not None:
+            self.set_bounds(v1*self._factor, v2*self._factor)
+            locs = mticker.MaxNLocator.__call__(self)
+            return np.array(locs), len(locs), self._factor
+        else:
+            self.set_bounds(v1, v2)
+            locs = mticker.MaxNLocator.__call__(self)
+            return np.array(locs), len(locs), None
 
+    def set_factor(self, f):
+        self._factor = f
 
+
 class FixedLocator(object):
     def __init__(self, locs):
         self._locs = locs
@@ -287,11 +295,14 @@
     def __init__(self):
         self._fmt = mticker.ScalarFormatter()
         self._fmt.create_dummy_axis()
+        self._ignore_factor = True
 
     def __call__(self, direction, factor, values):
-        if factor is None:
-            factor = 1.
-        values = [v/factor for v in values]
+        if not self._ignore_factor:
+            if factor is None:
+                factor = 1.
+            values = [v/factor for v in values]
+        #values = [v for v in values]
         self._fmt.set_locs(values)
         return [self._fmt(v) for v in values]
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.