SC

svn path=/trunk/matplotlib/; revision=1351

Author: Steve Chaplin

lib/matplotlib/backends/backend_cairo.py

@@ -106,18 +106,20 @@ def _set_width_height(self, width, height):
         self.height = height
         self.matrix_flipy = cairo.Matrix (d=-1, ty=self.height)
         # use matrix_flipy for ALL rendering?
-        # - problem with text? - will need to switch matrix_flipy off, or do a font transform?
+        # - problem with text? - will need to switch matrix_flipy off, or do a
+        # font transform?
 
     def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         # draws circular arcs where width=height
         # FIXME
-        # to get a proper arc of width/height you can use translate() and scale()
-        # see draw_arc() manual page
+        # to get a proper arc of width/height you can use translate() and
+        # scale(), see draw_arc() manual page
         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)
+        ctx.arc (x, self.height - y, radius,
+                 angle1 * pi/180.0, angle2 * pi/180.0)
 
         if rgbFace:
             ctx.save()
@@ -131,7 +133,8 @@ def draw_image(self, x, y, im, origin, bbox):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
 
         if numerix.which[0] == "numarray":
-            warnings.warn("draw_image() currently works for numpy, but not numarray")
+            warnings.warn("draw_image() currently works for numpy, but not "
+                          "numarray")
             return
 
         if not HAVE_CAIRO_NUMPY:
@@ -163,7 +166,8 @@ def draw_image(self, x, y, im, origin, bbox):
         surface = cairo.numpy.surface_create_for_array (X)
 
         # Alternative
-        #surface = cairo.surface_create_for_image(buf, cairo.FORMAT_ARGB32, cols, rows) #, stride)
+        # surface = cairo.ImageSurface(buf, cairo.FORMAT_ARGB32, cols, rows)
+        # stride)
         # error: TypeError: Cannot use string as modifiable buffer
 
         ctx.translate (x,y)
@@ -297,7 +301,8 @@ def draw_rectangle(self, gc, rgbFace, x, y, width, height):
 
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
-        # Note: x,y are device/display coords, not user-coords, unlike other draw_* methods
+        # Note: x,y are device/display coords, not user-coords, unlike other
+        # draw_* methods
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
 
         if ismath:
@@ -327,7 +332,8 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
        # mathtext using the gtk/gdk method
 
         if numerix.which[0] == "numarray":
-            warnings.warn("_draw_mathtext() currently works for numpy, but not numarray")
+            warnings.warn("_draw_mathtext() currently works for numpy, but "
+                          "not numarray")
             return
 
         if not HAVE_CAIRO_NUMPY:
@@ -378,7 +384,8 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
     def flipy(self):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         return True
-        #return False # tried - all draw objects ok except text (and images?) which comes out mirrored!
+        #return False # tried - all draw objects ok except text (and images?)
+        # which comes out mirrored!
 
 
     def get_canvas_width_height(self):
