SF.net SVN: matplotlib:[7013] trunk/toolkits/basemap

[<js...@us...>]

Revision: 7013
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7013&view=rev
Author:   jswhit
Date:     2009-03-30 22:57:31 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
added latmax kwarg to drawparallels and drawmeridians (patch from Chris Murphy).

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/README
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2009-03-29 03:43:49 UTC (rev 7012)
+++ trunk/toolkits/basemap/Changelog	2009-03-30 22:57:31 UTC (rev 7013)
@@ -1,4 +1,6 @@
 version 0.99.4 (not yet released)
+           * added latmax kwarg to drawparallels and drawmeridians 
+             (patch from Chris Murphy).
            * added new example "plotmap_shaded.py" (shaded relief plot).
            * added new example "plothighsandlows.py".
            * add fix_aspect kwarg to Basemap.__init__, when False

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2009-03-29 03:43:49 UTC (rev 7012)
+++ trunk/toolkits/basemap/README	2009-03-30 22:57:31 UTC (rev 7013)
@@ -132,5 +132,6 @@
 Ryan May
 David Huard
 Mauro Cavalcanti
+Chris Murphy
 
 for valuable contributions.

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-03-29 03:43:49 UTC (rev 7012)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-03-30 22:57:31 UTC (rev 7013)
@@ -1711,7 +1711,8 @@
 
     def drawparallels(self,circles,color='k',linewidth=1.,zorder=None, \
                       dashes=[1,1],labels=[0,0,0,0],labelstyle=None, \
-                      fmt='%g',xoffset=None,yoffset=None,ax=None,**kwargs):
+                      fmt='%g',xoffset=None,yoffset=None,ax=None,latmax=None,
+                      **kwargs):
         """
         Draw and label parallels (latitude lines) for values (in degrees)  
         given in the sequence ``circles``.
@@ -1748,6 +1749,8 @@
                          (default is 0.01 times height of map in map
                          projection coordinates).
         ax               axes instance (overrides default axes instance)
+        latmax           absolute value of latitude to which meridians are drawn
+                         (default is 80).
         \**kwargs        additional keyword arguments controlling text
                          for labels that are passed on to 
                          the text method of the axes instance (see
@@ -1769,7 +1772,7 @@
         elif ax is None and self.ax is not None:
             ax = self.ax
         # don't draw meridians past latmax, always draw parallel at latmax.
-        latmax = 80.
+        if latmax is None: latmax = 80.
         # offset for labels.
         if yoffset is None:
             yoffset = (self.urcrnry-self.llcrnry)/100.
@@ -1968,7 +1971,8 @@
 
     def drawmeridians(self,meridians,color='k',linewidth=1., zorder=None,\
                       dashes=[1,1],labels=[0,0,0,0],labelstyle=None,\
-                      fmt='%g',xoffset=None,yoffset=None,ax=None,**kwargs):
+                      fmt='%g',xoffset=None,yoffset=None,ax=None,latmax=None,
+                      **kwargs):
         """
         Draw and label meridians (longitude lines) for values (in degrees)
         given in the sequence ``meridians``.
@@ -2005,6 +2009,8 @@
                          (default is 0.01 times height of map in map
                          projection coordinates).
         ax               axes instance (overrides default axes instance)
+        latmax           absolute value of latitude to which meridians are drawn
+                         (default is 80).
         \**kwargs        additional keyword arguments controlling text
                          for labels that are passed on to 
                          the text method of the axes instance (see
@@ -2026,7 +2032,7 @@
         elif ax is None and self.ax is not None:
             ax = self.ax
         # don't draw meridians past latmax, always draw parallel at latmax.
-        latmax = 80. # not used for cyl, merc or miller projections.
+        if latmax is None: latmax = 80. # unused w/ cyl, merc or miller proj.
         # offset for labels.
         if yoffset is None:
             yoffset = (self.urcrnry-self.llcrnry)/100.


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