Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1aec975

Browse files
jdh2358jdh2358
committed
added jae joons layer images patch
svn path=/trunk/matplotlib/; revision=6378
1 parent 9405a1e commit 1aec975

5 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎doc/_templates/gallery.html‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ <h3>Click on any image to see full size image and source code</h3>
159159

160160
<a href="examples/pylab_examples/customize_rc.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/customize_rc.png" border="0" alt="customize_rc"/></a>
161161

162-
<a href="examples/pylab_examples/dannys_example.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dannys_example.png" border="0" alt="dannys_example"/></a>
163-
164162
<a href="examples/pylab_examples/dash_control.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dash_control.png" border="0" alt="dash_control"/></a>
165163

166164
<a href="examples/pylab_examples/dashpointlabel.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dashpointlabel.png" border="0" alt="dashpointlabel"/></a>
@@ -241,8 +239,6 @@ <h3>Click on any image to see full size image and source code</h3>
241239

242240
<a href="examples/pylab_examples/ganged_plots.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/ganged_plots.png" border="0" alt="ganged_plots"/></a>
243241

244-
<a href="examples/pylab_examples/geo_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/geo_demo.png" border="0" alt="geo_demo"/></a>
245-
246242
<a href="examples/pylab_examples/gradient_bar.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/gradient_bar.png" border="0" alt="gradient_bar"/></a>
247243

248244
<a href="examples/pylab_examples/griddata_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/griddata_demo.png" border="0" alt="griddata_demo"/></a>
@@ -457,8 +453,6 @@ <h3>Click on any image to see full size image and source code</h3>
457453

458454
<a href="examples/pylab_examples/step_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/step_demo.png" border="0" alt="step_demo"/></a>
459455

460-
<a href="examples/pylab_examples/stix_fonts_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/stix_fonts_demo.png" border="0" alt="stix_fonts_demo"/></a>
461-
462456
<a href="examples/pylab_examples/subplot_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_demo.png" border="0" alt="subplot_demo"/></a>
463457

464458
<a href="examples/pylab_examples/subplot_toolbar.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_toolbar_00.png" border="0" alt="subplot_toolbar"/></a>
@@ -467,12 +461,8 @@ <h3>Click on any image to see full size image and source code</h3>
467461

468462
<a href="examples/pylab_examples/subplots_adjust.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplots_adjust.png" border="0" alt="subplots_adjust"/></a>
469463

470-
<a href="examples/pylab_examples/symlog_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/symlog_demo.png" border="0" alt="symlog_demo"/></a>
471-
472464
<a href="examples/pylab_examples/table_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/table_demo.png" border="0" alt="table_demo"/></a>
473465

474-
<a href="examples/pylab_examples/tex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/tex_demo.png" border="0" alt="tex_demo"/></a>
475-
476466
<a href="examples/pylab_examples/text_handles.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_handles.png" border="0" alt="text_handles"/></a>
477467

478468
<a href="examples/pylab_examples/text_rotation.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_rotation.png" border="0" alt="text_rotation"/></a>
@@ -487,8 +477,6 @@ <h3>Click on any image to see full size image and source code</h3>
487477

488478
<a href="examples/pylab_examples/unicode_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/unicode_demo.png" border="0" alt="unicode_demo"/></a>
489479

490-
<a href="examples/pylab_examples/usetex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/usetex_demo.png" border="0" alt="usetex_demo"/></a>
491-
492480
<a href="examples/pylab_examples/vertical_ticklabels.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vertical_ticklabels.png" border="0" alt="vertical_ticklabels"/></a>
493481

494482
<a href="examples/pylab_examples/vline_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vline_demo.png" border="0" alt="vline_demo"/></a>

‎doc/faq/environment_variables_faq.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _environment-variablesg:
1+
.. _environment-variables:
22

33
*********************
44
Environment Variables

‎doc/faq/index.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ The Matplotlib FAQ
1515
:maxdepth: 2
1616

1717
installing_faq.rst
18-
troubleshooting_faq.rst
18+
usage.rst
1919
howto_faq.rst
20-
environment_variables_faq.rst
20+
troubleshooting_faq.rst

‎lib/matplotlib/axes.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,15 +1536,16 @@ def draw(self, renderer=None, inframe=False):
15361536
ims = [(im.make_image(mag),0,0)
15371537
for im in self.images if im.get_visible()]
15381538

1539-
1539+
#flip the images if their origin is "upper"
1540+
[im.flipud_out() for _im, (im,_,_) in zip(self.images, ims) \
1541+
if _im.origin=="upper"]
1542+
15401543
l, b, r, t = self.bbox.extents
15411544
width = mag*((round(r) + 0.5) - (round(l) - 0.5))
15421545
height = mag*((round(t) + 0.5) - (round(b) - 0.5))
15431546
im = mimage.from_images(height,
15441547
width,
15451548
ims)
1546-
if self.images[0].origin=='upper':
1547-
im.flipud_out()
15481549

15491550
im.is_grayscale = False
15501551
l, b, w, h = self.bbox.bounds

‎lib/matplotlib/mlab.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,6 +2013,7 @@ def rec_summarize(r, summaryfuncs):
20132013
output to a new attribute name *outname*. The returned record
20142014
array is identical to *r*, with extra arrays for each element in
20152015
*summaryfuncs*.
2016+
20162017
"""
20172018

20182019
names = list(r.dtype.names)
@@ -2569,7 +2570,19 @@ def get_justify(colname, column, precision):
25692570
length = max(len(colname),np.max(map(len,map(str,column))))
25702571
return 1, length+padding, "%d" # right justify
25712572

2572-
if ntype==np.float or ntype==np.float32 or ntype==np.float64 or ntype==np.float96 or ntype==np.float_:
2573+
# JDH: my powerbook does not have np.float96 using np 1.3.0
2574+
"""
2575+
In [2]: np.__version__
2576+
Out[2]: '1.3.0.dev5948'
2577+
2578+
In [3]: !uname -a
2579+
Darwin Macintosh-5.local 9.4.0 Darwin Kernel Version 9.4.0: Mon Jun 9 19:30:53 PDT 2008; root:xnu-1228.5.20~1/RELEASE_I386 i386 i386
2580+
2581+
In [4]: np.float96
2582+
---------------------------------------------------------------------------
2583+
AttributeError Traceback (most recent call la
2584+
"""
2585+
if ntype==np.float or ntype==np.float32 or ntype==np.float64 or (hasattr(np, 'float96') and (ntype==np.float96)) or ntype==np.float_:
25732586
fmt = "%." + str(precision) + "f"
25742587
length = max(len(colname),np.max(map(len,map(lambda x:fmt%x,column))))
25752588
return 1, length+padding, fmt # right justify

0 commit comments

Comments
 (0)