@@ -559,7 +566,8 @@ def print_figure_fn(figure, filename, dpi=150, facecolor='w', edgecolor='w',
                 warnings.warn("%s: %s" % (exc.filename, exc.strerror))
             else:
                 if ext == 'png': _save_png (figure, fileObject)
-                else:            _save_ps_pdf (figure, fileObject, ext, orientation)
+                else:            _save_ps_pdf (figure, fileObject, ext,
+                                               orientation)
                 fileObject.close()
 
         elif ext in ('eps', 'svg'): # backend_svg/ps

lib/matplotlib/backends/backend_gdk.py

@@ -37,7 +37,8 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 backend_version = "%d.%d.%d" % gtk.pygtk_version
 del pygtk_version_required
 
-# do after gtk else get "pygtk.require() must be called before importing gtk" errors
+# do after gtk else get "pygtk.require() must be called before importing gtk"
+# errors
 if numerix.which[0] == "numarray":
     from matplotlib._na_backend_gdk import pixbuf_get_pixels_array
 else:
@@ -47,7 +48,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 DEBUG = False
 
 # Image formats that this backend supports - for FileChooser and print_figure()
-IMAGE_FORMAT          = ['eps', 'jpg', 'png', 'ps', 'svg'] + ['bmp'] # , 'raw', 'rgb']
+IMAGE_FORMAT  = ['eps', 'jpg', 'png', 'ps', 'svg'] + ['bmp'] # , 'raw', 'rgb']
 IMAGE_FORMAT.sort()
 IMAGE_FORMAT_DEFAULT  = 'png'
 
@@ -79,7 +80,8 @@ class RendererGDK(RendererBase):
     rotated = {}  # a map from text prop tups to rotated text pixbufs
 
     def __init__(self, gtkDA, dpi):
-        # gtkDA is used in '<widget>.create_pango_layout(s)' (and cmap line below) only
+        # gtkDA is used in '<widget>.create_pango_layout(s)' (and cmap line
+        # below) only
         self.gtkDA = gtkDA
         self.dpi   = dpi
         self._cmap = gtkDA.get_colormap()
@@ -257,7 +259,8 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
         Draw the text rotated 90 degrees, other angles are not supported
         """
         # this function (and its called functions) is a bottleneck
-        # Pango 1.6 supports rotated text, but pygtk 2.4.0 does not yet have wrapper functions
+        # Pango 1.6 supports rotated text, but pygtk 2.4.0 does not yet have
+        # wrapper functions
         # GTK+ 2.6 pixbufs support rotation
 
         gdrawable = self.gdkDrawable
@@ -279,7 +282,6 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
 
         imageBack = gdrawable.get_image(x, y, w, h)
         imageVert = gdrawable.get_image(x, y, h, w)
-        #imageFlip = gtk.gdk.Image(type=gdk.IMAGE_NORMAL,
         imageFlip = gtk.gdk.Image(type=gdk.IMAGE_FASTEST,
                                   visual=gdrawable.get_visual(),
                                   width=w, height=h)
@@ -313,7 +315,8 @@ def _get_pango_layout(self, s, prop):
         Ref: pango/fonts.c/pango_font_description_set_size() manual page
         """
         # problem? - cache gets bigger and bigger, is never cleared out
-        # two (not one) layouts are created for every text item s (then they are cached) - why?
+        # two (not one) layouts are created for every text item s (then they
+        # are cached) - why?
 
         key = self.dpi.get(), s, hash(prop)
         value = self.layoutd.get(key)
@@ -458,7 +461,8 @@ def new_figure_manager(num, *args, **kwargs):
     canvas  = FigureCanvasGDK(thisFig)
     manager = FigureManagerBase(canvas, num)
     # equals:
-    #manager = FigureManagerBase (FigureCanvasGDK (Figure(*args, **kwargs), num)
+    #manager = FigureManagerBase (FigureCanvasGDK (Figure(*args, **kwargs),
+    #                             num)
     return manager
 
 
@@ -519,10 +523,10 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
             width, height = int(width), int(height)
             self._render_figure(width, height)
 
-            # jpg colors don't match the display very well, png colors match better
+            # jpg colors don't match the display very well, png colors match
+            # better
             pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, 0, 8,
                                     width, height)
-            #pixbuf.get_from_drawable(self._pixmap, self._pixmap.get_colormap(),
             pixbuf.get_from_drawable(self._pixmap, self._renderer._cmap,
                                      0, 0, 0, 0, width, height)
 

lib/matplotlib/backends/backend_gtk.py

@@ -47,8 +47,9 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 PIXELS_PER_INCH = 96
 
 # Image formats that this backend supports - for FileChooser and print_figure()
-IMAGE_FORMAT          = ['bmp', 'eps', 'jpg', 'png', 'ps', 'svg']
-#IMAGE_FORMAT          = ['bmp', 'eps', 'jpg', 'png', 'pdf', 'ps', 'svg'] # pdf not ready yet
+IMAGE_FORMAT = ['bmp', 'eps', 'jpg', 'png', 'ps', 'svg']
+# pdf not ready yet
+#IMAGE_FORMAT  = ['bmp', 'eps', 'jpg', 'png', 'pdf', 'ps', 'svg']
 IMAGE_FORMAT.sort()
 IMAGE_FORMAT_DEFAULT  = 'png'
 
@@ -64,7 +65,9 @@ def fn_name(): return sys._getframe(1).f_code.co_name
     }
 
 # ref gtk+/gtk/gtkwidget.h
