Merged revisions 8732,8734 via svnmerge from

leejjoon · leejjoon · commit be6a9501210f · 2010-10-08T01:32:08.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8732 | efiring | 2010-10-07 08:59:15 +0900 (Thu, 07 Oct 2010) | 3 lines autoscale_view: respect tight kwarg even if only images are present. slight modification of patch by Stan West. ........ r8734 | leejjoon | 2010-10-08 10:23:22 +0900 (Fri, 08 Oct 2010) | 1 line fix bbox_to_anchor for draggable legend ........ svn path=/trunk/matplotlib/; revision=8735
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1784,12 +1784,13 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True):
         :meth:`matplotlib.axes.Axes.relim`
         prior to calling autoscale_view.
         """
-        if tight is not None:
-            self._tight = bool(tight)
-        # if image data only just use the datalim
-        _tight = self._tight or (len(self.images)>0 and
-                                 len(self.lines)==0 and
-                                 len(self.patches)==0)
+        if tight is None:
+            # if image data only just use the datalim
+            _tight = self._tight or (len(self.images)>0 and
+                                     len(self.lines)==0 and
+                                     len(self.patches)==0)
+        else:
+            _tight = self._tight = bool(tight)
 
         if scalex and self._autoscaleXon:
             xshared = self._shared_x_axes.get_siblings(self)
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -51,11 +51,17 @@ def finalize_offset(self):
         loc_in_canvas = self.get_loc_in_canvas()
 
         bbox = self.legend.get_bbox_to_anchor()
+
+        # if bbox has zero width or height, the transformation is
+        # ill-defined. Fall back to the defaul bbox_to_anchor.
+        if bbox.width ==0 or bbox.height ==0:
+            self.legend.set_bbox_to_anchor(None)
+            bbox = self.legend.get_bbox_to_anchor()
+            
         _bbox_transform = BboxTransformFrom(bbox)
         self.legend._loc = tuple(_bbox_transform.transform_point(loc_in_canvas))
 
 
-
 class Legend(Artist):
     """
     Place a legend on the axes at location loc.  Labels are a
