fixed bug 1202831

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

Author: jdh2358

API_CHANGES

@@ -1,5 +1,15 @@
+
 API Changes in matplotlib-0.82.1
 
+  backends/__init__.py no longer imports new_figure_manager,
+  draw_if_interactive and show from the default backend, but puts
+  these imports into a call to pylab_setup.  Also, the Toolbar is no
+  longer imported from WX/WXAgg.  New usage
+
+   from backends import pylab_setup
+   new_figure_manager, draw_if_interactive, show = pylab_setup()
+
+  
   Moved Figure.get_width_height() to FigureCanvasBase. It now returns
   int instead of float.
 

CHANGELOG

@@ -1,10 +1,16 @@
 New entries should be added at the top
 
+
+2005-07-05 Fixed default backend import problem when using API (SF bug
+           # 1209354 -  see API_CHANGES for more info - JDH
+
+
 2005-07-04 backend_gtk.py: require PyGTK version 2.0.0 or higher - SC
 
 2005-06-30 setupext.py: added numarray_inc_dirs for building against
            numarray when not installed in standard location - ADS
 
+
 2005-06-27 backend_svg.py: write figure width, height as int, not float.
            Update to fix some of the pychecker warnings - SC
 

TODO

@@ -707,5 +707,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- clipping off in date_demo_rrule (agg 0.5 offset bug?)
 
--- merge qt patch.
+-- DONE merge qt patch.
 
+-- add frac kwarg to 

examples/webapp_demo.py

@@ -61,9 +61,9 @@ def make_fig():
     line,  = ax.plot([1,2,3], 'ro--', markersize=12, markerfacecolor='g')
 
     # make a translucent scatter collection 
-    x = nx.rand(100)
-    y = nx.rand(100)
-    area = nx.pi*(10 * nx.rand(100))**2 # 0 to 10 point radiuses
+    x = nx.mlab.rand(100)
+    y = nx.mlab.rand(100)
+    area = nx.pi*(10 * nx.mlab.rand(100))**2 # 0 to 10 point radiuses
     c = ax.scatter(x,y,area)
     c.set_alpha(0.5)  
 

lib/matplotlib/axes.py

@@ -749,7 +749,11 @@ def _get_verts_in_data_coords(self, trans, xys):
         return [ self.transData.inverse_xy_tup(xy) for xy in xys]
 
     def add_patch(self, p):
-        'Add a line to the list of plot lines'
+        """
+        Add a patch to the list of Axes patches; the clipbox will be
+        set to the Axes clipping box.  If the transform is not set, it
+        wil be set to self.transData.
+        """
         self._set_artist_props(p)
         p.set_clip_box(self.bbox)
         xys = self._get_verts_in_data_coords(
@@ -1463,7 +1467,19 @@ def errorbar(self, x, y, yerr=None, xerr=None,
             barsabove, if True, will plot the errorbars above the plot symbols
             - default is below
 
-            kwargs are passed on to the plot command for the markers
+            kwargs are passed on to the plot command for the markers.
+              So you can add additional key=value pairs to control the
+              errorbar markers.  For example, this code makes big red
+              squares with thick green edges
+
+              >>> x,y,yerr = rand(3,10)
+              >>> errorbar(x, y, yerr, marker='s',
+                           mfc='red', mec='green', ms=20, mew=4)
+
+             mfc, mec, ms and mew are aliases for the longer property
+             names, markerfacecolor, markeredgecolor, markersize and
+             markeredgewith.  
+
 
         Return value is a length 2 tuple.  The first element is a list of
         y symbol lines.  The second element is a list of error bar lines.

lib/matplotlib/backends/__init__.py

@@ -9,36 +9,43 @@
 non_interactive_bk = ['Agg2', 'Agg','Cairo','GD','GDK','Paint','PS', 'LaTeX', 'SVG','Template']
 all_backends       = interactive_bk + non_interactive_bk
 
+
 backend = matplotlib.get_backend()
 if backend not in all_backends:
     raise ValueError, 'Unrecognized backend %s' % backend
 
-# Import the requested backend into a generic module object
-backend_name = 'backend_'+backend.lower()
-backend_mod = __import__('matplotlib.backends.'+backend_name,
-                         globals(),locals(),[backend_name])
 
-# Things we pull in from all backends
-new_figure_manager = backend_mod.new_figure_manager
+def pylab_setup():
+    'return new_figure_manager, draw_if_interactive and show for pylab'
+    # Import the requested backend into a generic module object
+    backend_name = 'backend_'+backend.lower()
+    backend_mod = __import__('matplotlib.backends.'+backend_name,
+                             globals(),locals(),[backend_name])
+
+    # Things we pull in from all backends
+    new_figure_manager = backend_mod.new_figure_manager
+
+    if hasattr(backend_mod,'backend_version'):
+        backend_version = getattr(backend_mod,'backend_version')
+    else: backend_version = 'unknown'
+
 
-if hasattr(backend_mod,'backend_version'):
-    backend_version = getattr(backend_mod,'backend_version')
-else: backend_version = 'unknown'
 
+    # Now define the public API according to the kind of backend in use
+    if backend in interactive_bk:
+        show       = backend_mod.show
+        draw_if_interactive = backend_mod.draw_if_interactive
+    else:  # non-interactive backends
+        def draw_if_interactive():  pass
+        def show(): pass
 
+    # Additional imports which only happen for certain backends.  This section
+    # should probably disappear once all backends are uniform.
+    if backend in ['WX','WXAgg']:
+        Toolbar = backend_mod.Toolbar
+        __all__.append('Toolbar')
 
-# Now define the public API according to the kind of backend in use
-if backend in interactive_bk:
-    show       = backend_mod.show
-    draw_if_interactive = backend_mod.draw_if_interactive
-else:  # non-interactive backends
-    def draw_if_interactive():  pass
-    def show(): pass
+    matplotlib.verbose.report('backend %s version %s' % (backend,backend_version))
+    return new_figure_manager, draw_if_interactive, show
 
-# Additional imports which only happen for certain backends.  This section
-# should probably disappear once all backends are uniform.
-if backend in ['WX','WXAgg']:
-    Toolbar = backend_mod.Toolbar
-    __all__.append('Toolbar')
 
-matplotlib.verbose.report('backend %s version %s' % (backend,backend_version))

lib/matplotlib/patches.py

@@ -39,6 +39,7 @@ def __init__(self,
 
 
         if len(kwargs): setp(self, **kwargs)
+
     def update_from(self, other):
         Artist.update_from(self, other)
         self.set_edgecolor(other.get_edgecolor())

lib/matplotlib/pylab.py

@@ -197,7 +197,7 @@
 
 from axes import Axes, PolarAxes
 import backends
-from backends import new_figure_manager, draw_if_interactive, show
+from backends import pylab_setup
 
 from cbook import flatten, is_string_like, exception_to_str, popd, \
      silent_list, iterable, enumerate
@@ -211,7 +211,7 @@
 from artist import setp as _setp
 
 
-
+new_figure_manager, draw_if_interactive, show = pylab_setup()
 
 from image import imread as _imread
 from lines import Line2D

lib/matplotlib/widgets.py

@@ -266,11 +266,12 @@ def __init__(self, ax, labels, actives):
         ax.set_navigate(False)        
 
         if len(labels)>1:
-            ys = linspace(1-dy, dy, len(labels))
             dy = 1./(len(labels)+1)
+            ys = linspace(1-dy, dy, len(labels))
         else:
-            ys = [0.5]
             dy = 0.25
+            ys = [0.5]
+            
         cnt = 0
         axcolor = ax.get_axis_bgcolor()