Revision: 8621
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8621&view=rev
Author:   mdboom
Date:     2010-08-04 12:29:18 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
Merged revisions 
8514,8517,8519,8521,8524,8526,8539,8541,8543,8549,8554,8557,8559,8562,8564,8566,8568,8570-8571,8573,8575,8577,8579,8581,8583,8585,8588,8590,8592-8593,8595,8597,8601,8603,8610,8612,8614,8617
 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8514 | jdh2358 | 2010-07-06 10:48:31 -0400 (Tue, 06 Jul 2010) | 1 line
  
  update coding guide to point to 1.0 release branch
........
  r8517 | mdboom | 2010-07-06 11:30:34 -0400 (Tue, 06 Jul 2010) | 1 line
  
  Testing merging
........
  r8519 | mdboom | 2010-07-06 11:31:53 -0400 (Tue, 06 Jul 2010) | 1 line
  
  Testing merging (removing bogus content)
........
  r8521 | jdh2358 | 2010-07-06 11:48:16 -0400 (Tue, 06 Jul 2010) | 1 line
  
  update download site in site docs
........
  r8524 | jdh2358 | 2010-07-06 17:54:21 -0400 (Tue, 06 Jul 2010) | 1 line
  
  add gridspec api to toc
........
  r8526 | mdboom | 2010-07-07 09:19:29 -0400 (Wed, 07 Jul 2010) | 2 lines
  
  Backport of r8515: Reset clipping upon exit of draw_markers to avoid negative 
interaction with blitting.
........
  r8539 | ryanmay | 2010-07-09 14:30:07 -0400 (Fri, 09 Jul 2010) | 1 line
  
  Fix setting of minor ticklabels. As far as I can tell, the extra call to 
set_major_formatter is due to an SVN merge error from the transforms branch.
........
  r8541 | leejjoon | 2010-07-13 12:39:40 -0400 (Tue, 13 Jul 2010) | 1 line
  
  Text.draw uses _set_gc_clip to set clip property
........
  r8543 | weathergod | 2010-07-13 22:42:19 -0400 (Tue, 13 Jul 2010) | 2 lines
  
  Added documentation and examples for new, easier Axes3D use.
........
  r8549 | efiring | 2010-07-14 13:37:10 -0400 (Wed, 14 Jul 2010) | 2 lines
  
  Axes.margin: bugfix--return correct values.  Thanks to Georges Schutz.
........
  r8554 | efiring | 2010-07-15 13:34:42 -0400 (Thu, 15 Jul 2010) | 2 lines
  
  yaxis.set_ticks_position: fix bug with 'none'; thanks to Ben North
........
  r8557 | efiring | 2010-07-15 16:45:19 -0400 (Thu, 15 Jul 2010) | 3 lines
  
  show for tkagg doesn't block in script called via ipython -pylab.
  This is the first in an expected series of changes to show().
........
  r8559 | ianthomas23 | 2010-07-16 09:46:14 -0400 (Fri, 16 Jul 2010) | 2 lines
  
  Added tri* functions to pyplot docs.
........
  r8562 | efiring | 2010-07-16 16:44:52 -0400 (Fri, 16 Jul 2010) | 3 lines
  
  backends: factored out most of the show() code into ShowBase class.
  Also fixed various fltkagg problems.
........
  r8564 | leejjoon | 2010-07-17 03:06:06 -0400 (Sat, 17 Jul 2010) | 1 line
  
  fix wrong baseline for multiple line legend
........
  r8566 | dsdale | 2010-07-20 10:00:55 -0400 (Tue, 20 Jul 2010) | 2 lines
  
  Return Qt4's default cursor when leaving the canvas
........
  r8568 | mdboom | 2010-07-23 09:17:15 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Prevent traceback when window icon can not be loaded in Gtk backend.
........
  r8570 | mdboom | 2010-07-23 12:45:24 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Fix image clipping to a path and add a test.
........
  r8571 | mdboom | 2010-07-23 12:46:40 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Oops in last commit.
........
  r8573 | efiring | 2010-07-24 17:59:55 -0400 (Sat, 24 Jul 2010) | 3 lines
  
  rcParams: don't include deprecated keys.
  Some other rc cleanups are included in this changeset.
........
  r8575 | weathergod | 2010-07-25 18:24:05 -0400 (Sun, 25 Jul 2010) | 2 lines
  
  Fix "graph jumping" issue when rubber-banding a selection in GTK backends.
........
  r8577 | efiring | 2010-07-26 14:17:18 -0400 (Mon, 26 Jul 2010) | 2 lines
  
  [3026430] delete duplicate test file with space in name
........
  r8579 | efiring | 2010-07-26 15:14:16 -0400 (Mon, 26 Jul 2010) | 2 lines
  
  [3032390] subplot: more robust argument handling, consistent with 0.99.3
........
  r8581 | leejjoon | 2010-07-27 11:52:47 -0400 (Tue, 27 Jul 2010) | 1 line
  
  fix pyplot.subplot2grid to support the projection keyword
