SC

Steve Chaplin · Steve Chaplin · commit 026a72e3146b · 2005-06-15T14:04:10.000Z
svn path=/trunk/matplotlib/; revision=1465
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -37,8 +37,8 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 
 _version_required = (0,5,0)
 if cairo.version_info < _version_required:
-   raise SystemExit ("PyCairo %d.%d.%d is installed\n"
-                     "PyCairo %d.%d.%d or later is required"
+   raise SystemExit ("Pycairo %d.%d.%d is installed\n"
+                     "Pycairo %d.%d.%d or later is required"
                      % (cairo.version_info + _version_required))
 backend_version = cairo.version
 del _version_required
@@ -405,8 +405,7 @@ def get_text_width_height(self, s, prop, ismath):
                               
     def new_gc(self):
         if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
-        gc = GraphicsContextCairo (renderer=self,
-                                   surface=self.surface)
+        gc = GraphicsContextCairo (renderer=self, surface=self.surface)
         return gc
 
 
@@ -433,14 +432,10 @@ def __init__(self, renderer, surface):
         GraphicsContextBase.__init__(self)
         self.renderer = renderer
         self.ctx = cairo.Context (surface)
-        # default is 0.1, raise value to increase performance
-        # (and lower quality)
-        #self.ctx.set_tolerance(0.5)
         
     def set_alpha(self, alpha):
         self._alpha = alpha
         rgb = self._rgb
-        #self.ctx.set_alpha(alpha)
         self.ctx.set_source_rgba (rgb[0], rgb[1], rgb[2], alpha)
 
     #def set_antialiased(self, b):
@@ -565,22 +560,20 @@ def print_figure_fn(figure, filename, dpi=150, facecolor='w', edgecolor='w',
             fc.print_figure(filename, dpi, facecolor, edgecolor, orientation)
 
         else:
-            warnings.warn('Format "%s" is not supported.\nSupported formats: %s.' %
-                          (ext, ', '.join(IMAGE_FORMAT)))
+            warnings.warn('Format "%s" is not supported.\nSupported formats: '
+                          '%s.' % (ext, ', '.join(IMAGE_FORMAT)))
 
         
 def _save_png (figure, filename):
     width, height = figure.get_width_height()
     width, height = int(width), int(height)
 
-    surface = cairo.ImageSurface (cairo.FORMAT_ARGB32, width, height)
-    ctx = cairo.Context (surface)
-
     renderer = RendererCairo (figure.dpi)
     renderer._set_width_height (width, height)
-    renderer.surface = ctx.get_target()
+    renderer.surface = cairo.ImageSurface (cairo.FORMAT_ARGB32, width, height)
+
     figure.draw (renderer)
-    surface.write_to_png (filename)
+    renderer.surface.write_to_png (filename)
         
 
 def _save_ps_pdf (figure, filename, ext, orientation):
diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py
@@ -8,21 +8,18 @@
 import cairo
 import cairo.gtk
 
-try: cairo.version_info
-except AttributeError:
-    backend_version = 'PyGTK(%d.%d.%d),PyCairo ??' % gtk.pygtk_version
-else:
-    backend_version = 'PyGTK(%d.%d.%d),PyCairo(%d.%d.%d)' % (gtk.pygtk_version + cairo.version_info)
+backend_version = 'PyGTK(%d.%d.%d),Pycairo(%d.%d.%d)' % (gtk.pygtk_version + cairo.version_info)
 
 
-DEBUG = False
+_debug = False
+#_debug = True
 
 
 def new_figure_manager(num, *args, **kwargs):
     """
     Create a new figure manager instance
     """
-    if DEBUG: print 'backend_gtkcairo.%s()' % fn_name()
+    if _debug: print 'backend_gtkcairo.%s()' % fn_name()
     thisFig = Figure(*args, **kwargs)
     canvas = FigureCanvasGTKCairo(thisFig)
     return FigureManagerGTK(canvas, num)
@@ -31,5 +28,5 @@ def new_figure_manager(num, *args, **kwargs):
 class FigureCanvasGTKCairo(FigureCanvasGTK):
     def _renderer_init(self):
         """Override to use Cairo rather than GDK renderer"""
-        if DEBUG: print 'backend_gtkcairo.%s()' % fn_name()
+        if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
         self._renderer = RendererCairo (self.figure.dpi)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -549,10 +549,8 @@ def _set_artist_props(self, a):
         a.set_transform(self.transFigure)
 
     def get_width_height(self):
-        'return the figure width and height in pixels'
-        w = self.bbox.width()
-        h = self.bbox.height()
-        return w, h
+        'return the figure width and height in pixels (as floats)'
+        return self.bbox.width(), self.bbox.height()
 
 
     def gca(self, **kwargs):