-def GTK_WIDGET_DRAWABLE(w): flags = w.flags(); return flags & gtk.VISIBLE !=0 and flags & gtk.MAPPED != 0
+def GTK_WIDGET_DRAWABLE(w):
+    flags = w.flags();
+    return flags & gtk.VISIBLE !=0 and flags & gtk.MAPPED != 0
 
 
 def draw_if_interactive():
@@ -118,7 +121,7 @@ def __init__(self, figure):
         FigureCanvasBase.__init__(self, figure)
         gtk.DrawingArea.__init__(self)
 
-        self._idleID        = 0      # used in gtkAgg
+        self._idleID        = 0
         self._draw_pixmap   = True
         self._pixmap_width  = -1
         self._pixmap_height = -1
@@ -242,11 +245,13 @@ def _render_figure(self, width, height):
             create_pixmap = False
             if width > self._pixmap_width:
                 # increase the pixmap in 10%+ (rather than 1 pixel) steps
-                self._pixmap_width  = max (int (self._pixmap_width  * 1.1), width)
+                self._pixmap_width  = max (int (self._pixmap_width  * 1.1),
+                                           width)
                 create_pixmap = True
 
             if height > self._pixmap_height:
-                self._pixmap_height = max (int (self._pixmap_height * 1.1), height)
+                self._pixmap_height = max (int (self._pixmap_height * 1.1),
+                                           height)
                 create_pixmap = True
 
             if create_pixmap:
@@ -298,7 +303,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
         origWIn, origHIn = self.figure.get_size_inches()
 
         if self.flags() & gtk.REALIZED == 0:
-            # for self.window(for pixmap) and has a side effect of altering figure width,height (via configure-event?)
+            # for self.window(for pixmap) and has a side effect of altering
+            # figure width,height (via configure-event?)
             gtk.DrawingArea.realize(self) 
 
         self.figure.dpi.set(dpi)        
@@ -317,7 +323,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
 
             DBL_BUFFER = dbl_buffer_save
 
-            # jpg colors don't match the display very well, png colors match better
+            # jpg colors don't match the display very well, png colors match
+            # better
             pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, 0, 8,
                                     width, height)
             pixbuf.get_from_drawable(self._pixmap, self._pixmap.get_colormap(),
@@ -338,7 +345,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
 
             try:
                 fc = self.switch_backends(FigureCanvas)
-                fc.print_figure(filename, dpi, facecolor, edgecolor, orientation)
+                fc.print_figure(filename, dpi, facecolor, edgecolor,
+                                orientation)
             except IOError, exc:
                 error_msg_gtk("Save figure failure:\n%s: %s" %
                           (exc.filename, exc.strerror), parent=self)
@@ -354,7 +362,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
                           parent=self)                
             else:
                 fc = self.switch_backends(FigureCanvas)
-                fc.print_figure(filename, dpi, facecolor, edgecolor, orientation)
+                fc.print_figure(filename, dpi, facecolor, edgecolor,
+                                orientation)
 
         elif ext in ('pdf',):
             try: 
@@ -365,7 +374,8 @@ def print_figure(self, filename, dpi=150, facecolor='w', edgecolor='w',
                           parent=self)                
             else:
                 fc = self.switch_backends(FigureCanvas)
-                fc.print_figure(filename, dpi, facecolor, edgecolor, orientation)
+                fc.print_figure(filename, dpi, facecolor, edgecolor,
+                                orientation)
 
         else:
             error_msg_gtk('Format "%s" is not supported.\nSupported formats are %s.' %
@@ -501,7 +511,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
 
             ax = event.inaxes
             l,b,w,h = [int(val) for val in ax.bbox.get_bounds()]
-            b = int(height)-(b+h)            # b = y = int(height)-(b+h)  # y not used
+            b = int(height)-(b+h)
             axrect = l,b,w,h
             self._imageBack = axrect, drawable.get_image(*axrect)            
             drawable.draw_rectangle(gc, False, *rect)
@@ -573,7 +583,9 @@ def _init_toolbar2_4(self):
 
         toolitem = gtk.SeparatorToolItem()
         self.insert(toolitem, -1)
-        toolitem.set_draw(False)  # set_draw() not making separator invisible, bug #143692 fixed Jun 06 2004, will be in GTK+ 2.6
+        # set_draw() not making separator invisible,
+        # bug #143692 fixed Jun 06 2004, will be in GTK+ 2.6
+        toolitem.set_draw(False)
         toolitem.set_expand(True)
 
         toolitem = gtk.ToolItem()
@@ -608,21 +620,25 @@ class NavigationToolbar(gtk.Toolbar):
          gtk.STOCK_GO_BACK, 'panx', -1, True),
         ('Right', 'Pan right with click or wheel mouse (bidirectional)',
          gtk.STOCK_GO_FORWARD, 'panx', 1, True),
