You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
|
2
(2) |
3
(4) |
4
(4) |
5
(2) |
6
(2) |
7
(6) |
|
8
(4) |
9
(1) |
10
(1) |
11
(2) |
12
|
13
(1) |
14
(5) |
|
15
|
16
(3) |
17
(4) |
18
(8) |
19
(4) |
20
(2) |
21
|
|
22
|
23
(2) |
24
(2) |
25
(1) |
26
|
27
(3) |
28
(2) |
|
29
(2) |
30
(1) |
31
(6) |
|
|
|
|
Revision: 6969 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6969&view=rev Author: jswhit Date: 2009年03月08日 13:29:00 +0000 (2009年3月08日) Log Message: ----------- streamline extrema function Modified Paths: -------------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 13:18:34 UTC (rev 6968) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 13:29:00 UTC (rev 6969) @@ -9,15 +9,14 @@ from scipy.ndimage.filters import minimum_filter, maximum_filter def extrema(mat,mode='wrap',window=10): + """find the indices of local extrema (min and max) + in the input array.""" mn = minimum_filter(mat, size=window, mode=mode) mx = maximum_filter(mat, size=window, mode=mode) # (mat == mx) true if pixel is equal to the local max - # The next computation suppresses responses where - # the function is flat. - local_maxima = ((mat == mx) & (mat != mn)) - local_minima = ((mat == mn) & (mat != mx)) - # Get the indices of the maxima, minima - return np.nonzero(local_minima), np.nonzero(local_maxima) + # (mat == mn) true if pixel is equal to the local in + # Return the indices of the maxima, minima + return np.nonzero(mat == mn), np.nonzero(mat == mx) if len(sys.argv) < 2: print 'enter date to plot (YYYYMMDDHH) on command line' @@ -65,8 +64,8 @@ # plot lows as blue L's, with min pressure value underneath. xyplotted = [] # don't plot if there is already a L or H within dmin meters. -dmin = 500000 yoffset = 0.022*(m.ymax-m.ymin) +dmin = yoffset for x,y,p in zip(xlows, ylows, lowvals): if x < m.xmax and x > m.xmin and y < m.ymax and y > m.ymin: dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6968 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6968&view=rev Author: jswhit Date: 2009年03月08日 13:18:34 +0000 (2009年3月08日) Log Message: ----------- make central pressures more readable by making text boxes semi-transparent Modified Paths: -------------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 13:05:11 UTC (rev 6967) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 13:18:34 UTC (rev 6968) @@ -72,11 +72,10 @@ dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] if not dist or min(dist) > dmin: plt.text(x,y,'L',fontsize=14,fontweight='bold', - horizontalalignment='center', - verticalalignment='center',color='blue') + ha='center',va='center',color='b') plt.text(x,y-yoffset,repr(int(p)),fontsize=9, - horizontalalignment='center', - verticalalignment='top',color='blue') + ha='center',va='top',color='b', + bbox = dict(boxstyle="square",ec='None',fc=(1,1,1,0.5))) xyplotted.append((x,y)) # plot highs as red H's, with max pressure value underneath. xyplotted = [] @@ -85,11 +84,10 @@ dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] if not dist or min(dist) > dmin: plt.text(x,y,'H',fontsize=14,fontweight='bold', - horizontalalignment='center', - verticalalignment='center',color='red') + ha='center',va='center',color='r') plt.text(x,y-yoffset,repr(int(p)),fontsize=9, - horizontalalignment='center', - verticalalignment='top',color='red') + ha='center',va='top',color='r', + bbox = dict(boxstyle="square",ec='None',fc=(1,1,1,0.5))) xyplotted.append((x,y)) plt.title('Mean Sea-Level Pressure (with Highs and Lows) %s' % YYYYMMDDHH) plt.show() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6967 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6967&view=rev Author: jswhit Date: 2009年03月08日 13:05:11 +0000 (2009年3月08日) Log Message: ----------- cosmetic changes. Modified Paths: -------------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 06:37:06 UTC (rev 6966) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月08日 13:05:11 UTC (rev 6967) @@ -43,7 +43,8 @@ # (higher value, fewer highs and lows) local_min, local_max = extrema(prmsl, mode='wrap', window=25) # create Basemap instance. -m = Basemap(llcrnrlon=0,llcrnrlat=-65,urcrnrlon=360,urcrnrlat=65,projection='merc') +m =\ +Basemap(llcrnrlon=0,llcrnrlat=-80,urcrnrlon=360,urcrnrlat=80,projection='mill') # add wrap-around point in longitude. prmsl, lons = addcyclic(prmsl, lons1) # contour levels @@ -56,8 +57,8 @@ cs = m.contour(x,y,prmsl,clevs,colors='k',linewidths=1.) m.drawcoastlines(linewidth=1.25) m.fillcontinents(color='0.8') -m.drawparallels(np.arange(-80,81,20)) -m.drawmeridians(np.arange(0,360,60)) +m.drawparallels(np.arange(-80,81,20),labels=[1,1,0,0]) +m.drawmeridians(np.arange(0,360,60),labels=[0,0,0,1]) xlows = x[local_min]; xhighs = x[local_max] ylows = y[local_min]; yhighs = y[local_max] lowvals = prmsl[local_min]; highvals = prmsl[local_max] @@ -65,6 +66,7 @@ xyplotted = [] # don't plot if there is already a L or H within dmin meters. dmin = 500000 +yoffset = 0.022*(m.ymax-m.ymin) for x,y,p in zip(xlows, ylows, lowvals): if x < m.xmax and x > m.xmin and y < m.ymax and y > m.ymin: dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] @@ -72,7 +74,7 @@ plt.text(x,y,'L',fontsize=14,fontweight='bold', horizontalalignment='center', verticalalignment='center',color='blue') - plt.text(x,y-400000,repr(int(p)),fontsize=9, + plt.text(x,y-yoffset,repr(int(p)),fontsize=9, horizontalalignment='center', verticalalignment='top',color='blue') xyplotted.append((x,y)) @@ -85,7 +87,7 @@ plt.text(x,y,'H',fontsize=14,fontweight='bold', horizontalalignment='center', verticalalignment='center',color='red') - plt.text(x,y-400000,repr(int(p)),fontsize=9, + plt.text(x,y-yoffset,repr(int(p)),fontsize=9, horizontalalignment='center', verticalalignment='top',color='red') xyplotted.append((x,y)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6966 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6966&view=rev Author: efiring Date: 2009年03月08日 06:37:06 +0000 (2009年3月08日) Log Message: ----------- Let pyplot users find out if a figure number exists, or list fignums. Modified Paths: -------------- trunk/matplotlib/CHANGELOG trunk/matplotlib/doc/api/api_changes.rst trunk/matplotlib/lib/matplotlib/pyplot.py Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2009年03月07日 23:47:02 UTC (rev 6965) +++ trunk/matplotlib/CHANGELOG 2009年03月08日 06:37:06 UTC (rev 6966) @@ -1,3 +1,5 @@ +2009年03月07日 Add pyplot access to figure number list - EF + 2009年02月28日 hashing of FontProperties accounts current rcParams - JJL 2009年02月28日 Prevent double-rendering of shared axis in twinx, twiny - EF Modified: trunk/matplotlib/doc/api/api_changes.rst =================================================================== --- trunk/matplotlib/doc/api/api_changes.rst 2009年03月07日 23:47:02 UTC (rev 6965) +++ trunk/matplotlib/doc/api/api_changes.rst 2009年03月08日 06:37:06 UTC (rev 6966) @@ -19,8 +19,12 @@ Changes for 0.98.x ================== -* Removed numerix package. +* Added new :func:`matplotlib.pyplot.fignum_exists` and + :func:`matplotlib.pyplot.get_fignums`; they merely expose + information that had been hidden in :mod:`matplotlib._pylab_helpers`. +* Deprecated numerix package. + * Added new :func:`matplotlib.image.imsave` and exposed it to the :mod:`matplotlib.pyplot` interface. @@ -46,7 +50,7 @@ ================ ================ -* Removed the configobj and experiemtnal traits rc support +* Removed the configobj and experimental traits rc support * Modified :func:`matplotlib.mlab.psd`, :func:`matplotlib.mlab.csd`, :func:`matplotlib.mlab.cohere`, and :func:`matplotlib.mlab.specgram` Modified: trunk/matplotlib/lib/matplotlib/pyplot.py =================================================================== --- trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月07日 23:47:02 UTC (rev 6965) +++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月08日 06:37:06 UTC (rev 6966) @@ -273,6 +273,14 @@ else: return figure() +fignum_exists = _pylab_helpers.Gcf.has_fignum + +def get_fignums(): + "Return a list of existing figure numbers." + fignums = _pylab_helpers.Gcf.figs.keys() + fignums.sort() + return fignums + def get_current_fig_manager(): figManager = _pylab_helpers.Gcf.get_active() if figManager is None: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6965 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6965&view=rev Author: jswhit Date: 2009年03月07日 23:47:02 +0000 (2009年3月07日) Log Message: ----------- add new example, fix formatting Modified Paths: -------------- trunk/toolkits/basemap/Changelog Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年03月07日 22:44:16 UTC (rev 6964) +++ trunk/toolkits/basemap/Changelog 2009年03月07日 23:47:02 UTC (rev 6965) @@ -1,8 +1,9 @@ version 0.99.4 (not yet released) + * added new example "plothighsandlows.py". * add fix_aspect kwarg to Basemap.__init__, when False - axes.set_aspect is set to 'auto' instead of default 'equal'. - Can be used to make plot fill whole plot region, even if the - plot region doesn't match the aspect ratio of the map region. + axes.set_aspect is set to 'auto' instead of default 'equal'. + Can be used to make plot fill whole plot region, even if the + plot region doesn't match the aspect ratio of the map region. * added date2index function, updated netcdftime to 0.7.1. * added maskoceans function. * update pupynere to version 1.0.8 (supports writing large files). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6964 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6964&view=rev Author: jswhit Date: 2009年03月07日 22:44:16 +0000 (2009年3月07日) Log Message: ----------- fix URL Modified Paths: -------------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月07日 21:55:59 UTC (rev 6963) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月07日 22:44:16 UTC (rev 6964) @@ -27,7 +27,10 @@ YYYYMMDDHH = sys.argv[1] # open OpenDAP dataset. -data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH) +try: + data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH) +except: + data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/"+YYYYMMDDHH[0:6]+"/gdas"+YYYYMMDDHH) # read lats,lons. lats = data.variables['lat'][:] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6963 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6963&view=rev Author: jswhit Date: 2009年03月07日 21:55:59 +0000 (2009年3月07日) Log Message: ----------- add comment Modified Paths: -------------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月07日 21:52:21 UTC (rev 6962) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月07日 21:55:59 UTC (rev 6963) @@ -1,5 +1,6 @@ """ plot H's and L's on a sea-level pressure map +(uses scipy.ndimage.filters) """ import numpy as np import matplotlib.pyplot as plt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6962 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6962&view=rev Author: jswhit Date: 2009年03月07日 21:52:21 +0000 (2009年3月07日) Log Message: ----------- add new example showing how to plot H's and L's on a pressure map (uses scipy) Modified Paths: -------------- trunk/toolkits/basemap/MANIFEST.in trunk/toolkits/basemap/examples/README trunk/toolkits/basemap/examples/run_all.py Added Paths: ----------- trunk/toolkits/basemap/examples/plothighsandlows.py Modified: trunk/toolkits/basemap/MANIFEST.in =================================================================== --- trunk/toolkits/basemap/MANIFEST.in 2009年03月07日 19:32:39 UTC (rev 6961) +++ trunk/toolkits/basemap/MANIFEST.in 2009年03月07日 21:52:21 UTC (rev 6962) @@ -11,6 +11,7 @@ include setup.cfg include setupegg.py include src/* +include examples/plothighsandlows.py include examples/save_background.py include examples/embedding_map_in_wx.py include examples/cubed_sphere.py Modified: trunk/toolkits/basemap/examples/README =================================================================== --- trunk/toolkits/basemap/examples/README 2009年03月07日 19:32:39 UTC (rev 6961) +++ trunk/toolkits/basemap/examples/README 2009年03月07日 21:52:21 UTC (rev 6962) @@ -125,3 +125,6 @@ figure (without having to redraw coastlines). maskoceans.py shows how to mask 'wet' areas on a plot. + +plothighsandlows.py shows to plot H's and L's at the local extrema of a pressure map +(requires scipy). Added: trunk/toolkits/basemap/examples/plothighsandlows.py =================================================================== --- trunk/toolkits/basemap/examples/plothighsandlows.py (rev 0) +++ trunk/toolkits/basemap/examples/plothighsandlows.py 2009年03月07日 21:52:21 UTC (rev 6962) @@ -0,0 +1,89 @@ +""" +plot H's and L's on a sea-level pressure map +""" +import numpy as np +import matplotlib.pyplot as plt +import sys +from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic +from scipy.ndimage.filters import minimum_filter, maximum_filter + +def extrema(mat,mode='wrap',window=10): + mn = minimum_filter(mat, size=window, mode=mode) + mx = maximum_filter(mat, size=window, mode=mode) + # (mat == mx) true if pixel is equal to the local max + # The next computation suppresses responses where + # the function is flat. + local_maxima = ((mat == mx) & (mat != mn)) + local_minima = ((mat == mn) & (mat != mx)) + # Get the indices of the maxima, minima + return np.nonzero(local_minima), np.nonzero(local_maxima) + +if len(sys.argv) < 2: + print 'enter date to plot (YYYYMMDDHH) on command line' + raise SystemExit + +# get date from command line. +YYYYMMDDHH = sys.argv[1] + +# open OpenDAP dataset. +data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH) + +# read lats,lons. +lats = data.variables['lat'][:] +lons1 = data.variables['lon'][:] +nlats = len(lats) +nlons = len(lons1) +# read prmsl, convert to hPa (mb). +prmsl = 0.01*data.variables['prmslmsl'][0] +# the window parameter controls the number of highs and lows detected. +# (higher value, fewer highs and lows) +local_min, local_max = extrema(prmsl, mode='wrap', window=25) +# create Basemap instance. +m = Basemap(llcrnrlon=0,llcrnrlat=-65,urcrnrlon=360,urcrnrlat=65,projection='merc') +# add wrap-around point in longitude. +prmsl, lons = addcyclic(prmsl, lons1) +# contour levels +clevs = np.arange(900,1100.,5.) +# find x,y of map projection grid. +lons, lats = np.meshgrid(lons, lats) +x, y = m(lons, lats) +# create figure. +fig=plt.figure(figsize=(12,6)) +cs = m.contour(x,y,prmsl,clevs,colors='k',linewidths=1.) +m.drawcoastlines(linewidth=1.25) +m.fillcontinents(color='0.8') +m.drawparallels(np.arange(-80,81,20)) +m.drawmeridians(np.arange(0,360,60)) +xlows = x[local_min]; xhighs = x[local_max] +ylows = y[local_min]; yhighs = y[local_max] +lowvals = prmsl[local_min]; highvals = prmsl[local_max] +# plot lows as blue L's, with min pressure value underneath. +xyplotted = [] +# don't plot if there is already a L or H within dmin meters. +dmin = 500000 +for x,y,p in zip(xlows, ylows, lowvals): + if x < m.xmax and x > m.xmin and y < m.ymax and y > m.ymin: + dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] + if not dist or min(dist) > dmin: + plt.text(x,y,'L',fontsize=14,fontweight='bold', + horizontalalignment='center', + verticalalignment='center',color='blue') + plt.text(x,y-400000,repr(int(p)),fontsize=9, + horizontalalignment='center', + verticalalignment='top',color='blue') + xyplotted.append((x,y)) +# plot highs as red H's, with max pressure value underneath. +xyplotted = [] +for x,y,p in zip(xhighs, yhighs, highvals): + if x < m.xmax and x > m.xmin and y < m.ymax and y > m.ymin: + dist = [np.sqrt((x-x0)**2+(y-y0)**2) for x0,y0 in xyplotted] + if not dist or min(dist) > dmin: + plt.text(x,y,'H',fontsize=14,fontweight='bold', + horizontalalignment='center', + verticalalignment='center',color='red') + plt.text(x,y-400000,repr(int(p)),fontsize=9, + horizontalalignment='center', + verticalalignment='top',color='red') + xyplotted.append((x,y)) +plt.title('Mean Sea-Level Pressure (with Highs and Lows) %s' % YYYYMMDDHH) +plt.show() Modified: trunk/toolkits/basemap/examples/run_all.py =================================================================== --- trunk/toolkits/basemap/examples/run_all.py 2009年03月07日 19:32:39 UTC (rev 6961) +++ trunk/toolkits/basemap/examples/run_all.py 2009年03月07日 21:52:21 UTC (rev 6962) @@ -6,7 +6,8 @@ test_files.remove('pnganim.py') test_files.remove('geos_demo_2.py') test_files.remove('plotsst.py') -test_files.remove('embedding_map_in_wx.py') +test_files.remove('embedding_map_in_wx.py') # requires wx +test_files.remove('plothighsandlows.py') # requires scipy print test_files py_path = os.environ.get('PYTHONPATH') if py_path is None: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6961 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6961&view=rev Author: efiring Date: 2009年03月07日 19:32:39 +0000 (2009年3月07日) Log Message: ----------- Merged revisions 6960 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6960 | efiring | 2009年03月07日 09:19:40 -1000 (2009年3月07日) | 4 lines Remove references to handle graphics; it is registered trademark of Mathworks, and the pyplot resemblance is only superficial. ........ Modified Paths: -------------- trunk/matplotlib/doc/_templates/index.html trunk/matplotlib/doc/pyplots/tex_demo.png trunk/matplotlib/doc/users/pyplot_tutorial.rst trunk/matplotlib/examples/pylab_examples/axes_props.py trunk/matplotlib/lib/matplotlib/pylab.py trunk/matplotlib/lib/matplotlib/pyplot.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6952 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6960 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,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 + /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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960 Modified: trunk/matplotlib/doc/_templates/index.html =================================================================== --- trunk/matplotlib/doc/_templates/index.html 2009年03月07日 19:19:40 UTC (rev 6960) +++ trunk/matplotlib/doc/_templates/index.html 2009年03月07日 19:32:39 UTC (rev 6961) @@ -35,7 +35,7 @@ <p>For the power user, you have full control of line styles, font properties, axes properties, etc, via an object oriented interface - or via a handle graphics interface familiar to Matlab® users. + or via a set of functions familiar to Matlab® users. The pylab mode provides all of the <a href="api/pyplot_api.html">pyplot</a> plotting functions listed below, as well as non-plotting functions from <a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and @@ -473,7 +473,7 @@ </th> <td align="left"> - get a handle graphics property + get a graphics property </td> </tr> @@ -792,7 +792,7 @@ </th> <td align="left"> - set a handle graphics property + set a graphics property </td> </tr> Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 + /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960 Modified: trunk/matplotlib/doc/pyplots/tex_demo.png =================================================================== (Binary files differ) Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960 Modified: trunk/matplotlib/doc/users/pyplot_tutorial.rst =================================================================== --- trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009年03月07日 19:19:40 UTC (rev 6960) +++ trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009年03月07日 19:32:39 UTC (rev 6961) @@ -78,10 +78,10 @@ line.set_antialiased(False) # turn off antialising * Use the :func:`~matplotlib.pyplot.setp` command. The example below - uses matlab handle graphics style command to set multiple properties + uses a Matlab-style command to set multiple properties on a list of lines. ``setp`` works transparently with a list of objects or a single object. You can either use python keyword arguments or - matlab-style string/value pairs:: + Matlab-style string/value pairs:: lines = plt.plot(x1, y1, x2, y2) # use keyword args Modified: trunk/matplotlib/examples/pylab_examples/axes_props.py =================================================================== --- trunk/matplotlib/examples/pylab_examples/axes_props.py 2009年03月07日 19:19:40 UTC (rev 6960) +++ trunk/matplotlib/examples/pylab_examples/axes_props.py 2009年03月07日 19:32:39 UTC (rev 6961) @@ -10,7 +10,7 @@ plot(t, s) grid(True) -# matlab handle graphics style +# matlab style xticklines = getp(gca(), 'xticklines') yticklines = getp(gca(), 'yticklines') xgridlines = getp(gca(), 'xgridlines') Modified: trunk/matplotlib/lib/matplotlib/pylab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/pylab.py 2009年03月07日 19:19:40 UTC (rev 6960) +++ trunk/matplotlib/lib/matplotlib/pylab.py 2009年03月07日 19:32:39 UTC (rev 6961) @@ -42,7 +42,7 @@ gca - return the current axes gcf - return the current figure gci - get the current image, or None - getp - get a handle graphics property + getp - get a graphics property grid - set whether gridding is on hist - make a histogram hold - set the axes hold state @@ -70,7 +70,7 @@ rgrids - customize the radial grids and labels for polar savefig - save the current figure scatter - make a scatter plot - setp - set a handle graphics property + setp - set a graphics property semilogx - log x axis semilogy - log y axis show - show the figures Modified: trunk/matplotlib/lib/matplotlib/pyplot.py =================================================================== --- trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月07日 19:19:40 UTC (rev 6960) +++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月07日 19:32:39 UTC (rev 6961) @@ -194,7 +194,7 @@ *number* attribute holding this number. If *num* is an integer, and ``figure(num)`` already exists, make it - active and return the handle to it. If ``figure(num)`` does not exist + active and return a reference to it. If ``figure(num)`` does not exist it will be created. Numbering starts at 1, matlab style:: figure(1) @@ -265,7 +265,7 @@ return figManager.canvas.figure def gcf(): - "Return a handle to the current figure." + "Return a reference to the current figure." figManager = _pylab_helpers.Gcf.get_active() if figManager is not None: @@ -1177,7 +1177,7 @@ gca return the current axes gcf return the current figure gci get the current image, or None - getp get a handle graphics property + getp get a graphics property hist make a histogram hold set the hold state on current axes legend add a legend to the axes @@ -1194,7 +1194,7 @@ rc control the default params savefig save the current figure scatter make a scatter plot - setp set a handle graphics property + setp set a graphics property semilogx log x axis semilogy log y axis show show the figures @@ -1241,7 +1241,7 @@ def colors(): """ - This is a do nothing function to provide you with help on how + This is a do-nothing function to provide you with help on how matplotlib handles colors. Commands which take color arguments can use several formats to Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6960 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6960&view=rev Author: efiring Date: 2009年03月07日 19:19:40 +0000 (2009年3月07日) Log Message: ----------- Remove references to handle graphics; it is registered trademark of Mathworks, and the pyplot resemblance is only superficial. Modified Paths: -------------- branches/v0_98_5_maint/doc/_templates/index.html branches/v0_98_5_maint/doc/pyplots/tex_demo.png branches/v0_98_5_maint/doc/users/pyplot_tutorial.rst branches/v0_98_5_maint/examples/pylab_examples/axes_props.py branches/v0_98_5_maint/lib/matplotlib/pylab.py branches/v0_98_5_maint/lib/matplotlib/pyplot.py Modified: branches/v0_98_5_maint/doc/_templates/index.html =================================================================== --- branches/v0_98_5_maint/doc/_templates/index.html 2009年03月06日 19:14:30 UTC (rev 6959) +++ branches/v0_98_5_maint/doc/_templates/index.html 2009年03月07日 19:19:40 UTC (rev 6960) @@ -35,7 +35,7 @@ <p>For the power user, you have full control of line styles, font properties, axes properties, etc, via an object oriented interface - or via a handle graphics interface familiar to Matlab® users. + or via a set of functions familiar to Matlab® users. The pylab mode provides all of the <a href="api/pyplot_api.html">pyplot</a> plotting functions listed below, as well as non-plotting functions from <a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and @@ -473,7 +473,7 @@ </th> <td align="left"> - get a handle graphics property + get a graphics property </td> </tr> @@ -781,7 +781,7 @@ </th> <td align="left"> - set a handle graphics property + set a graphics property </td> </tr> Modified: branches/v0_98_5_maint/doc/pyplots/tex_demo.png =================================================================== (Binary files differ) Modified: branches/v0_98_5_maint/doc/users/pyplot_tutorial.rst =================================================================== --- branches/v0_98_5_maint/doc/users/pyplot_tutorial.rst 2009年03月06日 19:14:30 UTC (rev 6959) +++ branches/v0_98_5_maint/doc/users/pyplot_tutorial.rst 2009年03月07日 19:19:40 UTC (rev 6960) @@ -78,10 +78,10 @@ line.set_antialiased(False) # turn off antialising * Use the :func:`~matplotlib.pyplot.setp` command. The example below - uses matlab handle graphics style command to set multiple properties + uses a Matlab-style command to set multiple properties on a list of lines. ``setp`` works transparently with a list of objects or a single object. You can either use python keyword arguments or - matlab-style string/value pairs:: + Matlab-style string/value pairs:: lines = plt.plot(x1, y1, x2, y2) # use keyword args Modified: branches/v0_98_5_maint/examples/pylab_examples/axes_props.py =================================================================== --- branches/v0_98_5_maint/examples/pylab_examples/axes_props.py 2009年03月06日 19:14:30 UTC (rev 6959) +++ branches/v0_98_5_maint/examples/pylab_examples/axes_props.py 2009年03月07日 19:19:40 UTC (rev 6960) @@ -10,7 +10,7 @@ plot(t, s) grid(True) -# matlab handle graphics style +# matlab style xticklines = getp(gca(), 'xticklines') yticklines = getp(gca(), 'yticklines') xgridlines = getp(gca(), 'xgridlines') Modified: branches/v0_98_5_maint/lib/matplotlib/pylab.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/pylab.py 2009年03月06日 19:14:30 UTC (rev 6959) +++ branches/v0_98_5_maint/lib/matplotlib/pylab.py 2009年03月07日 19:19:40 UTC (rev 6960) @@ -42,7 +42,7 @@ gca - return the current axes gcf - return the current figure gci - get the current image, or None - getp - get a handle graphics property + getp - get a graphics property grid - set whether gridding is on hist - make a histogram hold - set the axes hold state @@ -69,7 +69,7 @@ rgrids - customize the radial grids and labels for polar savefig - save the current figure scatter - make a scatter plot - setp - set a handle graphics property + setp - set a graphics property semilogx - log x axis semilogy - log y axis show - show the figures Modified: branches/v0_98_5_maint/lib/matplotlib/pyplot.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/pyplot.py 2009年03月06日 19:14:30 UTC (rev 6959) +++ branches/v0_98_5_maint/lib/matplotlib/pyplot.py 2009年03月07日 19:19:40 UTC (rev 6960) @@ -193,7 +193,7 @@ *number* attribute holding this number. If *num* is an integer, and ``figure(num)`` already exists, make it - active and return the handle to it. If ``figure(num)`` does not exist + active and return a reference to it. If ``figure(num)`` does not exist it will be created. Numbering starts at 1, matlab style:: figure(1) @@ -264,7 +264,7 @@ return figManager.canvas.figure def gcf(): - "Return a handle to the current figure." + "Return a reference to the current figure." figManager = _pylab_helpers.Gcf.get_active() if figManager is not None: @@ -1166,7 +1166,7 @@ gca return the current axes gcf return the current figure gci get the current image, or None - getp get a handle graphics property + getp get a graphics property hist make a histogram hold set the hold state on current axes legend add a legend to the axes @@ -1182,7 +1182,7 @@ rc control the default params savefig save the current figure scatter make a scatter plot - setp set a handle graphics property + setp set a graphics property semilogx log x axis semilogy log y axis show show the figures @@ -1229,7 +1229,7 @@ def colors(): """ - This is a do nothing function to provide you with help on how + This is a do-nothing function to provide you with help on how matplotlib handles colors. Commands which take color arguments can use several formats to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6959 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6959&view=rev Author: jswhit Date: 2009年03月06日 19:14:30 +0000 (2009年3月06日) Log Message: ----------- fix typo Modified Paths: -------------- trunk/toolkits/basemap/Changelog Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年03月06日 19:13:45 UTC (rev 6958) +++ trunk/toolkits/basemap/Changelog 2009年03月06日 19:14:30 UTC (rev 6959) @@ -1,5 +1,5 @@ version 0.99.4 (not yet released) - * add fix_aspect kwarg to Basemap.__init__, when true + * add fix_aspect kwarg to Basemap.__init__, when False axes.set_aspect is set to 'auto' instead of default 'equal'. Can be used to make plot fill whole plot region, even if the plot region doesn't match the aspect ratio of the map region. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6958 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6958&view=rev Author: jswhit Date: 2009年03月06日 19:13:45 +0000 (2009年3月06日) Log Message: ----------- add fix_aspect kwarg - when False, plot will not be forced to match aspect ratio of map region. Modified Paths: -------------- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年03月05日 13:22:26 UTC (rev 6957) +++ trunk/toolkits/basemap/Changelog 2009年03月06日 19:13:45 UTC (rev 6958) @@ -1,4 +1,8 @@ version 0.99.4 (not yet released) + * add fix_aspect kwarg to Basemap.__init__, when true + axes.set_aspect is set to 'auto' instead of default 'equal'. + Can be used to make plot fill whole plot region, even if the + plot region doesn't match the aspect ratio of the map region. * added date2index function, updated netcdftime to 0.7.1. * added maskoceans function. * update pupynere to version 1.0.8 (supports writing large files). Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年03月05日 13:22:26 UTC (rev 6957) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年03月06日 19:13:45 UTC (rev 6958) @@ -242,6 +242,8 @@ formatter, or if you want to let matplotlib label the axes in meters using map projection coordinates. + fix_aspect fix aspect ratio of plot to match aspect ratio + of map projection region (default True). anchor determines how map is placed in axes rectangle (passed to axes.set_aspect). Default is ``C``, which means map is centered. @@ -434,10 +436,14 @@ suppress_ticks=True, satellite_height=35786000, boundinglat=None, + fix_aspect=True, anchor='C', ax=None): # docstring is added after __init__ method definition + # fix aspect to ratio to match aspect ratio of map projection + # region + self.fix_aspect = fix_aspect # where to put plot in figure (default is 'C' or center) self.anchor = anchor # map projection. @@ -2566,7 +2572,10 @@ # make sure aspect ratio of map preserved. # plot is re-centered in bounding rectangle. # (anchor instance var determines where plot is placed) - ax.set_aspect('equal',adjustable='box',anchor=self.anchor) + if self.fix_aspect: + ax.set_aspect('equal',adjustable='box',anchor=self.anchor) + else: + ax.set_aspect('auto',adjustable='box',anchor=self.anchor) ax.apply_aspect() # make sure axis ticks are turned off. if self.noticks: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6957 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6957&view=rev Author: mdboom Date: 2009年03月05日 13:22:26 +0000 (2009年3月05日) Log Message: ----------- Fix logo-generation script to have rounded polar bar plots. Modified Paths: -------------- trunk/matplotlib/examples/api/logo2.py Modified: trunk/matplotlib/examples/api/logo2.py =================================================================== --- trunk/matplotlib/examples/api/logo2.py 2009年03月05日 04:45:00 UTC (rev 6956) +++ trunk/matplotlib/examples/api/logo2.py 2009年03月05日 13:22:26 UTC (rev 6957) @@ -47,7 +47,7 @@ ha='right', va='center', alpha=1.0, transform=ax.transAxes) def add_polar_bar(): - ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], polar=True) + ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], polar=True, resolution=50) ax.axesPatch.set_alpha(axalpha) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6956 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6956&view=rev Author: leejjoon Date: 2009年03月05日 04:45:00 +0000 (2009年3月05日) Log Message: ----------- hashing of FontProperties accounts current rcParams Modified Paths: -------------- trunk/matplotlib/CHANGELOG trunk/matplotlib/lib/matplotlib/font_manager.py Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2009年03月04日 20:53:29 UTC (rev 6955) +++ trunk/matplotlib/CHANGELOG 2009年03月05日 04:45:00 UTC (rev 6956) @@ -1,3 +1,5 @@ +2009年02月28日 hashing of FontProperties accounts current rcParams - JJL + 2009年02月28日 Prevent double-rendering of shared axis in twinx, twiny - EF 2009年02月26日 Add optional bbox_to_anchor argument for legend class - JJL Modified: trunk/matplotlib/lib/matplotlib/font_manager.py =================================================================== --- trunk/matplotlib/lib/matplotlib/font_manager.py 2009年03月04日 20:53:29 UTC (rev 6955) +++ trunk/matplotlib/lib/matplotlib/font_manager.py 2009年03月05日 04:45:00 UTC (rev 6956) @@ -705,10 +705,9 @@ return parse_fontconfig_pattern(pattern) def __hash__(self): - l = self.__dict__.items() - l.sort() + l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)] return hash(repr(l)) - + def __str__(self): return self.get_fontconfig_pattern() @@ -1181,7 +1180,7 @@ """ debug = False if prop is None: - return self.defaultFont + prop = FontProperties() if is_string_like(prop): prop = FontProperties(prop) fname = prop.get_file() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6955 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6955&view=rev Author: mdboom Date: 2009年03月04日 20:53:29 +0000 (2009年3月04日) Log Message: ----------- Fix wiggly baseline problem (again -- should have truncated rather than rounded) Modified Paths: -------------- trunk/matplotlib/src/ft2font.cpp Modified: trunk/matplotlib/src/ft2font.cpp =================================================================== --- trunk/matplotlib/src/ft2font.cpp 2009年03月04日 18:16:50 UTC (rev 6954) +++ trunk/matplotlib/src/ft2font.cpp 2009年03月04日 20:53:29 UTC (rev 6955) @@ -1257,8 +1257,8 @@ double xd = Py::Float(args[1]); double yd = Py::Float(args[2]); - long x = (long)mpl_round(xd); - long y = (long)mpl_round(yd); + long x = (long)xd; + long y = (long)yd; FT_Vector sub_offset; sub_offset.x = int((xd - (double)x) * 64.0); sub_offset.y = int((yd - (double)y) * 64.0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6954 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6954&view=rev Author: mdboom Date: 2009年03月04日 18:16:50 +0000 (2009年3月04日) Log Message: ----------- Fix a few bugs when mathtext.default is 'regular' Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/mathtext.py Modified: trunk/matplotlib/lib/matplotlib/mathtext.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mathtext.py 2009年03月04日 13:27:00 UTC (rev 6953) +++ trunk/matplotlib/lib/matplotlib/mathtext.py 2009年03月04日 18:16:50 UTC (rev 6954) @@ -843,7 +843,7 @@ return self.cm_fallback._get_glyph( fontname, 'it', sym, fontsize) else: - if fontname == 'it' and isinstance(self, StixFonts): + if fontname in ('it', 'regular') and isinstance(self, StixFonts): return self._get_glyph('rm', font_class, sym, fontsize) warn("Font '%s' does not have a glyph for '%s'" % (fontname, sym.encode('ascii', 'backslashreplace')), @@ -916,7 +916,7 @@ if mapping is not None: if isinstance(mapping, dict): - mapping = mapping[font_class] + mapping = mapping.get(font_class, 'rm') # Binary search for the source glyph lo = 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6953 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6953&view=rev Author: mdboom Date: 2009年03月04日 13:27:00 +0000 (2009年3月04日) Log Message: ----------- Merged revisions 6952 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6952 | mdboom | 2009年03月04日 08:25:41 -0500 (2009年3月04日) | 2 lines Fix for Python 2.4 compatibility. ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6950 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6952 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,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 + /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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 + /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952 Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009年03月04日 13:25:41 UTC (rev 6952) +++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009年03月04日 13:27:00 UTC (rev 6953) @@ -136,8 +136,6 @@ try: fd = open(fname) module = imp.load_module("__main__", fd, fname, ('py', 'r', imp.PY_SOURCE)) - except: - raise finally: del sys.path[0] os.chdir(pwd) Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6952 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6952&view=rev Author: mdboom Date: 2009年03月04日 13:25:41 +0000 (2009年3月04日) Log Message: ----------- Fix for Python 2.4 compatibility. Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py Modified: branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py 2009年03月03日 22:08:38 UTC (rev 6951) +++ branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py 2009年03月04日 13:25:41 UTC (rev 6952) @@ -136,8 +136,6 @@ try: fd = open(fname) module = imp.load_module("__main__", fd, fname, ('py', 'r', imp.PY_SOURCE)) - except: - raise finally: del sys.path[0] os.chdir(pwd) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6951 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6951&view=rev Author: mdboom Date: 2009年03月03日 22:08:38 +0000 (2009年3月03日) Log Message: ----------- Merged revisions 6950 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6950 | mdboom | 2009年03月03日 17:06:53 -0500 (2009年3月03日) | 2 lines Add workaround for change in handling of absolute paths in image directive in recent Sphinx hg versions. ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6948 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6950 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,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 + /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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 + /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950 Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009年03月03日 22:06:53 UTC (rev 6950) +++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009年03月03日 22:08:38 UTC (rev 6951) @@ -30,7 +30,11 @@ from docutils.parsers.rst.directives.images import Image align = Image.align from docutils import nodes +import sphinx +sphinx_version = sphinx.__version__.split(".") +sphinx_version = tuple([int(x) for x in sphinx_version[:2]]) + import matplotlib import matplotlib.cbook as cbook matplotlib.use('Agg') @@ -92,11 +96,11 @@ [%(links)s] - .. image:: %(tmpdir)s/%(outname)s.png + .. image:: %(prefix)s%(tmpdir)s/%(outname)s.png %(options)s .. latexonly:: - .. image:: %(tmpdir)s/%(outname)s.pdf + .. image:: %(prefix)s%(tmpdir)s/%(outname)s.pdf %(options)s """ @@ -262,7 +266,17 @@ # tmpdir is where we build all the output files. This way the # plots won't have to be redone when generating latex after html. - tmpdir = os.path.abspath(os.path.join('build', outdir)) + + # Prior to Sphinx 0.6, absolute image paths were treated as + # relative to the root of the filesystem. 0.6 and after, they are + # treated as relative to the root of the documentation tree. We need + # to support both methods here. + tmpdir = os.path.join('build', outdir) + if sphinx_version < (0, 6): + tmpdir = os.path.abspath(tmpdir) + prefix = '' + else: + prefix = '/' if not os.path.exists(tmpdir): cbook.mkdirs(tmpdir) Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6950 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6950&view=rev Author: mdboom Date: 2009年03月03日 22:06:53 +0000 (2009年3月03日) Log Message: ----------- Add workaround for change in handling of absolute paths in image directive in recent Sphinx hg versions. Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py Modified: branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py 2009年03月03日 15:06:54 UTC (rev 6949) +++ branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py 2009年03月03日 22:06:53 UTC (rev 6950) @@ -30,7 +30,11 @@ from docutils.parsers.rst.directives.images import Image align = Image.align from docutils import nodes +import sphinx +sphinx_version = sphinx.__version__.split(".") +sphinx_version = tuple([int(x) for x in sphinx_version[:2]]) + import matplotlib import matplotlib.cbook as cbook matplotlib.use('Agg') @@ -92,11 +96,11 @@ [%(links)s] - .. image:: %(tmpdir)s/%(outname)s.png + .. image:: %(prefix)s%(tmpdir)s/%(outname)s.png %(options)s .. latexonly:: - .. image:: %(tmpdir)s/%(outname)s.pdf + .. image:: %(prefix)s%(tmpdir)s/%(outname)s.pdf %(options)s """ @@ -262,7 +266,17 @@ # tmpdir is where we build all the output files. This way the # plots won't have to be redone when generating latex after html. - tmpdir = os.path.abspath(os.path.join('build', outdir)) + + # Prior to Sphinx 0.6, absolute image paths were treated as + # relative to the root of the filesystem. 0.6 and after, they are + # treated as relative to the root of the documentation tree. We need + # to support both methods here. + tmpdir = os.path.join('build', outdir) + if sphinx_version < (0, 6): + tmpdir = os.path.abspath(tmpdir) + prefix = '' + else: + prefix = '/' if not os.path.exists(tmpdir): cbook.mkdirs(tmpdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6949 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6949&view=rev Author: mdboom Date: 2009年03月03日 15:06:54 +0000 (2009年3月03日) Log Message: ----------- Merged revisions 6948 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6948 | mdboom | 2009年03月03日 08:25:23 -0500 (2009年3月03日) | 2 lines Fix plotting() docstring. ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/pyplot.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6946 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6948 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,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 + /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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 + /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948 Modified: trunk/matplotlib/lib/matplotlib/pyplot.py =================================================================== --- trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月03日 13:25:23 UTC (rev 6948) +++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009年03月03日 15:06:54 UTC (rev 6949) @@ -1149,6 +1149,7 @@ def plotting(): """ Plotting commands + =============== ========================================================= Command Description =============== ========================================================= Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6948 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6948&view=rev Author: mdboom Date: 2009年03月03日 13:25:23 +0000 (2009年3月03日) Log Message: ----------- Fix plotting() docstring. Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/pyplot.py Modified: branches/v0_98_5_maint/lib/matplotlib/pyplot.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/pyplot.py 2009年03月02日 23:04:27 UTC (rev 6947) +++ branches/v0_98_5_maint/lib/matplotlib/pyplot.py 2009年03月03日 13:25:23 UTC (rev 6948) @@ -1138,6 +1138,7 @@ def plotting(): """ Plotting commands + =============== ========================================================= Command Description =============== ========================================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6947 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6947&view=rev Author: mdboom Date: 2009年03月02日 23:04:27 +0000 (2009年3月02日) Log Message: ----------- Merged revisions 6946 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6946 | mdboom | 2009年03月02日 17:50:44 -0500 (2009年3月02日) | 2 lines Fix bug in doc build. ........ Modified Paths: -------------- trunk/matplotlib/doc/conf.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6941 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6946 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,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941 + /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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 Modified: trunk/matplotlib/doc/conf.py =================================================================== --- trunk/matplotlib/doc/conf.py 2009年03月02日 22:50:44 UTC (rev 6946) +++ trunk/matplotlib/doc/conf.py 2009年03月02日 23:04:27 UTC (rev 6947) @@ -28,7 +28,7 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table', - 'sphinx.ext.autodoc', # 'matplotlib.sphinxext.only_directives', + 'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives', 'matplotlib.sphinxext.plot_directive', 'inheritance_diagram', 'gen_gallery', 'gen_rst'] Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941 + /branches/v0_98_5_maint/doc/pyplots/README: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,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6946 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6946&view=rev Author: mdboom Date: 2009年03月02日 22:50:44 +0000 (2009年3月02日) Log Message: ----------- Fix bug in doc build. Modified Paths: -------------- branches/v0_98_5_maint/doc/conf.py Modified: branches/v0_98_5_maint/doc/conf.py =================================================================== --- branches/v0_98_5_maint/doc/conf.py 2009年02月28日 20:13:38 UTC (rev 6945) +++ branches/v0_98_5_maint/doc/conf.py 2009年03月02日 22:50:44 UTC (rev 6946) @@ -28,7 +28,7 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table', - 'sphinx.ext.autodoc', # 'matplotlib.sphinxext.only_directives', + 'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives', 'matplotlib.sphinxext.plot_directive', 'inheritance_diagram', 'gen_gallery', 'gen_rst'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.