Merge pull request matplotlib#1420 from jenshnielsen/bbox_extra_artist

Join bbox_extra_artists and bbox_inches

Author: pelson

lib/matplotlib/__init__.py

@@ -1071,6 +1071,7 @@ def tk_window_focus():
     'matplotlib.tests.test_backend_svg',
     'matplotlib.tests.test_backend_pgf',
     'matplotlib.tests.test_basic',
+    'matplotlib.tests.test_bbox_tight',
     'matplotlib.tests.test_cbook',
     'matplotlib.tests.test_colorbar',
     'matplotlib.tests.test_colors',

lib/matplotlib/axes.py

@@ -8807,6 +8807,9 @@ 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_)
+        if self.tables:
+            for t in self.tables:
+                bbox_extra_artists.append(t)
         return bbox_extra_artists
 
 

lib/matplotlib/backend_bases.py

@@ -2091,7 +2091,8 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                 if bbox_filtered:
                     _bbox = Bbox.union(bbox_filtered)
                     trans = Affine2D().scale(1.0 / self.figure.dpi)
-                    bbox_inches = TransformedBbox(_bbox, trans)
+                    bbox_extra = TransformedBbox(_bbox, trans)
+                    bbox_inches = Bbox.union([bbox_inches, bbox_extra])
 
                 pad = kwargs.pop("pad_inches", None)
                 if pad is None:

lib/matplotlib/testing/decorators.py

@@ -142,7 +142,7 @@ def do_test():
                     if self._remove_text:
                         self.remove_text(figure)
 
-                    figure.savefig(actual_fname)
+                    figure.savefig(actual_fname, **self._savefig_kwarg)
 
                     err = compare_images(expected_fname, actual_fname,
                                          self._tol, in_decorator=True)
@@ -166,7 +166,8 @@ def do_test():
                 yield (do_test,)
 
 def image_comparison(baseline_images=None, extensions=None, tol=1e-3,
-                     freetype_version=None, remove_text=False):
+                     freetype_version=None, remove_text=False,
+                     savefig_kwarg=None):
     """
     call signature::
 
@@ -199,6 +200,10 @@ def image_comparison(baseline_images=None, extensions=None, tol=1e-3,
         Remove the title and tick text from the figure before
         comparison.  This does not remove other, more deliberate,
         text, such as legends and annotations.
+
+      *savefig_kwarg*: dict
+        Optional arguments that are passed to the savefig method.
+
     """
 
     if baseline_images is None:
@@ -208,6 +213,10 @@ def image_comparison(baseline_images=None, extensions=None, tol=1e-3,
         # default extensions to test
         extensions = ['png', 'pdf', 'svg']
 
+    if savefig_kwarg is None:
+        #default no kwargs to savefig
+        savefig_kwarg = dict()
+
     def compare_images_decorator(func):
         # We want to run the setup function (the actual test function
         # that generates the figure objects) only once for each type
@@ -231,7 +240,8 @@ def compare_images_decorator(func):
              '_extensions': extensions,
              '_tol': tol,
              '_freetype_version': freetype_version,
-             '_remove_text': remove_text})
+             '_remove_text': remove_text,
+             '_savefig_kwarg': savefig_kwarg})
 
         return new_class
     return compare_images_decorator