Merge branch 'yannpaul-colormapInitBug2'

efiring · efiring · commit 83692e0226c0 · 2012-03-17T09:18:34.000-10:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -8305,6 +8305,13 @@ def matshow(self, Z, **kwargs):
                                                  integer=True))
         return im
 
+    def get_default_bbox_extra_artists(self):
+        bbox_extra_artists = [t for t in self.texts if t.get_visible()]
+        if self.legend_:
+            bbox_extra_artists.append(self.legend_)
+        return bbox_extra_artists
+
+
     def get_tightbbox(self, renderer, call_axes_locator=True):
         """
         return the tight bounding box of the axes.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2003,8 +2003,12 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                 renderer = self.figure._cachedRenderer
                 bbox_inches = self.figure.get_tightbbox(renderer)
 
-                bb = [a.get_window_extent(renderer) for a \
-                      in kwargs.pop("bbox_extra_artists", [])]
+                bbox_extra_artists = kwargs.pop("bbox_extra_artists", None)
+                if bbox_extra_artists is None:
+                    bbox_extra_artists = self.figure.get_default_bbox_extra_artists()
+
+                bb = [a.get_window_extent(renderer) for a in bbox_extra_artists]
+                
                 if bb:
                     _bbox = Bbox.union([b for b in bb if b.width!=0 or b.height!=0])
 
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -602,7 +602,7 @@ def _set_extremes(self):
             self._lut[self._i_over] = self._lut[self.N-1]
         self._lut[self._i_bad] = self._rgba_bad
 
-    def _init():
+    def _init(self):
         '''Generate the lookup table, self._lut'''
         raise NotImplementedError("Abstract class only")
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1288,6 +1288,13 @@ def waitforbuttonpress(self, timeout=-1):
         return blocking_input(timeout=timeout)
 
 
+    def get_default_bbox_extra_artists(self):
+        bbox_extra_artists = [t for t in self.texts if t.get_visible()]
+        for ax in self.axes:
+            if ax.get_visible():
+                bbox_extra_artists.extend(ax.get_default_bbox_extra_artists())
+        return bbox_extra_artists
+
 
     def get_tightbbox(self, renderer):
         """
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -183,6 +183,7 @@ def do_3d_projection(self, renderer):
         segments_2d = [zip(xs, ys) for (xs, ys, zs) in xyslist]
         LineCollection.set_segments(self, segments_2d)
 
+        # FIXME
         minz = 1e9
         for (xs, ys, zs) in xyslist:
             minz = min(minz, min(zs))
@@ -300,6 +301,9 @@ def set_sort_zpos(self,val):
         self._sort_zpos = val
 
     def set_3d_properties(self, zs, zdir):
+        # Force the collection to initialize the face and edgecolors
+        # just in case it is a scalarmappable with a colormap.
+        self.update_scalarmappable()
         offsets = self.get_offsets()
         if len(offsets) > 0:
             xs, ys = zip(*self.get_offsets())
@@ -416,6 +420,9 @@ def set_verts(self, verts, closed=True):
         PolyCollection.set_verts(self, [], closed)
 
     def set_3d_properties(self):
+        # Force the collection to initialize the face and edgecolors
+        # just in case it is a scalarmappable with a colormap.
+        self.update_scalarmappable()
         self._sort_zpos = None
         self.set_zsort(True)
         self._facecolors3d = PolyCollection.get_facecolors(self)
@@ -429,7 +436,7 @@ def do_3d_projection(self, renderer):
         '''
         Perform the 3D projection for this object.
         '''
-
+        # FIXME: This may no longer be needed?
         if self._A is not None:
             self.update_scalarmappable()
             self._facecolors3d = self._facecolors
@@ -572,6 +579,10 @@ def get_colors(c, num):
 
 def zalpha(colors, zs):
     """Modify the alphas of the color list according to depth"""
+    # FIXME: This only works well if the points for *zs* are well-spaced
+    #        in all three dimensions. Otherwise, at certain orientations,
+    #        the min and max zs are very close together.
+    #        Should really normalize against the viewing depth.
     colors = get_colors(colors, len(zs))
     if zs.size > 0 :
         norm = Normalize(min(zs), max(zs))
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -825,7 +825,9 @@ def can_pan(self) :
     def cla(self):
         """Clear axes and disable mouse button callbacks.
         """
-        self.disable_mouse_rotation()
+        # Disabling mouse interaction might have been needed a long
+        # time ago, but I can't find a reason for it now - BVR (2012-03)
+        #self.disable_mouse_rotation()
         self.zaxis.cla()
 
         # TODO: Support sharez
