SF.net SVN: matplotlib:[7216] trunk/matplotlib

[<he...@us...>]

Revision: 7216
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7216&view=rev
Author:   heeres
Date:     2009-06-13 21:13:14 +0000 (Sat, 13 Jun 2009)

Log Message:
-----------
mplot3d: fix Axes3D.grid(), add axes3d.grid to matplotlibrc

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/rcsetup.py
    trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
    trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py
    trunk/matplotlib/matplotlibrc.template

Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2009-06-13 16:54:31 UTC (rev 7215)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2009-06-13 21:13:14 UTC (rev 7216)
@@ -441,6 +441,7 @@
     'axes.unicode_minus'        : [True, validate_bool],
 
     'polaraxes.grid'        : [True, validate_bool],   # display polar grid or not
+    'axes3d.grid'           : [True, validate_bool],   # display 3d grid
 
     #legend properties
     'legend.fancybox'         : [False,validate_bool],

Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2009-06-13 16:54:31 UTC (rev 7215)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py	2009-06-13 21:13:14 UTC (rev 7216)
@@ -8,7 +8,7 @@
 2D matplotlib figure.
 """
 
-from matplotlib.axes import Axes
+from matplotlib.axes import Axes, rcParams
 from matplotlib import cbook
 from matplotlib.transforms import Bbox
 from matplotlib import collections
@@ -316,6 +316,7 @@
             self.figure.canvas.mpl_disconnect(cid)
         self.cids = []
         Axes.cla(self)
+        self.grid(rcParams['axes3d.grid'])
 
     def _button_press(self, event):
         self.button_pressed = event.button
@@ -482,6 +483,12 @@
         label.update(kwargs)
         return label
 
+    def grid(self, on=True, **kwargs):
+        '''
+        Set / unset 3D grid.
+        '''
+        self._draw_grid = on
+
     def text(self, x, y, z, s, zdir=None):
         '''Add text to the plot.'''
         text = Axes.text(self, x, y, s)

Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py	2009-06-13 16:54:31 UTC (rev 7215)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py	2009-06-13 21:13:14 UTC (rev 7216)
@@ -43,6 +43,7 @@
     tick.tick1line.set_linestyle('-')
     tick.tick1line.set_marker('')
     tick.tick1line.set_data(tickxs, tickys)
+    tick.gridline.set_data(0, 0)
 
 class Axis(maxis.XAxis):
 
@@ -143,7 +144,8 @@
         
         # filter locations here so that no extra grid lines are drawn
         interval = self.get_view_interval()
-        majorLocs = [loc for loc in majorLocs if interval[0] < loc < interval[1]]
+        majorLocs = [loc for loc in majorLocs if \
+                interval[0] < loc < interval[1]]
         self.major.formatter.set_locs(majorLocs)
         majorLabels = [self.major.formatter(val, i)
                        for i, val in enumerate(majorLocs)]
@@ -230,9 +232,10 @@
             xyz2[i][newindex] = newval
 
         lines = zip(xyz1, xyz0, xyz2)
-        self.gridlines.set_segments(lines)
-        self.gridlines.set_color([(0.9,0.9,0.9,1)] * len(lines))
-        self.gridlines.draw(renderer, project=True)
+        if self.axes._draw_grid:
+            self.gridlines.set_segments(lines)
+            self.gridlines.set_color([(0.9,0.9,0.9,1)] * len(lines))
+            self.gridlines.draw(renderer, project=True)
 
         # Draw ticks
         tickdir = info['tickdir']

Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template	2009-06-13 16:54:31 UTC (rev 7215)
+++ trunk/matplotlib/matplotlibrc.template	2009-06-13 21:13:14 UTC (rev 7216)
@@ -210,6 +210,7 @@
                                # rather than hypen.  See http://en.wikipedia.org/wiki/Plus_sign#Plus_sign
 
 #polaraxes.grid      : True    # display grid on polar axes
+#axes3d.grid         : True    # display grid on 3d axes
 
 ### TICKS
 # see http://matplotlib.sourceforge.net/api/axis_api.html#matplotlib.axis.Tick


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