matplotlib-checkins Mailing List for matplotlib

Revision: 8177
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8177&view=rev
Author: jdh2358
Date: 2010年03月03日 21:33:35 +0000 (2010年3月03日)
Log Message:
-----------
fix hexbin bins=log bug
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
 trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年03月03日 21:06:01 UTC (rev 8176)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年03月03日 21:33:35 UTC (rev 8177)
@@ -69,12 +69,12 @@
 except ValueError:
 return linestyle, marker, color # Yes
 else:
- if fmt != fmtint: 
- # user definitely doesn't want tri_down marker 
+ if fmt != fmtint:
+ # user definitely doesn't want tri_down marker
 return linestyle, marker, color # Yes
 else:
 # ignore converted color
- color = None 
+ color = None
 except ValueError:
 pass # No, not just a color.
 
@@ -5773,18 +5773,16 @@
 if (accum==0).any():
 # make sure we have not zeros
 accum += 1
- 
 
- # Transform accum if needed
- if bins=='log':
- accum = np.log10(accum+1)
-
 # autoscale the norm with curren accum values if it hasn't
 # been set
 if norm is not None:
 if norm.vmin is None and norm.vmax is None:
 norm.autoscale(accum)
- 
+
+ # Transform accum if needed
+ if bins=='log':
+ accum = np.log10(accum+1)
 elif bins!=None:
 if not iterable(bins):
 minimum, maximum = min(accum), max(accum)
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010年03月03日 21:06:01 UTC (rev 8176)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010年03月03日 21:33:35 UTC (rev 8177)
@@ -542,9 +542,10 @@
 return self.fix_minus(s)
 
 def format_data(self, value):
+ b = self.labelOnlyBase
 self.labelOnlyBase = False
 value = cbook.strip_math(self.__call__(value))
- self.labelOnlyBase = True
+ self.labelOnlyBase = b
 return value
 
 def format_data_short(self,value):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8176
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8176&view=rev
Author: jdh2358
Date: 2010年03月03日 21:06:01 +0000 (2010年3月03日)
Log Message:
-----------
patch branch updates
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/doc/_templates/indexsidebar.html
 trunk/matplotlib/doc/_templates/layout.html
 trunk/matplotlib/doc/devel/coding_guide.rst
 trunk/matplotlib/doc/users/artists.rst
 trunk/matplotlib/lib/matplotlib/artist.py
 trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py
 trunk/matplotlib/lib/matplotlib/finance.py
 trunk/matplotlib/lib/matplotlib/patches.py
Added Paths:
-----------
 trunk/matplotlib/doc/_static/favicon.ico
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/CHANGELOG	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -1,3 +1,26 @@
+2010年03月03日 Manually brought in commits from branch via diff/patch (svnmerge is broken)
+
+ ------------------------------------------------------------------------
+ r8175 | leejjoon | 2010年03月03日 10:03:30 -0800 (2010年3月03日) | 1 line
+
+ fix arguments of allow_rasterization.draw_wrapper
+ ------------------------------------------------------------------------
+ r8174 | jdh2358 | 2010年03月03日 09:15:58 -0800 (2010年3月03日) | 1 line
+
+ added support for favicon in docs build
+ ------------------------------------------------------------------------
+ r8173 | jdh2358 | 2010年03月03日 08:56:16 -0800 (2010年3月03日) | 1 line
+
+ applied Mattias get_bounds patch
+ ------------------------------------------------------------------------
+ r8172 | jdh2358 | 2010年03月03日 08:31:42 -0800 (2010年3月03日) | 1 line
+
+ fix svnmerge download instructions
+ ------------------------------------------------------------------------
+ r8171 | jdh2358 | 2010年03月03日 07:47:48 -0800 (2010年3月03日) | 1 line
+
+
+
 2010年02月25日 add annotation_demo3.py that demonstrates new functionality. -JJL
 
 2010年02月25日 refactor Annotation to support arbitrary Transform as xycoords 
Added: trunk/matplotlib/doc/_static/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/_static/favicon.ico
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -9,11 +9,11 @@
 pathto('users/installing') }}">installing</a>
 </p>
 