-        ('Zoom In X', 'Zoom In X (shrink the x axis limits) with click or wheel' 
+        ('Zoom In X',
+         'Zoom In X (shrink the x axis limits) with click or wheel' 
          ' mouse (bidirectional)',
          gtk.STOCK_ZOOM_IN, 'zoomx', 1, True),
-        ('Zoom Out X', 'Zoom Out X (expand the x axis limits) with click or wheel'
+        ('Zoom Out X',
+         'Zoom Out X (expand the x axis limits) with click or wheel'
          ' mouse (bidirectional)',
          gtk.STOCK_ZOOM_OUT, 'zoomx', -1, True),
         (None, None, None, None, None, None,),   
         ('Up', 'Pan up with click or wheel mouse (bidirectional)',
          gtk.STOCK_GO_UP, 'pany', 1, True),
         ('Down', 'Pan down with click or wheel mouse (bidirectional)',
          gtk.STOCK_GO_DOWN, 'pany', -1, True),
-        ('Zoom In Y', 'Zoom in Y (shrink the y axis limits) with click or wheel'
+        ('Zoom In Y',
+         'Zoom in Y (shrink the y axis limits) with click or wheel'
          ' mouse (bidirectional)',
          gtk.STOCK_ZOOM_IN, 'zoomy', 1, True),
-        ('Zoom Out Y', 'Zoom Out Y (expand the y axis limits) with click or wheel'
+        ('Zoom Out Y',
+         'Zoom Out Y (expand the y axis limits) with click or wheel'
          ' mouse (bidirectional)',
          gtk.STOCK_ZOOM_OUT, 'zoomy', -1, True),
         (None, None, None, None, None, None,),
@@ -639,7 +655,8 @@ def __init__(self, canvas, window):
         gtk.Toolbar.__init__(self)
 
         self.canvas = canvas
-        self.win    = window # Note: gtk.Toolbar already has a 'window' attribute
+        # Note: gtk.Toolbar already has a 'window' attribute
+        self.win    = window
 
         self.set_style(gtk.TOOLBAR_ICONS)
 
@@ -671,7 +688,8 @@ def _create_toolitems_2_4(self):
                                      text)
             self.insert(tbutton, -1)
             if callback_arg:
-                tbutton.connect('clicked', getattr(self, callback), callback_arg)
+                tbutton.connect('clicked', getattr(self, callback),
+                                callback_arg)
             else:
                 tbutton.connect('clicked', getattr(self, callback))
             if scroll:
@@ -681,9 +699,10 @@ def _create_toolitems_2_4(self):
         # Axes toolitem, is empty at start, update() adds a menu if >=2 axes
         self.axes_toolitem = gtk.ToolItem()
         self.insert(self.axes_toolitem, 0)
-        self.axes_toolitem.set_tooltip(self.tooltips,
-                                       tip_text='Select axes that controls affect',
-                                       tip_private = 'Private')
+        self.axes_toolitem.set_tooltip (
+            self.tooltips,
+            tip_text='Select axes that controls affect',
+            tip_private = 'Private')
 
         align = gtk.Alignment (xalign=0.5, yalign=0.5, xscale=0.0, yscale=0.0)
         self.axes_toolitem.add(align)
@@ -709,7 +728,8 @@ def position_menu (menu):
             return x, y, True
 
         def button_clicked (button, data=None):
-            self.axismenu.popup (None, None, position_menu, 0, gtk.get_current_event_time())
+            self.axismenu.popup (None, None, position_menu, 0,
+                                 gtk.get_current_event_time())
 
         self.menubutton.connect ("clicked", button_clicked)