fixed savefig dpi default for several backends

jdh2358 · jdh2358 · commit 53e44efe4db7 · 2006-09-13T13:59:03.000Z
svn path=/trunk/matplotlib/; revision=2767
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -910,7 +910,7 @@ def get_width_height(self):
         (depending on the backend), truncated to integers"""
         return int(self.figure.bbox.width()), int(self.figure.bbox.height())
 
-    def print_figure(self, filename, dpi=300, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
         Render the figure to hardcopy. Set the figure patch face and edge
@@ -920,6 +920,7 @@ def print_figure(self, filename, dpi=300, facecolor='w', edgecolor='w',
 
         filename    - can also be a file object on image backends
         orientation - only currently applies to PostScript printing.
+        dpi - the dots per inch to save the figure in; if None, use savefig.dpi
         """
         pass
 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -71,6 +71,7 @@
 from __future__ import division
 
 import os, sys
+import matplotlib
 from matplotlib import verbose, rcParams
 from matplotlib.numerix import array, Float, zeros, transpose
 from matplotlib._image import fromarray
@@ -417,7 +418,7 @@ def buffer_rgba(self,x,y):
                                      'debug-annoying')
         return self.renderer.buffer_rgba(x,y)
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
         Render the figure to hardcopy.  Set the figure patch face and
@@ -434,6 +435,7 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
         """
         if __debug__: verbose.report('FigureCanvasAgg.print_figure',
                                      'debug-annoying')
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
 
         # store the orig figure dpi, color and size information so we
         # can restore them later.  For image creation alone, this is
diff --git a/lib/matplotlib/backends/backend_fltkagg.py b/lib/matplotlib/backends/backend_fltkagg.py
@@ -246,9 +246,9 @@ def blit(self,bbox):
 
     show = draw
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
-
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         agg = self.switch_backends(FigureCanvasAgg)
         agg.print_figure(filename, dpi, facecolor, edgecolor, orientation,
                          **kwargs)
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -290,9 +290,10 @@ def expose_event(self, widget, event):
         return False  # finish event propagation?
 
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         # TODO - use gdk/cairo/agg print_figure?
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         root, ext = os.path.splitext(filename)
         ext = ext[1:]
         if ext == '':
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -95,11 +95,12 @@ def blit(self, bbox=None):
                                    0, 0, 0, 0, w, h)
         if DEBUG: print 'FigureCanvasGTKAgg.done'
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         if DEBUG: print 'FigureCanvasGTKAgg.print_figure'
         # delete the renderer to prevent improper blitting after print
 
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         root, ext = os.path.splitext(filename)       
         ext = ext.lower()[1:]
         if ext == 'jpg':
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py
@@ -149,9 +149,10 @@ def blit(self, bbox=None):
         l, t = bbox.ll().x().get(), bbox.ur().y().get()
         self.update(l, self.renderer.height-t, w, h)
 
-    def print_figure( self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure( self, filename, dpi=None, facecolor='w', edgecolor='w',
                       orientation='portrait', **kwargs ):
         if DEBUG: print 'FigureCanvasQTAgg.print_figure'
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         agg = self.switch_backends( FigureCanvasAgg )
         agg.print_figure( filename, dpi, facecolor, edgecolor, orientation,
                           **kwargs )
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
@@ -152,9 +152,10 @@ def blit(self, bbox=None):
         self.replot = bbox
         self.repaint(False)
 
-    def print_figure( self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure( self, filename, dpi=None, facecolor='w', edgecolor='w',
                       orientation='portrait', **kwargs ):
         if DEBUG: print 'FigureCanvasQTAgg.print_figure'
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         agg = self.switch_backends( FigureCanvasAgg )
         agg.print_figure( filename, dpi, facecolor, edgecolor, orientation,
                           **kwargs )
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
@@ -45,6 +45,7 @@
 
 from __future__ import division
 
+import matplotlib
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
@@ -196,7 +197,7 @@ def draw(self):
         renderer = RendererTemplate()
         self.figure.draw(renderer)
         
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
         Render the figure to hardcopy. Set the figure patch face and edge
@@ -210,6 +211,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
         An image backend does not need to do this since after the print the
         figure is done
         """
+
+        if dpi is None: dpi = rcParams['savefig.dpi']
         # save the figure settings, GUI backends only
         #origDPI = self.figure.dpi.get()
         #origfacecolor = self.figure.get_facecolor()
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -178,9 +178,10 @@ def get_tk_widget(self):
         """
         return self._tkcanvas
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
 
+        if dpi is None: dpi = rcParams['savefig.dpi']
         agg = self.switch_backends(FigureCanvasAgg)
         agg.print_figure(filename, dpi, facecolor, edgecolor, orientation,
                          **kwargs)
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -926,12 +926,12 @@ def gui_repaint(self, drawDC=None):
         drawDC.DrawBitmap(self.bitmap, 0, 0)
         drawDC.EndDrawing()
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
         Render the figure to hardcopy
         """
-
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         DEBUG_MSG("print_figure()", 1, self)
         # Save state information, and set save DPI
 
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -95,11 +95,12 @@ def blit(self, bbox=None):
         srcDC.SelectObject(wx.NullBitmap)
         self.gui_repaint()
 
-    def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
+    def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
                      orientation='portrait', **kwargs):
         """
         Render the figure to hardcopy
         """
+        if dpi is None: dpi = matplotlib.rcParams['savefig.dpi']
         agg = self.switch_backends(FigureCanvasAgg)
         agg.print_figure(filename, dpi, facecolor, edgecolor, orientation,
                          **kwargs)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -640,18 +640,19 @@ def add_axobserver(self, func):
 
     def savefig(self, *args, **kwargs):
         """
-        SAVEFIG(fname, dpi=150, facecolor='w', edgecolor='w',
+        SAVEFIG(fname, dpi=None, facecolor='w', edgecolor='w',
         orientation='portrait', papertype=None, format=None):
 
         Save the current figure.
 
-        fname - the filename to save the current figure to.
-                The output formats supported depend on the backend being used.
-                and are deduced by the extension to fname.
-                Possibilities are eps, jpeg, pdf, png, ps, svg.
-                fname can also be a file or file-like object - cairo backend
-                only.
-        dpi - is the resolution in dots per inch.
+        fname - the filename to save the current figure to.  The
+                output formats supported depend on the backend being
+                used.  and are deduced by the extension to fname.
+                Possibilities are eps, jpeg, pdf, png, ps, svg.  fname
+                can also be a file or file-like object - cairo backend
+                only.  dpi - is the resolution in dots per inch.  If
+                None it will default to the value savefig.dpi in the
+                matplotlibrc file
 
         facecolor and edgecolor are the colors of the figure rectangle
 
