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

Revision: 8248
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8248&view=rev
Author:   leejjoon
Date:     2010-04-20 17:38:56 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
fix axisartist.grid_finder.py to account for the api change of MaxNLocator

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-04-20 16:44:01 UTC (rev 8247)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2010-04-20 17:38:56 UTC (rev 8248)
@@ -256,8 +256,9 @@
                  symmetric=False,
                  prune=None):
 
-        mticker.MaxNLocator.__init__(self, nbins, steps,
-                                     trim, integer, symmetric, prune)
+        mticker.MaxNLocator.__init__(self, nbins, steps=steps,
+                                     trim=trim, integer=integer,
+                                     symmetric=symmetric, prune=prune)
         self.create_dummy_axis()
 
 


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

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.

Revision: 8605
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8605&view=rev
Author:   leejjoon
Date:     2010-07-31 09:18:20 +0000 (Sat, 31 Jul 2010)

Log Message:
-----------
improve FixedLocator in axisartist module

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-07-31 09:06:08 UTC (rev 8604)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2010-07-31 09:18:20 UTC (rev 8605)
@@ -279,13 +279,19 @@
 class FixedLocator(object):
     def __init__(self, locs):
         self._locs = locs
+        self._factor = None
 
 
     def __call__(self, v1, v2):
-        v1, v2 = sorted([v1, v2])
+        if self._factor is None:
+            v1, v2 = sorted([v1, v2])
+        else:
+            v1, v2 = sorted([v1*self._factor, v2*self._factor])
         locs = np.array([l for l in self._locs if ((v1 <= l) and (l <= v2))])
-        return locs, len(locs), None
+        return locs, len(locs), self._factor
 
+    def set_factor(self, f):
+        self._factor = f
 
 
 


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

Revision: 8853
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8853&view=rev
Author:   leejjoon
Date:     2010-12-29 08:30:32 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
axes_grid1.grid_finder.FormatterPrettyPrint takes useMathText parameter

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-12-29 08:29:59 UTC (rev 8852)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py	2010-12-29 08:30:32 UTC (rev 8853)
@@ -298,8 +298,8 @@
 # Tick Formatter
 
 class FormatterPrettyPrint(object):
-    def __init__(self):
-        self._fmt = mticker.ScalarFormatter()
+    def __init__(self, useMathText=True):
+        self._fmt = mticker.ScalarFormatter(useMathText=useMathText)
         self._fmt.create_dummy_axis()
         self._ignore_factor = True
 


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