SC 09/12/2004

Steve Chaplin · Steve Chaplin · commit 9c1cd9f0d77e · 2004-12-09T11:04:43.000Z
svn path=/trunk/matplotlib/; revision=741
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,8 @@
 New entries should be added at the top
+2004-12-09 backend_gtk.py: split into two parts 
+           - backend_gdk.py - an image backend
+           - backend_gtk.py - A GUI backend that uses GDK
+
 2004-12-08 backend_gtk.py: remove quit_after_print_xvfb(*args), show_xvfb(), 
 	   Dialog_MeasureTool(gtk.Dialog) one month after sending mail to
            matplotlib-users asking if anyone still uses these functions - SC
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -758,9 +758,9 @@ def rcdefaults():
 # flag)
 
 _knownBackends = {
-    'PS':1, 'GTK':1, 'Template':1, 'GD':1,
-    'WX':1, 'Paint':1, 'Agg':1, 'GTKAgg':1, 'SVG':1,
-    'TkAgg':1, 'WXAgg':1, 'FltkAgg':1, 'Cairo':1, 'GTKCairo':1,}
+    'Agg':1, 'Cairo':1, 'FltkAgg':1, 'GD':1, 'GDK':1, 'GTK':1, 'GTKAgg':1,
+    'GTKCairo':1, 'Paint':1, 'PS':1, 'SVG':1, 'Template':1, 'TkAgg':1, 'WX':1,
+    'WXAgg':1, }
 
 if hasattr(sys,'argv'):         # mod_python doesn't have argv attr
     known = _knownBackends.keys()
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -5,8 +5,8 @@
 __all__ = ['backend','show','draw_if_interactive','error_msg',
            'new_figure_manager', 'backend_version']
 
-interactive_bk     = ['GTK','GTKAgg','FltkAgg','TkAgg','WX','WXAgg','GTKCairo']
-non_interactive_bk = ['Template', 'PS','GD','Agg','SVG', 'Paint', 'Cairo']
+interactive_bk     = ['GTK','GTKAgg','GTKCairo','FltkAgg','TkAgg','WX','WXAgg',]
+non_interactive_bk = ['Agg','Cairo','GD','GDK','Paint','PS','SVG','Template']
 all_backends       = interactive_bk + non_interactive_bk
 
 backend = matplotlib.get_backend()
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -103,36 +103,6 @@ def _set_width_height(self, width, height):
         self.width    = width
         self.height   = height
 
-    def get_canvas_width_height(self):
-        if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        return self.width, self.height
-    
-
-    def get_text_width_height(self, s, prop, ismath):
-        if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        if ismath:
-            print 'ismath get_text_width_height() not implemented yet'
-            return 1, 1
-        else:
-            ctx = self.text_ctx
-            ctx.save()
-            ctx.select_font (prop.get_name(),
-                             self.fontangles [prop.get_style()],
-                             self.fontweights[prop.get_weight()])
-
-            # 1.4 scales font to a similar size to GTK / GTKAgg backends
-            size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH * 1.4
-            # problem - scale remembers last setting and font can become
-            # enormous causing program to crash
-            # save/restore prevents the problem
-            ctx.scale_font (size)
-        
-            w, h = ctx.text_extents (s)[2:4]
-            ctx.restore()
-            
-            return w, h
-
-                              
     def draw_arc(self, gc, rgbFace, x, y, width, height, angle1, angle2):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         # cairo draws circular arcs (width=height)
@@ -280,6 +250,36 @@ def flipy(self):
         return True
 
     
+    def get_canvas_width_height(self):
+        if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
+        return self.width, self.height
+    
+
+    def get_text_width_height(self, s, prop, ismath):
+        if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
+        if ismath:
+            print 'ismath get_text_width_height() not implemented yet'
+            return 1, 1
+        else:
+            ctx = self.text_ctx
+            ctx.save()
+            ctx.select_font (prop.get_name(),
+                             self.fontangles [prop.get_style()],
+                             self.fontweights[prop.get_weight()])
+
+            # 1.4 scales font to a similar size to GTK / GTKAgg backends
+            size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH * 1.4
+            # problem - scale remembers last setting and font can become
+            # enormous causing program to crash
+            # save/restore prevents the problem
+            ctx.scale_font (size)
+        
+            w, h = ctx.text_extents (s)[2:4]
+            ctx.restore()
+            
+            return w, h
+
+                              
     def new_gc(self):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
         gc = GraphicsContextCairo (renderer=self)
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
