SF.net SVN: matplotlib:[7911] trunk/matplotlib/lib/matplotlib

[<lee...@us...>]

Revision: 7911
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7911&view=rev
Author:   leejjoon
Date:     2009-10-29 19:04:42 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
fix patheffect to work w/ MixedModeRenederer

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/patheffects.py
    trunk/matplotlib/lib/matplotlib/text.py

Modified: trunk/matplotlib/lib/matplotlib/patheffects.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patheffects.py	2009-10-26 17:08:35 UTC (rev 7910)
+++ trunk/matplotlib/lib/matplotlib/patheffects.py	2009-10-29 19:04:42 UTC (rev 7911)
@@ -5,6 +5,7 @@
 """
 
 from matplotlib.backend_bases import RendererBase
+from matplotlib.backends.backend_mixed import MixedModeRenderer
 import matplotlib.transforms as transforms
 
 
@@ -57,6 +58,9 @@
 
     def _draw_text_as_path(self, renderer, gc, x, y, s, prop, angle, ismath):
 
+        if isinstance(renderer, MixedModeRenderer):
+            renderer = renderer._renderer
+            
         path, transform = RendererBase._get_text_path_transform(renderer,
                                                                 x, y, s,
                                                                 prop, angle,

Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py	2009-10-26 17:08:35 UTC (rev 7910)
+++ trunk/matplotlib/lib/matplotlib/text.py	2009-10-29 19:04:42 UTC (rev 7911)
@@ -278,9 +278,15 @@
         horizLayout = np.zeros((len(lines), 4))
 
         if self.get_path_effects():
-            def get_text_width_height_descent(*kl, **kwargs):
-                return RendererBase.get_text_width_height_descent(renderer,
-                                                                  *kl, **kwargs)
+            from matplotlib.backends.backend_mixed import MixedModeRenderer
+            if isinstance(renderer, MixedModeRenderer):
+                def get_text_width_height_descent(*kl, **kwargs):
+                    return RendererBase.get_text_width_height_descent(renderer._renderer,
+                                                                      *kl, **kwargs)
+            else:
+                def get_text_width_height_descent(*kl, **kwargs):
+                    return RendererBase.get_text_width_height_descent(renderer,
+                                                                      *kl, **kwargs)
         else:
             get_text_width_height_descent = renderer.get_text_width_height_descent
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.