added Printf

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

Author: jdh2358

API_CHANGES

@@ -1,3 +1,10 @@
+API CHANGES in matplotlib-0.65
+
+Did away with the text methods for angle since they were ambiguous.
+fontangle could mean fontstyle (obligue, etc) or the rotation of the
+text.  Use style and rotation instead.
+
+
 API CHANGES in matplotlib-0.63
 
   Dates are now represented internally as float days since 0001-01-01,

examples/text_handles.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #Controlling the properties of axis text using handles
 
-# See axis_text_themes.py for a more elegant, pythonic way to control
+# See examples/text_themes.py for a more elegant, pythonic way to control
 # fonts.  After all, if we were slaves to matlab , we wouldn't be
 # using python!
 
@@ -24,17 +24,7 @@ def f(t):
 ytext = ylabel('Damped oscillation')
 xtext = xlabel('time (s)')
 
-set(ttext, 'fontsize', 'large')
-set(ttext, 'color', 'r')
-set(ttext, 'fontangle', 'italic')
-
-set(xtext, 'fontsize', 'medium')
-set(xtext, 'fontname', 'courier')
-set(xtext, 'fontweight', 'bold')
-set(xtext, 'color', 'g')
-
-set(ytext, 'fontsize', 'medium')
-set(ytext, 'fontname', 'helvetica')
-set(ytext, 'fontweight', 'light')
-set(ytext, 'color', 'b')
+set(ttext, size='large', color='r', style='italic')
+set(xtext, size='medium', name='courier', weight='bold', color='g')
+set(ytext, size='medium', name='helvetica', weight='light', color='b')
 show()

examples/text_themes.py

@@ -3,8 +3,8 @@
 
 font = {'family'     : 'serif',
         'color'      : 'r',
-        'fontweight' : 'normal',
-        'fontsize'   : 12,
+        'weight' : 'normal',
+        'size'   : 12,
         }
 
 def f(t):
@@ -16,9 +16,9 @@ def f(t):
 t2 = arange(0.0, 5.0, 0.02)
 
 plot(t1, f(t1), 'bo', t2, f(t2), 'k')
-title('Damped exponential decay', font, fontsize='large', color='r')
+title('Damped exponential decay', font, size='large', color='r')
 text(2, 0.65, 'cos(2 pi t) exp(-t)', font, color='k', family='monospace' )
-xlabel('time (s)', font, fontangle='italic')
+xlabel('time (s)', font, style='italic')
 ylabel('voltage (mV)', font)
 
 #savefig('text_themes')

lib/matplotlib/artist.py

@@ -3,6 +3,24 @@
 from cbook import True, False
 from transforms import identity_transform
 
+## Note, matplotlib artists use the doc strings for set and get
+# methods to enable the introspection methods of set and get in the
+# matlab interface Every set_ to be controlled by the set function
+# method should have a docstring containing the line
+#
+# ACCEPTS: [ legal | values ]
+#
+# and aliases for setters and getters should have a docstring that
+# starts with 'alias for ', as in 'alias for set_somemethod'
+#
+# You may wonder why we use so much boiler-plate manually defining the
+# set_alias and get_alias functions, rather than using some clever
+# python trick.  The answer is that I need to be able to manipulate
+# the docstring, and there is no clever way to do that in python 2.2,
+# as far as I can see - see
+# http://groups.google.com/groups?hl=en&lr=&threadm=mailman.5090.1098044946.5135.python-list%40python.org&rnum=1&prev=/groups%3Fq%3D__doc__%2Bauthor%253Ajdhunter%2540ace.bsd.uchicago.edu%26hl%3Den%26btnG%3DGoogle%2BSearch
+
+
 class Artist:
     """
     Abstract base class for someone who renders into a FigureCanvas
@@ -59,8 +77,8 @@ def set_clip_box(self, clipbox):
 
     def get_alpha(self):
         """
