SC 04/11/2004

Steve Chaplin · Steve Chaplin · commit 51f94c38522a · 2004-11-04T08:12:33.000Z
svn path=/trunk/matplotlib/; revision=657
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,11 @@
 New entries should be added at the top
 
 ==============================================================
+2004-11-04 backend_agg.py: added IMAGE_FORMAT to list the formats that the 
+           backend can save to.
+           backend_gtkagg.py: added support for saving JPG files by using the
+           GTK backend - SC
+
 2004-10-31 backend_cairo.py: now produces png and ps files (although the figure
            sizing needs some work). pycairo did not wrap all the necessary 
            functions, so I wrapped them myself, they are included in the 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -89,6 +89,9 @@
 backend_version = 'v2.2'
 _fontd = {}     # a map from fname to font instances
 
+IMAGE_FORMAT         = ['eps', 'bmp', 'png', 'ps', 'raw', 'rgb', 'svg']
+IMAGE_FORMAT_DEFAULT = 'png'
+
 class RendererAgg(RendererBase):
     """
     The renderer handles all the drawing primitives using a graphics
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -380,10 +380,9 @@ def set_clip_rectangle(self, rectangle):
         """
         Set the clip rectangle with sequence (left, bottom, width, height)
         """
-        # Cairo clipping is currently extremely slow, so I disabled it
+        # Cairo clipping is currently extremely slow
         # cairo/BUGS lists it as a known bug
         self._cliprect = rectangle
-        return
 
         x,y,w,h = rectangle
         ctx = self.ctx
@@ -508,7 +507,6 @@ def print_figure_fn(figure, filename, dpi=150, facecolor='w', edgecolor='w',
     figure.set_edgecolor(edgecolor)        
 
     ext = ext.lower()
-    print 'filename:', filename
     if ext in ('png', 'ps'):
         try:
             fileObject = file(filename,'wb')
@@ -577,7 +575,7 @@ def _save_ps (figure, fileObject, orientation):
     renderer = RendererCairo (ctx.target_surface, ctx.matrix, width, height, figure.dpi)
     figure.draw(renderer)
             
-    show_fig_border = True  # for testing figure orientation and scaling
+    show_fig_border = False  # for testing figure orientation and scaling
     if show_fig_border:
         ctx.new_path()
         ctx.rectangle(0, 0, width, height)
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -548,13 +548,6 @@ def set_joinstyle(self, js):
         self.gdkGC.join_style = self._joind[self._joinstyle]
 
 
-def raise_msg_to_str(msg):
-    """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
-    
-
 def error_msg_gtk(msg, parent=None):
     dialog = gtk.MessageDialog(
         parent         = parent,
@@ -847,11 +840,16 @@ def gdk_pixmap_save (pixmap, filename, ext, width, height):
     # pixbuf.save() recognises 'jpeg' not 'jpg'
     if ext == 'jpg': ext = 'jpeg' 
     try: pixbuf.save(filename, ext)
-    except gobject.GError, msg:
-        msg = raise_msg_to_str(msg)
+    except gobject.GError, exc:
         error_msg('Could not save figure to %s\n\n%s' % (
-            filename, msg))
+            filename, exc))
 
+#def raise_msg_to_str(msg):
+#    """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
+    
 
 class FigureManagerGTK(FigureManagerBase):
     """
@@ -879,9 +877,8 @@ def __init__(self, canvas, num):
         # must be inited after the window, drawingArea and figure
         # attrs are set
         if matplotlib.rcParams['toolbar']=='classic':
-            self.toolbar = NavigationToolbar( canvas, self.window )
+            self.toolbar = NavigationToolbar (canvas, self.window)
         elif matplotlib.rcParams['toolbar']=='toolbar2':
-            #self.toolbar = NavigationToolbar2GTK( canvas )
             self.toolbar = NavigationToolbar2GTK (canvas, self.window)
         else:
             self.toolbar = None
@@ -1139,7 +1136,7 @@ class NavigationToolbar(gtk.Toolbar):
          gtk.STOCK_SAVE, 'save_figure', None, False),
         )
     
-    def __init__(self, canvas, window=None):
+    def __init__(self, canvas, window):
         """
         figManager is the FigureManagerGTK instance that contains the
         toolbar, with attributes figure, window and drawingArea
@@ -1148,7 +1145,7 @@ def __init__(self, canvas, window=None):
         gtk.Toolbar.__init__(self)
 
         self.canvas = canvas
-        self.win    = window
+        self.win    = window # Note: gtk.Toolbar already has a 'window' attribute
         
         self.set_style(gtk.TOOLBAR_ICONS)
 
@@ -1424,6 +1421,7 @@ def __init__ (self,
 
             self.IMAGE_FORMAT         = matplotlib.backends.backend_mod.IMAGE_FORMAT
             self.IMAGE_FORMAT_DEFAULT = matplotlib.backends.backend_mod.IMAGE_FORMAT_DEFAULT
+            self.IMAGE_FORMAT.sort()
 
             # create an extra widget to list supported image formats
             self.set_current_folder (self.path)
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -8,7 +8,7 @@
 from matplotlib.cbook import enumerate, True, False
 from matplotlib.figure import Figure
 
-from backend_agg import FigureCanvasAgg
+from backend_agg import FigureCanvasAgg, IMAGE_FORMAT, IMAGE_FORMAT_DEFAULT
 from backend_gtk import gtk, FigureManagerGTK, FigureCanvasGTK,\
      show, draw_if_interactive,\
      error_msg, NavigationToolbar, PIXELS_PER_INCH, backend_version
@@ -19,8 +19,7 @@
 DEBUG = 0
 
 # Image formats that this backend supports - for FileChooser and print_figure()
-IMAGE_FORMAT         = ['eps', 'bmp', 'png', 'ps', 'raw', 'rgb', 'svg']
-IMAGE_FORMAT_DEFAULT = 'png'
+IMAGE_FORMAT += ['jpg']
 
 
 def new_figure_manager(num, *args, **kwargs):
@@ -59,8 +58,15 @@ def print_figure(self, filename, dpi=150,
         if DEBUG: print 'FigureCanvasGTKAgg.print_figure'
         # delete the renderer to prevent improper blitting after print
 
-        agg = self.switch_backends(FigureCanvasAgg)
-        agg.print_figure(filename, dpi, facecolor, edgecolor, orientation)
+        root, ext = os.path.splitext(filename)       
+        ext = ext.lower()[1:]
+        if ext == 'jpg':
+            FigureCanvasGTK.print_figure(self, filename, dpi, facecolor,
+                                         edgecolor, orientation)
+            
+        else:
+            agg = self.switch_backends(FigureCanvasAgg)
+            agg.print_figure(filename, dpi, facecolor, edgecolor, orientation)
 
 
 
