SC 29/10/2004

Steve Chaplin · Steve Chaplin · commit 9fac26f4f5a7 · 2004-10-29T08:08:35.000Z
svn path=/trunk/matplotlib/; revision=630
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -140,21 +140,19 @@ def get_text_width_height(self, s, prop, ismath):
             return w, h
 
                               
-    def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2):
+    def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2):
         """
         Draw an arc centered at x,y with width and height and angles
         from 0.0 to 360.0.
-
-        If rgbFace is not None, fill the arc with it.  gcEdge
-        is a GraphicsContext instance
+        If rgbFace is not None, fill the arc with it.
         """
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         # cairo draws circular arcs (width=height) only?
         # could curve_to() and draw a spline instead?
-        ctx    = gcEdge.ctx
-        y      = self.height - y
-        radius = width / 2
-        ctx.arc (x, y, radius, angle1 * pi/180.0, angle2 * pi/180.0)
+        radius = (height + width) / 4
+        ctx    = gc.ctx
+        ctx.new_path()
+        ctx.arc (x, self.height - y, radius, angle1 * pi/180.0, angle2 * pi/180.0)
 
         if rgbFace:
             ctx.save()
@@ -188,12 +186,10 @@ def draw_line(self, gc, x1, y1, x2, y2):
         """
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         ctx = gc.ctx
-        y1 = self.height - y1
-        y2 = self.height - y2
-        ctx.move_to (x1, y1); ctx.line_to (x2, y2)
+        ctx.new_path()
+        ctx.move_to (x1, self.height - y1)
+        ctx.line_to (x2, self.height - y2)
         ctx.stroke()
-        # should call new_path() so this line is not part of future paths?
-        # or save()/restore() wrapper ?
 
 
     def draw_lines(self, gc, x, y):
@@ -202,44 +198,40 @@ def draw_lines(self, gc, x, y):
         point in x, y
         """
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        ctx = gc.ctx
         y = [self.height - y for y in y]
         points = zip(x,y)
         x, y = points.pop(0)
+        ctx = gc.ctx
+        ctx.new_path()
         ctx.move_to (x, y)
 
         for x,y in points:
             ctx.line_to (x, y)
         ctx.stroke()
 
-        #ctx.new_path() # testing
-        # should call new_path() so these lines are not part of future paths?
-
 
     def draw_point(self, gc, x, y):
         """
         Draw a single point at x,y
         """
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         # render by drawing a 0.5 radius circle
-        y = self.height - y
-        gc.ctx.arc (x, y, 0.5, 0, 2*pi)
+        gc.ctx.new_path()
+        gc.ctx.arc (x, self.height - y, 0.5, 0, 2*pi)
         gc.ctx.fill()
 
 
-    def draw_polygon(self, gcEdge, rgbFace, points):
+    def draw_polygon(self, gc, rgbFace, points):
         """
         Draw a polygon.  points is a len vertices tuple, each element
         giving the x,y coords a vertex.
-
-        If rgbFace is not None, fill the rectangle with it.  gcEdge
-        is a GraphicsContext instance
+        If rgbFace is not None, fill the rectangle with it.
         """  
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        ctx = gcEdge.ctx
         points = [(x, (self.height-y)) for x,y in points]
 
-        ctx.new_path() # not required?
+        ctx = gc.ctx
+        ctx.new_path()
         x, y = points.pop(0)
         ctx.move_to (x, y)
         for x,y in points:
@@ -254,18 +246,17 @@ def draw_polygon(self, gcEdge, rgbFace, points):
         ctx.stroke()
 
 
-    def draw_rectangle(self, gcEdge, rgbFace, x, y, width, height):
+    def draw_rectangle(self, gc, rgbFace, x, y, width, height):
         """
         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.
         """
         if Debug: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        ctx = gcEdge.ctx
-        y   = self.height - y - height
-
-        ctx.rectangle (x, y, width, height)
+        ctx = gc.ctx
+        ctx.new_path()
+        ctx.rectangle (x, self.height - y - height, width, height)
         if rgbFace:
             ctx.save()
             ctx.set_rgb_color (*rgbFace)
@@ -288,17 +279,17 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
         else:
             # see also get_text_width_height()
             # text is looking too small - size, scale problem?
+            ctx.new_path()
+            ctx.move_to (x, y)
             ctx.select_font (prop.get_name(),
                              self.fontangles [prop.get_style()],
                              self.fontweights[prop.get_weight()])
             scale = self.get_text_scale()
             size  = prop.get_size_in_points()
-            ctx.move_to (x, y)
             if angle: # rotated text looks awful!
                 ctx.rotate (-angle * pi / 180)
             ctx.scale_font (scale*size)
             ctx.show_text (s)
-            # new_path() ?
 
          
     def flipy(self):
@@ -385,9 +376,14 @@ def set_clip_rectangle(self, rectangle):
         ctx = self.ctx
         ctx.new_path()
         ctx.rectangle (x, self.renderer.height - h - y, w, h)
+
+        #ctx.save()     # uncomment to view the clip rectangle
+        #ctx.set_rgb_color(1,0,0)
+        #ctx.set_line_width(6)
+        #ctx.stroke()
+        #ctx.restore()        
+
         ctx.clip ()
-        ctx.new_path() # prevents the rectangle from being drawn by next ctx.stroke()/fill()
-        # is better to do new_path() (or save(),restore()) at start of EVERY draw_*() op ?
         
 
     def set_dashes(self, offset, dashes):
diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py
@@ -16,6 +16,8 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
      show, draw_if_interactive,\
      error_msg, NavigationToolbar, PIXELS_PER_INCH, backend_version
 
+import gobject
+
 try:
     import cairo
     import cairo.gtk
@@ -173,3 +175,10 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w'):
                     filename, msg))
             else:
                 error_msg('Could not save figure\n%s' % msg)
+
+
+def raise_msg_to_str(msg): # used by print_figure
+    """msg is a return arg from a raise.  Join with new lines"""
+    if not is_string_like(msg):
+        msg = '\n'.join(map(str, msg))
+    return msg
