fixed some legend bugs

jdh2358 · jdh2358 · commit 87fc49408818 · 2004-12-01T15:01:11.000Z
svn path=/trunk/matplotlib/; revision=726
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,10 @@
 New entries should be added at the top
+
+2004-12-04 Fixed some legend bugs JDH
+
+2004-11-30 Added over command for oneoff over plots.  Eg over(plot, x,
+           y, lw=2).  Works with any plot function.
+ 
 2004-11-30 Added bbox property to text - JDH
 
 2004-11-29 Added the over command to the matlab interface.  over
diff --git a/TODO b/TODO
@@ -599,4 +599,9 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- oplot
 
--- override setattr in matlab interface for artists.
+-- override setattr in matlab interface for artists.
+
+-- cmap observer bug - see
+   ~/python/matplotlib_support/test/cmap_observer_bug.py
+
+-- add connect function.
diff --git a/examples/dash_control.py b/examples/dash_control.py
@@ -10,5 +10,5 @@
 
 l, = plot(arange(20), '--')
 l.set_dashes(dashes)
-#savefig('dash_control')
+savefig('dash_control')
 show()
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -12,6 +12,6 @@
 title('About as simple as it gets, folks')
 grid(True)
 #axis([0,1,-1,1])
-#savefig('simple_plot')
+savefig('simple_plot')
 
 show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -9,7 +9,7 @@
 from artist import Artist
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, True, False,\
-     allequal, dict_delall, strip_math
+     allequal, dict_delall, strip_math, popd
 from collections import RegularPolyCollection, PolyCollection
 from colors import colorConverter, normalize, Colormap, LinearSegmentedColormap
 import cm
@@ -1474,13 +1474,13 @@ def legend(self, *args, **kwargs):
         if len(args)==0:
             labels = [line.get_label() for line in self.lines]
             lines = self.lines
-            loc = kwargs.gry('loc', 1)
+            loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==1:
             # LABELS
             labels = args[0]
             lines = [line for line, label in zip(self.lines, labels)]
-            loc = kwargs.get('loc', 1)
+            loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==2:
             if is_string_like(args[1]) or isinstance(args[1], int):
@@ -1490,14 +1490,15 @@ def legend(self, *args, **kwargs):
             else:
                 # LINES, LABELS
                 lines, labels = args
-                loc = kwargs.get('loc', 1)
+                loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==3:
             # LINES, LABELS, LOC
             lines, labels, loc = args
         else:
             raise RuntimeError('Invalid arguments to legend')
 
+
         lines = flatten(lines)
         self.legend_ = Legend(self, lines, labels, loc, **kwargs)
         return self.legend_
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -462,7 +462,7 @@ def add_observer(self, mappable):
         cmap of another image
         """
         self.observers.append(mappable)
-
+        
     def notify(self, mappable):
         """
         If this is called then we are pegged to another mappable.
diff --git a/lib/matplotlib/matlab.py b/lib/matplotlib/matlab.py
@@ -368,7 +368,6 @@ def changed_name_function(f, newname):
         newf =  new.function(f.func_code, f.func_globals, newname,
                              argdefs)
 
-    print f.func_defaults
     newf.__doc__ = f.__doc__
     return newf
 
@@ -816,13 +815,6 @@ def get(o, *args):
     func = getattr(o, 'get_' + name)
     return func()
 
-def gray():
-    'set the default colormap to gray and apply to current image if any'
-    rc('image', cmap='gray')
-    im = gci()
-    if im is not None:
-        im.set_cmap(cm.gray)
-        draw_if_interactive()
 
 # define the colormap functions
 fmt = """\
@@ -835,6 +827,7 @@ def %s():
     draw_if_interactive()
 """
 
+# add all the colormaps (autumn, hsv, ....)
 for name in cm.datad.keys():
     s = fmt%(name, name, name, name)
     exec(s)