-        Return the alpha value used for blending - not supported on
-        all backends
+Return the alpha value used for blending - not supported on all
+backends
         """
         return self._alpha
 

lib/matplotlib/lines.py

@@ -769,7 +769,6 @@ def set_aa(self, val):
         'alias for set_antialiased'
         self.set_antialiased(val)
 
-
     def set_c(self, val):
         'alias for set_color'
         self.set_color(val)
@@ -804,3 +803,40 @@ def set_ms(self, val):
         'alias for set_markersize'
         self.set_markersize(val)
 
+    def get_aa(self):
+        'alias for get_antialiased'
+        return self.get_antialiased()
+    
+    def get_c(self):
+        'alias for get_color'
+        return self.get_color()
+    
+
+    def get_ls(self):
+        'alias for get_linestyle'
+        return self.get_linestyle()
+    
+
+    def get_lw(self):
+        'alias for get_linewidth'
+        return self.get_linewidth()
+    
+
+    def get_mec(self):
+        'alias for get_markeredgecolor'
+        return self.get_markeredgecolor()
+    
+
+    def get_mew(self):
+        'alias for get_markeredgewidth'
+        return self.get_markeredgewidth()
+    
+
+    def get_mfc(self):
+        'alias for get_markerfacecolor'
+        return self.get_markerfacecolor()
+    
+
+    def get_ms(self):
+        'alias for get_markersize'
+        return self.get_markersize()

lib/matplotlib/matlab.py

@@ -1022,11 +1022,10 @@ def get_aliases(self):
         aliases = {}
         for name in names:
             func = getattr(self.o, name)
+            if not self.is_alias(func): continue
             docstring = func.__doc__
-            if docstring is None: continue
-            if docstring.startswith('alias for '):
-                fullname = docstring[10:]
-                aliases[fullname[4:]] = name[4:]
+            fullname = docstring[10:]
+            aliases[fullname[4:]] = name[4:]
         return aliases
 
     def get_valid_values(self, attr):
@@ -1039,13 +1038,14 @@ def get_valid_values(self, attr):
 
         name = 'set_%s'%attr
         if not hasattr(self.o, name):
-            raise AttributeError('%s has no function %s'%(h,name))
+            raise AttributeError('%s has no function %s'%(self.o,name))
         func = getattr(self.o, name)
 
         docstring = func.__doc__
         if docstring is None: return 'unknown'
 
-        if docstring.startswith('alias'): return docstring
+        if docstring.startswith('alias for '):
+            return None
         for line in docstring.split('\n'):
             line = line.lstrip()
             if not line.startswith('ACCEPTS:'): continue
@@ -1057,10 +1057,21 @@ def get_setters(self):
         Get the attribute strings with setters for object h
         """
 
-        return [name[4:] for name in dir(self.o)
-                if name.startswith('set_') and
-                callable(getattr(self.o,name))]
-
+        setters = []
+        for name in dir(self.o):
+            if not name.startswith('set_'): continue
+            o = getattr(self.o,name)
+            if not callable(o): continue
+            func = o
+            if self.is_alias(func): continue
+            setters.append(name[4:])
+        return setters
+
+    def is_alias(self, o):
+        ds = o.__doc__
+        if ds is None: return False
+        return ds.startswith('alias for ')
+    
     def aliased_name(self, s):
         """
         return 'fullname or alias' if s has an alias.  
@@ -1083,8 +1094,9 @@ def pprint_setters(self, property=None):
             return '    %s: %s' %(property, accepts)
 
         attrs = self.get_setters()
-        lines = []
         attrs.sort()
+        lines = []
+
         for property in attrs:
             accepts = self.get_valid_values(property)
             name = self.aliased_name(property)
@@ -1102,10 +1114,9 @@ def pprint_getters(self):
         lines = []
         for name in getters:
             func = getattr(self.o, name)
-            docstring = func.__doc__
-            if docstring is not None and docstring.startswith('alias'): continue
+            if self.is_alias(func): continue
             try: val = func()
-            except: pass
+            except: continue
             if iterable(val) and len(val)>6:
                 s = str(val[:6]) + '...'
             else:

lib/matplotlib/patches.py

@@ -135,6 +135,42 @@ def get_window_extent(self, renderer=None):
         verts = self.get_verts()
         tverts = self._transform.seq_xy_tups(verts)
         return bound_vertices(tverts)
+
+
+
+    def set_lw(self, val):
+        'alias for set_linewidth'
+        self.set_linewidth(val)
+    
+
+    def set_ec(self, val):
+        'alias for set_edgecolor'
+        self.set_edgecolor(val)
+    
+
+    def set_fc(self, val):
+        'alias for set_facecolor'
+        self.set_facecolor(val)
+
+
+    def get_aa(self):
+        'alias for get_antialiased'
+        return self.get_antialiased()
+    
+
+    def get_lw(self):
+        'alias for get_linewidth'
+        return self.get_linewidth()
+    
+
+    def get_ec(self):
+        'alias for get_edgecolor'
+        return self.get_edgecolor()
+    
+
+    def get_fc(self):
+        'alias for get_facecolor'
+        return self.get_facecolor()
 
 class Rectangle(Patch):
     """
@@ -323,22 +359,3 @@ def draw_bbox(bbox, renderer, color='k', trans=None):
     r.set_clip_on( False )
     r.draw(renderer)
 
-
-    def set_aa(self, val):
-        'alias for set_antialiased'
-        self.set_antialiased(val)
-    
-
-    def set_lw(self, val):
-        'alias for set_linewidth'
-        self.set_linewidth(val)
-    
-
-    def set_ec(self, val):
-        'alias for set_edgecolor'
-        self.set_edgecolor(val)
-    
-
-    def set_fc(self, val):
-        'alias for set_facecolor'
-        self.set_facecolor(val)