-<p>Sandro Tosi has a new book
-<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
-developers</a>
-also
-at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
+<p>Sandro Tosi has a new book 
+ <a href="http://www.packtpub.com/matplotlib-python-development/book?utm_source=matplotlib.sourceforge.net&utm_medium=link&utm_content=pod&utm_campaign=mdb_002124">Matplotlib for python
+ developers</a>
+ also
+ at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
 
 <p>Build websites like matplotlib's,
 with <a href="http://sphinx.pocoo.org/">sphinx</a> and extensions for
Modified: trunk/matplotlib/doc/_templates/layout.html
===================================================================
--- trunk/matplotlib/doc/_templates/layout.html	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/_templates/layout.html	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -23,8 +23,8 @@
 </script>
 <object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
 <!-- End Piwik Tag -->
+<link rel="shortcut icon" href="_static/favicon.ico"> 
 
-
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
 <a href="{{ pathto('index') }}"><img src="{{
 pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/devel/coding_guide.rst	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -82,8 +82,8 @@
 
 * install ``svnmerge.py`` in your PATH::
 
- > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
- svnmerge/svnmerge.py
+ > wget http://svn.apache.org/repos/asf/subversion/trunk/contrib/\
+ client-side/svnmerge/svnmerge.py
 
 * get a svn checkout of the branch you'll be making bugfixes to and
 the trunk (see above)
Modified: trunk/matplotlib/doc/users/artists.rst
===================================================================
--- trunk/matplotlib/doc/users/artists.rst	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/users/artists.rst	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -419,7 +419,7 @@
 # and notice that the ax.add_patch method has set the axes
 # instance
 In [267]: print rect.get_axes()
- Subplot(49,81.25)
+ Axes(0.125,0.1;0.775x0.8)
 
 # and the transformation has been set too
 In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@
 (0.0, 1.0)
 
 # but the data limits have been updated to encompass the rectangle
- In [271]: print ax.dataLim.get_bounds()
+ In [271]: print ax.dataLim.bounds
 (1.0, 1.0, 5.0, 12.0)
 
 # we can manually invoke the auto-scaling machinery
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/artist.py	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -50,9 +50,9 @@
 renderer.stop_rasterizing()
 
 # the axes class has a second argument inframe for its draw method.
- def draw_wrapper(artist, renderer, *kl):
+ def draw_wrapper(artist, renderer, *args, **kwargs):
 before(artist, renderer)
- draw(artist, renderer, *kl)
+ draw(artist, renderer, *args, **kwargs)
 after(artist, renderer)
 
 # "safe wrapping" to exactly replicate anything we haven't overridden above
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -171,7 +171,7 @@
 """
 Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
 """
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
 r = l + width
 t = b + height
 
@@ -238,7 +238,7 @@
 
 Note: agg must be a backend_agg.RendererAgg instance.
 """
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
 r = l + width
 t = b + height
 
Modified: trunk/matplotlib/lib/matplotlib/finance.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/finance.py	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/finance.py	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -597,8 +597,8 @@
 maxy = max([volume for d, open, close, high, low, volume in quotes])
 corners = (minpy, miny), (maxx, maxy)
 ax.update_datalim(corners)
- #print 'datalim', ax.dataLim.get_bounds()
- #print 'viewlim', ax.viewLim.get_bounds()
+ #print 'datalim', ax.dataLim.bounds
+ #print 'viewlim', ax.viewLim.bounds
 
 ax.add_collection(barCollection)
 ax.autoscale_view()
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2010年03月03日 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2010年03月03日 21:06:01 UTC (rev 8176)
@@ -1414,12 +1414,12 @@
 pad = props.pop('pad', 4)
 pad = renderer.points_to_pixels(pad)
 bbox = artist.get_window_extent(renderer)
- l,b,w,h = bbox.bounds
- l-=pad/2.
- b-=pad/2.
- w+=pad
- h+=pad
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ l -= pad/2.
+ b -= pad/2.
+ w += pad
+ h += pad
+ r = Rectangle(xy=(l, b),
 width=w,
 height=h,
 fill=fill,
@@ -1438,8 +1438,8 @@
 to test whether the artist is returning the correct bbox.
 """
 
