Revision: 6812
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6812&view=rev
Author: efiring
Date: 2009-01-20 02:08:37 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Merge r6811 from v0_98_5_maint
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/quiver.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6809
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6811
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-01-20 02:03:42 UTC (rev 6811)
+++ trunk/matplotlib/CHANGELOG 2009-01-20 02:08:37 UTC (rev 6812)
@@ -1,3 +1,5 @@
+2009-01-19 Fix bug in quiver argument handling. - EF
+
2009-01-19 Fix bug in backend_gtk: don't delete nonexistent toolbar. - EF
2009-01-16 Implement bbox_inches option for savefig. If bbox_inches is
Modified: trunk/matplotlib/lib/matplotlib/quiver.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/quiver.py 2009-01-20 02:03:42 UTC (rev
6811)
+++ trunk/matplotlib/lib/matplotlib/quiver.py 2009-01-20 02:08:37 UTC (rev
6812)
@@ -386,14 +386,13 @@
X, Y, U, V, C = [None]*5
args = list(args)
if len(args) == 3 or len(args) == 5:
- C = ma.asarray(args.pop(-1)).ravel()
+ C = ma.asarray(args.pop(-1))
V = ma.asarray(args.pop(-1))
U = ma.asarray(args.pop(-1))
- nn = np.shape(U)
- nc = nn[0]
- nr = 1
- if len(nn) > 1:
- nr = nn[1]
+ if U.ndim == 1:
+ nr, nc = 1, U.shape[0]
+ else:
+ nr, nc = U.shape
if len(args) == 2: # remaining after removing U,V,C
X, Y = [np.array(a).ravel() for a in args]
if len(X) == nc and len(Y) == nr:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
