added marias legend patch

jdh2358 · jdh2358 · commit bdfb69489add · 2005-07-21T19:16:12.000Z
svn path=/trunk/matplotlib/; revision=1552
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.83
+LICENSE AGREEMENT FOR MATPLOTLIB 0.83.1
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.83
+derivative works, distribute, and otherwise use matplotlib 0.83.1
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2005 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.83 alone or in any derivative version prepared by
+matplotlib 0.83.1 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.83 or any part thereof, and wants to
+incorporates matplotlib 0.83.1 or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.83.
+the changes made to matplotlib 0.83.1.
 
-4. JDH is making matplotlib 0.83 available to Licensee on an "AS
+4. JDH is making matplotlib 0.83.1 available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.83
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.83.1
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.83 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.83.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.83, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.83.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.83,
+8. By copying, installing or otherwise using matplotlib 0.83.1,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
diff --git a/examples/date_demo_rrule.py b/examples/date_demo_rrule.py
@@ -6,8 +6,7 @@
 See https://moin.conectiva.com.br/DateUtil for help with rrules
 """
 from pylab import *
-from matplotlib.dates import YEARLY, DateFormatter, \
-     rrulewrapper, RRuleLocator, drange
+from matplotlib.dates import YEARLY, DateFormatter, rrulewrapper, RRuleLocator, drange
 import datetime
 
 # tick every 5th easter
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -142,7 +142,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.83'
+__version__  = '0.83.1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1693,9 +1693,10 @@ def grid(self, b=None):
         self.xaxis.grid(b)
         self.yaxis.grid(b)
 
-    def hist(self, x, bins=10, normed=0, bottom=0, **kwargs):
+    def hist(self, x, bins=10, normed=0, bottom=0,
+             orientation='vertical', **kwargs):
         """
-        HIST(x, bins=10, normed=0, bottom=0)
+        HIST(x, bins=10, normed=0, bottom=0, orientiation='vertical', **kwargs)
 
         Compute the histogram of x.  bins is either an integer number of
         bins or a sequence giving the bins.  x are the data to be binned.
@@ -1706,12 +1707,20 @@ def hist(self, x, bins=10, normed=0, bottom=0, **kwargs):
         counts normalized to form a probability distribtion, ie,
         n/(len(x)*dbin)
 
-        kwargs are used to update the properties of the hist bars
+
+        orientation = 'horizontal' | 'vertical'.  If horizontal, barh
+        will be used and the "bottom" kwarg will be the left.
+
+        kwargs are used to update the properties of the
+        hist bars
         """
         if not self._hold: self.cla()
         n,bins = matplotlib.mlab.hist(x, bins, normed)
         width = 0.9*(bins[1]-bins[0])
-        patches = self.bar(bins, n, width=width, bottom=bottom)
+        if orientation=='horizontal':
+            patches = self.barh(n, bins, height=width, left=bottom)
+        else:
+            patches = self.bar(bins, n, width=width, bottom=bottom)
         for p in patches:
             p.update(kwargs)
         return n, bins, silent_list('Patch', patches)
@@ -2564,7 +2573,7 @@ def plot(self, *args, **kwargs):
 
     def plot_date(self, d, y, fmt='bo', tz=None, **kwargs):
         """
-        PLOT_DATE(d, y, converter, fmt='bo', tz=None, **kwargs)
+        PLOT_DATE(d, y, fmt='bo', tz=None, **kwargs)
 
         d is a sequence of dates represented as float days since
         0001-01-01 UTC and y are the y values at those dates.  fmt is
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -51,7 +51,7 @@ def line_cuts_bbox(line, bbox):
         return False
 
     if n == 1:
-        return bbox.contains(line[0])
+        return bbox.contains(line[0][0], line[0][1])        
     
     p1 = line[0]
     for p2 in line[1:]:
diff --git a/lib/matplotlib/numerix/__init__.py b/lib/matplotlib/numerix/__init__.py
@@ -87,7 +87,6 @@ def _import_fail_message(module, version):
 %(which)s and then re-install matplotlib. Otherwise, the following
 traceback gives more details:\n""" % _dict
 
-
 g = globals()
 l = locals()
 __import__('ma', g, l)
