SC 26/10/2004

Steve Chaplin · Steve Chaplin · commit 8193c81f6ff8 · 2004-10-26T09:13:06.000Z
svn path=/trunk/matplotlib/; revision=614
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -6,7 +6,7 @@
     import pygtk
     pygtk.require('2.0')
 except:
-    print sys.exc_info()[1]
+    print >> sys.stderr, sys.exc_info()[1] # can't use verbose(), until its loaded!
     raise SystemExit('PyGTK version 1.99.16 or greater is required to run the GTK/GTKAgg Matplotlib backend')
 
 import gobject
@@ -38,7 +38,7 @@
 
 try: from matplotlib.mathtext import math_parse_s_ft2font
 except ImportError:
-    print >>sys.stderr, 'backend_gtk could not import mathtext (build with ft2font)'
+    verbose.report_error('backend_gtk could not import mathtext (build with ft2font)')
     useMathText = False
 else: useMathText = True
 
@@ -177,8 +177,6 @@ def draw_image(self, x, y, im, origin, bbox):
         is the distance from top.  If origin is lower, y is the
         distance from bottom
         """
-        #print 'draw_image'
-
         if bbox is not None:
             l,b,w,h = bbox.get_bounds()
             #rectangle = (int(l), self.height-int(b+h),
@@ -199,7 +197,7 @@ def draw_image(self, x, y, im, origin, bbox):
         except AttributeError:
             pa = pb.pixel_array
         except RuntimeError, exc: #  pygtk was not compiled with Numeric Python support
-            print >>sys.stderr, 'Error:', exc
+            verbose.report_error('Error: %s' % exc)
             return
 
         pa[:,:,:] = X
@@ -255,7 +253,7 @@ def draw_polygon(self, gc, rgbFace, points):
         self.gdkDrawable.draw_polygon(gc.gdkGC, False, points)
 
 
-    def draw_rectangle(self, gc, rgbFace, x, y, width, height):
+    def draw_rectangle(self, gcEdge, rgbFace, x, y, width, height):
         """
         Draw a rectangle at lower left x,y with width and height
         If filled=True, fill the rectangle with the gc foreground
@@ -267,13 +265,13 @@ def draw_rectangle(self, gc, rgbFace, x, y, width, height):
 
 
         if rgbFace is not None:
-            edgecolor = gc.gdkGC.foreground
+            edgecolor = gcEdge.gdkGC.foreground
             facecolor = colorManager.get_color(rgbFace)
-            gc.gdkGC.foreground = facecolor
-            self.gdkDrawable.draw_rectangle(gc.gdkGC, True, x, y, w, h)
-            gc.gdkGC.foreground = edgecolor
+            gcEdge.gdkGC.foreground = facecolor
+            self.gdkDrawable.draw_rectangle(gcEdge.gdkGC, True, x, y, w, h)
+            gcEdge.gdkGC.foreground = edgecolor
             
-        self.gdkDrawable.draw_rectangle(gc.gdkGC, False, x, y, w, h)
+        self.gdkDrawable.draw_rectangle(gcEdge.gdkGC, False, x, y, w, h)
 
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath):
@@ -387,7 +385,7 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
                                   visual=gdrawable.get_visual(),
                                   width=w, height=h)
         if imageFlip is None or imageBack is None or imageVert is None:
-            print >> sys.stderr, "Could not renderer vertical text", s
+            verbose.report_error("Could not renderer vertical text", s)
             return
         imageFlip.set_colormap(gdrawable.get_colormap())
         for i in range(w):
@@ -637,13 +635,16 @@ def __init__(self, figure):
         
         self.set_flags(gtk.CAN_FOCUS)
         self.grab_focus()
-        # self.pixmap_width, self.pixmap_height = -1, -1 
         self._isRealized = False
         self._gpixmap    = None
         self._doplot     = True
         self._printQued  = []
-        self._idleID     = 0    # used in gtkagg
-        self._new_pixmap = True
+        self._idleID     = 0        # used in gtkAgg
+        
+        self._pixmap        = None  # *_pixmap* used by gtkCairo
+        self._new_pixmap    = True
+        self._pixmap_width  = -1
+        self._pixmap_height = -1
 
         self._button = None  # the button pressed
         self._key = None     # the key pressed
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
@@ -70,13 +70,13 @@ def error_msg_template(msg, *args):
     verbose.report('Error: %s'%msg)
     sys.exit()
     
+
 class RendererTemplate(RendererBase):
     """
     The renderer handles all the drawing primitives using a graphics
     context instance that controls the colors/styles
     """
 
-
     def get_canvas_width_height(self):
         'return the canvas width and height in display coords'
         return 100, 100
@@ -158,10 +158,10 @@ def draw_polygon(self, gcEdge, rgbFace, points):
 
     def draw_rectangle(self, gcEdge, rgbFace, x, y, width, height):
         """
-        Draw a rectangle at lower left x,y with width and height.
-
-        If rgbFace is not None, fill the rectangle with it.  gcEdge
-        is a GraphicsContext instance
+        Draw a non-filled rectangle at x,y (lower left) with width and height,
+        using the GraphicsContext gcEdge.
+        Draw a filled rectangle within it of color rgbFace, if rgbFace is not
+        None.
         """
         pass
 
@@ -204,7 +204,7 @@ class GraphicsContextTemplate(GraphicsContextBase):
     class for the GTK backend.  If it's more appropriate to do the
     mapping at the renderer level (as in the postscript backend), you
     don't need to override any of the GC methods.  If it's more
-    approritate to wrap an instance (as in the GTK backend) and do the
+    appropriate to wrap an instance (as in the GTK backend) and do the
     mapping here, you'll need to override several of the setter
     methods.
     """