- l,b,w,h = bbox.get_bounds()
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ r = Rectangle(xy=(l, b),
 width=w,
 height=h,
 edgecolor=color,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8175
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8175&view=rev
Author: leejjoon
Date: 2010年03月03日 18:03:30 +0000 (2010年3月03日)
Log Message:
-----------
fix arguments of allow_rasterization.draw_wrapper
Modified Paths:
--------------
 branches/v0_99_maint/lib/matplotlib/artist.py
Modified: branches/v0_99_maint/lib/matplotlib/artist.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/artist.py	2010年03月03日 17:15:58 UTC (rev 8174)
+++ branches/v0_99_maint/lib/matplotlib/artist.py	2010年03月03日 18:03:30 UTC (rev 8175)
@@ -41,9 +41,9 @@
 renderer.stop_rasterizing()
 
 # the axes class has a second argument inframe for its draw method.
- def draw_wrapper(artist, renderer, *kl):
+ def draw_wrapper(artist, renderer, *args, **kwargs):
 before(artist, renderer)
- draw(artist, renderer, *kl)
+ draw(artist, renderer, *args, **kwargs)
 after(artist, renderer)
 
 # "safe wrapping" to exactly replicate anything we haven't overridden above
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8174
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8174&view=rev
Author: jdh2358
Date: 2010年03月03日 17:15:58 +0000 (2010年3月03日)
Log Message:
-----------
added support for favicon in docs build
Modified Paths:
--------------
 branches/v0_99_maint/doc/_templates/indexsidebar.html
 branches/v0_99_maint/doc/_templates/layout.html
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html	2010年03月03日 16:56:16 UTC (rev 8173)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html	2010年03月03日 17:15:58 UTC (rev 8174)
@@ -9,7 +9,7 @@
 </p>
 
 <p>Sandro Tosi has a new book 
-<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
+<a href="http://www.packtpub.com/matplotlib-python-development/book?utm_source=matplotlib.sourceforge.net&utm_medium=link&utm_content=pod&utm_campaign=mdb_002124">Matplotlib for python
 developers</a>
 also
 at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
Modified: branches/v0_99_maint/doc/_templates/layout.html
===================================================================
--- branches/v0_99_maint/doc/_templates/layout.html	2010年03月03日 16:56:16 UTC (rev 8173)
+++ branches/v0_99_maint/doc/_templates/layout.html	2010年03月03日 17:15:58 UTC (rev 8174)
@@ -23,7 +23,7 @@
 </script>
 <object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
 <!-- End Piwik Tag -->
-<link rel="shortcut icon" href="favicon.ico"> 
+<link rel="shortcut icon" href="_static/favicon.ico"> 
 
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
 <a href="{{ pathto('index') }}"><img src="{{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8173
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8173&view=rev
Author: jdh2358
Date: 2010年03月03日 16:56:16 +0000 (2010年3月03日)
Log Message:
-----------
applied Mattias get_bounds patch
Modified Paths:
--------------
 branches/v0_99_maint/doc/users/artists.rst
 branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
 branches/v0_99_maint/lib/matplotlib/finance.py
 branches/v0_99_maint/lib/matplotlib/patches.py
Modified: branches/v0_99_maint/doc/users/artists.rst
===================================================================
--- branches/v0_99_maint/doc/users/artists.rst	2010年03月03日 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/doc/users/artists.rst	2010年03月03日 16:56:16 UTC (rev 8173)
@@ -419,7 +419,7 @@
 # and notice that the ax.add_patch method has set the axes
 # instance
 In [267]: print rect.get_axes()
- Subplot(49,81.25)
+ Axes(0.125,0.1;0.775x0.8)
 
 # and the transformation has been set too
 In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@
 (0.0, 1.0)
 
 # but the data limits have been updated to encompass the rectangle
- In [271]: print ax.dataLim.get_bounds()
+ In [271]: print ax.dataLim.bounds
 (1.0, 1.0, 5.0, 12.0)
 
 # we can manually invoke the auto-scaling machinery
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py	2010年03月03日 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py	2010年03月03日 16:56:16 UTC (rev 8173)
@@ -171,7 +171,7 @@
 """
 Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
 """
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
 r = l + width
 t = b + height
 
@@ -238,7 +238,7 @@
 
 Note: agg must be a backend_agg.RendererAgg instance.
 """
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
 r = l + width
 t = b + height
 
Modified: branches/v0_99_maint/lib/matplotlib/finance.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/finance.py	2010年03月03日 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/finance.py	2010年03月03日 16:56:16 UTC (rev 8173)
@@ -597,8 +597,8 @@
 maxy = max([volume for d, open, close, high, low, volume in quotes])
 corners = (minpy, miny), (maxx, maxy)
 ax.update_datalim(corners)
- #print 'datalim', ax.dataLim.get_bounds()
- #print 'viewlim', ax.viewLim.get_bounds()
+ #print 'datalim', ax.dataLim.bounds
+ #print 'viewlim', ax.viewLim.bounds
 
 ax.add_collection(barCollection)
 ax.autoscale_view()
Modified: branches/v0_99_maint/lib/matplotlib/patches.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/patches.py	2010年03月03日 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/patches.py	2010年03月03日 16:56:16 UTC (rev 8173)
@@ -1383,12 +1383,12 @@
 pad = props.pop('pad', 4)
 pad = renderer.points_to_pixels(pad)
 bbox = artist.get_window_extent(renderer)
- l,b,w,h = bbox.bounds
- l-=pad/2.
- b-=pad/2.
- w+=pad
- h+=pad
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ l -= pad/2.
+ b -= pad/2.
+ w += pad
+ h += pad
+ r = Rectangle(xy=(l, b),
 width=w,
 height=h,
 fill=fill,
@@ -1407,8 +1407,8 @@
 to test whether the artist is returning the correct bbox.
 """
 
- l,b,w,h = bbox.get_bounds()
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ r = Rectangle(xy=(l, b),
 width=w,
 height=h,
 edgecolor=color,
@@ -3174,7 +3174,7 @@
 cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
 verticesA, codesA = self._get_bracket(x0, y0, cos_t, sin_t,
 self.widthA*scaleA,
- self.legnthA*scaleA)
+ self.lengthA*scaleA)
 vertices_list.append(verticesA)
 codes_list.append(codesA)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8172
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8172&view=rev
Author: jdh2358
Date: 2010年03月03日 16:31:42 +0000 (2010年3月03日)
Log Message:
-----------
fix svnmerge download instructions
Modified Paths:
--------------
 branches/v0_99_maint/doc/devel/coding_guide.rst
Modified: branches/v0_99_maint/doc/devel/coding_guide.rst
===================================================================
--- branches/v0_99_maint/doc/devel/coding_guide.rst	2010年03月03日 15:47:48 UTC (rev 8171)
+++ branches/v0_99_maint/doc/devel/coding_guide.rst	2010年03月03日 16:31:42 UTC (rev 8172)
@@ -75,8 +75,8 @@
 
 * install ``svnmerge.py`` in your PATH::
 
- > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
- svnmerge/svnmerge.py
+ > wget http://svn.apache.org/repos/asf/subversion/trunk/contrib/\
+ client-side/svnmerge/svnmerge.py
 
 * get a svn checkout of the branch you'll be making bugfixes to and
 the trunk (see above)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8171
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8171&view=rev
Author: jdh2358
Date: 2010年03月03日 15:47:48 +0000 (2010年3月03日)
Log Message:
-----------
added favicon
Modified Paths:
--------------
 branches/v0_99_maint/doc/_templates/layout.html
Added Paths:
-----------
 branches/v0_99_maint/doc/_static/favicon.ico
Added: branches/v0_99_maint/doc/_static/favicon.ico
===================================================================
(Binary files differ)
Property changes on: branches/v0_99_maint/doc/_static/favicon.ico
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Modified: branches/v0_99_maint/doc/_templates/layout.html
===================================================================
--- branches/v0_99_maint/doc/_templates/layout.html	2010年03月02日 13:12:16 UTC (rev 8170)
+++ branches/v0_99_maint/doc/_templates/layout.html	2010年03月03日 15:47:48 UTC (rev 8171)
@@ -23,8 +23,8 @@
 </script>
 <object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
 <!-- End Piwik Tag -->
+<link rel="shortcut icon" href="favicon.ico"> 
 
-
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
 <a href="{{ pathto('index') }}"><img src="{{
 pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.