........
  r8583 | mdboom | 2010-07-27 13:26:50 -0400 (Tue, 27 Jul 2010) | 3 lines
  
  [3034778] line width arguments don't work in pcolormesh
  Also, support clipping paths on images in SVG backend.
........
  r8585 | mdboom | 2010-07-28 14:33:11 -0400 (Wed, 28 Jul 2010) | 2 lines
  
  Fix problems displaying images with zero (logical) width.
........
  r8588 | mdboom | 2010-07-28 14:48:14 -0400 (Wed, 28 Jul 2010) | 2 lines
  
  [3032853] Hist autorange bug using log and histtype
........
  r8590 | mdboom | 2010-07-28 15:19:27 -0400 (Wed, 28 Jul 2010) | 3 lines
  
  [3031954] polar plot axis labeling problem
  Radial axis labels should now be placed correctly, even for small values of 
rmax
........
  r8592 | mdboom | 2010-07-29 10:09:11 -0400 (Thu, 29 Jul 2010) | 2 lines
  
  Remove points_to_pixels_snapto -- since it isn't used anywhere and is now 
actually incomplete wrt the new stroke-width-aware snapping.
........
  r8593 | weathergod | 2010-07-29 12:16:17 -0400 (Thu, 29 Jul 2010) | 4 lines
  
  Fix documentation for set_linestyle() and set_marker() and a few other
  functions properly display their available values on the web docs.
  Also changed pentagram to pentagon in the docstrings.
........
  r8595 | weathergod | 2010-07-29 17:55:52 -0400 (Thu, 29 Jul 2010) | 2 lines
  
  Fix inconsistency with the handling of the 'weights' keyword and input data 
for hist().
........
  r8597 | mdboom | 2010-07-30 08:25:51 -0400 (Fri, 30 Jul 2010) | 1 line
  
  Update baseline image for pcolormesh test
........
  r8601 | mdboom | 2010-07-30 14:56:18 -0400 (Fri, 30 Jul 2010) | 2 lines
  
  [3036982] imsave: wrong image size
........
  r8603 | leejjoon | 2010-07-31 05:03:30 -0400 (Sat, 31 Jul 2010) | 1 line
  
  make grid method of axislines module compatible with matplotlib
........
  r8610 | weathergod | 2010-08-01 17:01:25 -0400 (Sun, 01 Aug 2010) | 3 lines
  
  Fixed inconsistency with argument handling between 2d and 3d versions of 
contour.
  Documentation is fixed as well for 3d versions of contour and contourf.
........
  r8612 | mdboom | 2010-08-02 08:30:48 -0400 (Mon, 02 Aug 2010) | 2 lines
  
  Fix image placement bug introduced in 8585 (reported by JJ)
........
  r8614 | leejjoon | 2010-08-03 01:07:40 -0400 (Tue, 03 Aug 2010) | 1 line
  
  turn off antialiasing for the solids attribute in axes_grid1.colorbar.
........
  r8617 | jdh2358 | 2010-08-03 17:23:44 -0400 (Tue, 03 Aug 2010) | 1 line
  
  added qt4_editor_options.png
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py
    trunk/matplotlib/lib/matplotlib/gridspec.py

Added Paths:
-----------
    trunk/matplotlib/lib/matplotlib/mpl-data/images/qt4_editor_options.png

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8512 
/trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8620 
/trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py     2010-08-04 12:22:07 UTC (rev 
8620)
+++ trunk/matplotlib/lib/matplotlib/axes.py     2010-08-04 12:29:18 UTC (rev 
8621)
@@ -7401,7 +7401,7 @@
              **kwargs):
         """
         call signature::
-  
+
           def hist(x, bins=10, range=None, normed=False, weights=None,
                  cumulative=False, bottom=None, histtype='bar', align='mid',
                  orientation='vertical', rwidth=None, log=False,
@@ -7584,7 +7584,7 @@
         # We need to do to 'weights' what was done to 'x'
         if weights is not None:
             if isinstance(weights, np.ndarray) or not iterable(weights[0]) :
-                w = np.asarray(weights)
+                w = np.array(weights)
                 if w.ndim == 2:
                     w = w.T
                 elif w.ndim == 1:

Modified: trunk/matplotlib/lib/matplotlib/gridspec.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/gridspec.py 2010-08-04 12:22:07 UTC (rev 
8620)
+++ trunk/matplotlib/lib/matplotlib/gridspec.py 2010-08-04 12:29:18 UTC (rev 
8621)
@@ -127,13 +127,6 @@
 
         return figBottoms, figTops, figLefts, figRights
 
-
-    def __iter__(self):
-        nrows, ncols = self.get_geometry()
-        total = nrows*ncols
-
-        return iter([self.__getitem__(i) for i in range(total)])
-
     def __getitem__(self, key):
         """
         create and return a SuplotSpec instance.

Copied: trunk/matplotlib/lib/matplotlib/mpl-data/images/qt4_editor_options.png 
(from rev 8617, 
branches/v1_0_maint/lib/matplotlib/mpl-data/images/qt4_editor_options.png)
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

Reply via email to