matplotlib-checkins Mailing List for matplotlib

Revision: 6092
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6092&view=rev
Author: jdh2358
Date: 2008年09月13日 17:07:39 +0000 (2008年9月13日)
Log Message:
-----------
moved font examples to api
Added Paths:
-----------
 trunk/matplotlib/examples/api/font_family_rc.py
 trunk/matplotlib/examples/api/font_file.py
Removed Paths:
-------------
 trunk/matplotlib/examples/pylab_examples/font_family_rc.py
 trunk/matplotlib/examples/pylab_examples/font_file.py
Copied: trunk/matplotlib/examples/api/font_family_rc.py (from rev 6091, trunk/matplotlib/examples/pylab_examples/font_family_rc.py)
===================================================================
--- trunk/matplotlib/examples/api/font_family_rc.py	 (rev 0)
+++ trunk/matplotlib/examples/api/font_family_rc.py	2008年09月13日 17:07:39 UTC (rev 6092)
@@ -0,0 +1,29 @@
+"""
+You can explicitly set which font family is picked up for a given font
+style (eg 'serif', 'sans-serif', or 'monospace').
+
+In the example below, we only allow one font family (Tahoma) for the
+san-serif font style. You the default family with the font.family rc
+param, eg::
+
+ rcParams['font.family'] = 'sans-serif'
+
+and for the font.family you set a list of font styles to try to find
+in order::
+
+ rcParams['font.sans-serif'] = ['Tahoma', 'Bitstream Vera Sans', 'Lucida Grande', 'Verdana']
+
+
+"""
+from matplotlib import rcParams
+rcParams['font.family'] = 'sans-serif'
+rcParams['font.sans-serif'] = ['Tahoma']
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot([1,2,3], label='test')
+
+ax.legend()
+plt.show()
+
Copied: trunk/matplotlib/examples/api/font_file.py (from rev 6091, trunk/matplotlib/examples/pylab_examples/font_file.py)
===================================================================
--- trunk/matplotlib/examples/api/font_file.py	 (rev 0)
+++ trunk/matplotlib/examples/api/font_file.py	2008年09月13日 17:07:39 UTC (rev 6092)
@@ -0,0 +1,18 @@
+"""
+Although it is usually not a good idea to explicitly point to a single
+ttf file for a font instance, you can do so using the
+font_manager.FontProperties fname argument (for a more flexible
+solution, see the font_fmaily_rc.py and fonts_demo.py examples).
+"""
+import matplotlib.font_manager as fm
+
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot([1,2,3])
+
+prop = fm.FontProperties(fname='/Library/Fonts/Tahoma.ttf')
+ax.set_title('this is a special font', fontproperties=prop)
+plt.show()
+
Deleted: trunk/matplotlib/examples/pylab_examples/font_family_rc.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/font_family_rc.py	2008年09月13日 17:06:53 UTC (rev 6091)
+++ trunk/matplotlib/examples/pylab_examples/font_family_rc.py	2008年09月13日 17:07:39 UTC (rev 6092)
@@ -1,29 +0,0 @@
-"""
-You can explicitly set which font family is picked up for a given font
-style (eg 'serif', 'sans-serif', or 'monospace').
-
-In the example below, we only allow one font family (Tahoma) for the
-san-serif font style. You the default family with the font.family rc
-param, eg::
-
- rcParams['font.family'] = 'sans-serif'
-
-and for the font.family you set a list of font styles to try to find
-in order::
-
- rcParams['font.sans-serif'] = ['Tahoma', 'Bitstream Vera Sans', 'Lucida Grande', 'Verdana']
-
-
-"""
-from matplotlib import rcParams
-rcParams['font.family'] = 'sans-serif'
-rcParams['font.sans-serif'] = ['Tahoma']
-import matplotlib.pyplot as plt
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
-ax.plot([1,2,3], label='test')
-
-ax.legend()
-plt.show()
-
Deleted: trunk/matplotlib/examples/pylab_examples/font_file.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/font_file.py	2008年09月13日 17:06:53 UTC (rev 6091)
+++ trunk/matplotlib/examples/pylab_examples/font_file.py	2008年09月13日 17:07:39 UTC (rev 6092)
@@ -1,18 +0,0 @@
-"""
-Although it is usually not a good idea to explicitly point to a single
-ttf file for a font instance, you can do so using the
-font_manager.FontProperties fname argument (for a more flexible
-solution, see the font_fmaily_rc.py and fonts_demo.py examples).
-"""
-import matplotlib.font_manager as fm
-
-import matplotlib.pyplot as plt
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
-ax.plot([1,2,3])
-
-prop = fm.FontProperties(fname='/Library/Fonts/Tahoma.ttf')
-ax.set_title('this is a special font', fontproperties=prop)
-plt.show()
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6091
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6091&view=rev
Author: jdh2358
Date: 2008年09月13日 17:06:53 +0000 (2008年9月13日)
Log Message:
-----------
added a couple of font examples
Added Paths:
-----------
 trunk/matplotlib/examples/pylab_examples/font_family_rc.py
 trunk/matplotlib/examples/pylab_examples/font_file.py
Added: trunk/matplotlib/examples/pylab_examples/font_family_rc.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/font_family_rc.py	 (rev 0)
+++ trunk/matplotlib/examples/pylab_examples/font_family_rc.py	2008年09月13日 17:06:53 UTC (rev 6091)
@@ -0,0 +1,29 @@
+"""
+You can explicitly set which font family is picked up for a given font
+style (eg 'serif', 'sans-serif', or 'monospace').
+
+In the example below, we only allow one font family (Tahoma) for the
+san-serif font style. You the default family with the font.family rc
+param, eg::
+
+ rcParams['font.family'] = 'sans-serif'
+
+and for the font.family you set a list of font styles to try to find
+in order::
+
+ rcParams['font.sans-serif'] = ['Tahoma', 'Bitstream Vera Sans', 'Lucida Grande', 'Verdana']
+
+
+"""
+from matplotlib import rcParams
+rcParams['font.family'] = 'sans-serif'
+rcParams['font.sans-serif'] = ['Tahoma']
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot([1,2,3], label='test')
+
+ax.legend()
+plt.show()
+
Added: trunk/matplotlib/examples/pylab_examples/font_file.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/font_file.py	 (rev 0)
+++ trunk/matplotlib/examples/pylab_examples/font_file.py	2008年09月13日 17:06:53 UTC (rev 6091)
@@ -0,0 +1,18 @@
+"""
+Although it is usually not a good idea to explicitly point to a single
+ttf file for a font instance, you can do so using the
+font_manager.FontProperties fname argument (for a more flexible
+solution, see the font_fmaily_rc.py and fonts_demo.py examples).
+"""
+import matplotlib.font_manager as fm
+
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+ax.plot([1,2,3])
+
+prop = fm.FontProperties(fname='/Library/Fonts/Tahoma.ttf')
+ax.set_title('this is a special font', fontproperties=prop)
+plt.show()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6090
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6090&view=rev
Author: jdh2358
Date: 2008年09月13日 15:35:55 +0000 (2008年9月13日)
Log Message:
-----------
updated the wx animation examples
Added Paths:
-----------
 trunk/matplotlib/examples/animation/simple_idle_wx.py
 trunk/matplotlib/examples/animation/simple_timer_wx.py
Removed Paths:
-------------
 trunk/matplotlib/examples/animation/dynamic_image_wxagg.py
 trunk/matplotlib/examples/animation/simple_anim_wx.py
Deleted: trunk/matplotlib/examples/animation/dynamic_image_wxagg.py
===================================================================
--- trunk/matplotlib/examples/animation/dynamic_image_wxagg.py	2008年09月13日 14:28:09 UTC (rev 6089)
+++ trunk/matplotlib/examples/animation/dynamic_image_wxagg.py	2008年09月13日 15:35:55 UTC (rev 6090)
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright (C) 2003-2004 Jeremy O'Donoghue and others
-
-License: This work is licensed under the PSF. A copy should be included
-with this source code, and is also available at
-http://www.python.org/psf/license.html
-
-"""
-import sys, time, os, gc
-
-import matplotlib
-matplotlib.use('WXAgg')
-
-from matplotlib import rcParams
-import matplotlib.cm as cm
-
-from matplotlib.backends.backend_wxagg import Toolbar, FigureCanvasWxAgg
-
-from matplotlib.figure import Figure
-import numpy as npy
-import wx
-
-
-TIMER_ID = wx.NewId()
-
-class PlotFigure(wx.Frame):
-
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Test embedded wxFigure")
-
- self.fig = Figure((5,4), 75)
- self.canvas = FigureCanvasWxAgg(self, -1, self.fig)
- self.toolbar = Toolbar(self.canvas)
- self.toolbar.Realize()
-
- # On Windows, default frame size behaviour is incorrect
- # you don't need this under Linux
- tw, th = self.toolbar.GetSizeTuple()
- fw, fh = self.canvas.GetSizeTuple()
- self.toolbar.SetSize(wx.Size(fw, th))
-
- # Initialise the timer - wxPython requires this to be connected to
- # the receiving event handler
- self.t = wx.Timer(self, TIMER_ID)
- self.t.Start(10)
-
- # Create a figure manager to manage things
-
- # Now put all into a sizer
- sizer = wx.BoxSizer(wx.VERTICAL)
- # This way of adding to sizer allows resizing
- sizer.Add(self.canvas, 1, wx.LEFT|wx.TOP|wx.GROW)
- # Best to allow the toolbar to resize!
- sizer.Add(self.toolbar, 0, wx.GROW)
- self.SetSizer(sizer)
- self.Fit()
- self.Bind(wx.EVT_TIMER, self.onTimer, id=TIMER_ID)
- self.Bind(wx.EVT_CLOSE, self.onClose)
-
- def init_plot_data(self):
- # jdh you can add a subplot directly from the fig rather than
- # the fig manager
- a = self.fig.add_subplot(111)
- self.x = npy.arange(120.0)*2*npy.pi/120.0
- self.x.resize((100,120))
- self.y = npy.arange(100.0)*2*npy.pi/100.0
- self.y.resize((120,100))
- self.y = npy.transpose(self.y)
- z = npy.sin(self.x) + npy.cos(self.y)
- self.im = a.imshow( z, cmap=cm.jet)#, interpolation='nearest')
-
- def GetToolBar(self):
- # You will need to override GetToolBar if you are using an
- # unmanaged toolbar in your frame
- return self.toolbar
-
- def onTimer(self, evt):
- self.x += npy.pi/15
- self.y += npy.pi/20
- z = npy.sin(self.x) + npy.cos(self.y)
- self.im.set_array(z)
- self.canvas.draw()
- #self.canvas.gui_repaint() # jdh wxagg_draw calls this already
-
- def onClose(self, evt):
- self.t.Stop()
- evt.Skip()
-
- def onEraseBackground(self, evt):
- # this is supposed to prevent redraw flicker on some X servers...
- pass
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- frame = PlotFigure()
- frame.init_plot_data()
-
- frame.Show()
- app.MainLoop()
Deleted: trunk/matplotlib/examples/animation/simple_anim_wx.py
===================================================================
--- trunk/matplotlib/examples/animation/simple_anim_wx.py	2008年09月13日 14:28:09 UTC (rev 6089)
+++ trunk/matplotlib/examples/animation/simple_anim_wx.py	2008年09月13日 15:35:55 UTC (rev 6090)
@@ -1,29 +0,0 @@
-"""
-A simple example of an animated plot using a wx backend
-"""
-import time
-import numpy as np
-import matplotlib
-matplotlib.use('WXAgg') # do this before importing pylab
-
-import matplotlib.pyplot as plt
-
-fig = plt.figure()
-
-ax = fig.add_subplot(111)
-
-def animate(idleevent):
- tstart = time.time() # for profiling
- x = np.arange(0, 2*np.pi, 0.01) # x-array
- line, = ax.plot(x, np.sin(x))
-
- for i in np.arange(1,200):
- line.set_ydata(np.sin(x+i/10.0)) # update the data
- fig.canvas.draw() # redraw the canvas
- print 'FPS:' , 200/(time.time()-tstart)
- raise SystemExit
-
-# call the animation loop on idle
-import wx
-wx.EVT_IDLE(wx.GetApp(), animate)
-plt.show()
Added: trunk/matplotlib/examples/animation/simple_idle_wx.py
===================================================================
--- trunk/matplotlib/examples/animation/simple_idle_wx.py	 (rev 0)
+++ trunk/matplotlib/examples/animation/simple_idle_wx.py	2008年09月13日 15:35:55 UTC (rev 6090)
@@ -0,0 +1,29 @@
+"""
+A simple example of an animated plot using a wx backend
+"""
+import time
+import numpy as np
+import matplotlib
+matplotlib.use('WXAgg') # do this before importing pylab
+
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+
+ax = fig.add_subplot(111)
+t = np.arange(0, 2*np.pi, 0.1)
+line, = ax.plot(t, np.sin(t))
+dt = 0.05
+
+def update_line(idleevent):
+ if update_line.i==200:
+ return False
+ print 'animate', update_line.i
+ line.set_ydata(np.sin(t+update_line.i/10.))
+ fig.canvas.draw_idle() # redraw the canvas
+ update_line.i += 1
+update_line.i = 0
+
+import wx
+wx.EVT_IDLE(wx.GetApp(), update_line)
+plt.show()
Added: trunk/matplotlib/examples/animation/simple_timer_wx.py
===================================================================
--- trunk/matplotlib/examples/animation/simple_timer_wx.py	 (rev 0)
+++ trunk/matplotlib/examples/animation/simple_timer_wx.py	2008年09月13日 15:35:55 UTC (rev 6090)
@@ -0,0 +1,36 @@
+"""
+A simple example of an animated plot using a wx backend
+"""
+import time
+import numpy as np
+import matplotlib
+matplotlib.use('WXAgg') # do this before importing pylab
+
+import matplotlib.pyplot as plt
+
+fig = plt.figure()
+
+ax = fig.add_subplot(111)
+t = np.arange(0, 2*np.pi, 0.1)
+line, = ax.plot(t, np.sin(t))
+dt = 0.05
+
+
+def update_line(event):
+ if update_line.i==200:
+ return False
+ print 'update', update_line.i
+ line.set_ydata(np.sin(t+update_line.i/10.))
+ fig.canvas.draw() # redraw the canvas
+ update_line.i += 1
+update_line.i = 0
+
+import wx
+id = wx.NewId()
+actor = fig.canvas.manager.frame
+timer = wx.Timer(actor, id=id)
+timer.Start(100)
+wx.EVT_TIMER(actor, id, update_line)
+#actor.Bind(wx.EVT_TIMER, update_line, id=id)
+
+plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6089
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6089&view=rev
Author: jdh2358
Date: 2008年09月13日 14:28:09 +0000 (2008年9月13日)
Log Message:
-----------
replaced ipython run magic with code.InteractiveConsole.runsource
Modified Paths:
--------------
 trunk/matplotlib/doc/sphinxext/plot_directive.py
 trunk/matplotlib/lib/matplotlib/text.py
Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/plot_directive.py	2008年09月12日 21:21:16 UTC (rev 6088)
+++ trunk/matplotlib/doc/sphinxext/plot_directive.py	2008年09月13日 14:28:09 UTC (rev 6089)
@@ -13,7 +13,7 @@
 source will be included inline, as well as a link to the source.
 """
 
-import sys, os, glob, shutil
+import sys, os, glob, shutil, code
 from docutils.parsers.rst import directives
 
 try:
@@ -26,11 +26,16 @@
 
 
 import matplotlib
-import IPython.Shell
+
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-mplshell = IPython.Shell.MatplotlibShell('mpl')
+#import IPython.Shell
+#mplshell = IPython.Shell.MatplotlibShell('mpl')
+console = code.InteractiveConsole()
+def runfile(fname):
+ source = file(fname).read()
+ return console.runsource(source)
 
 options = {'alt': directives.unchanged,
 'height': directives.length_or_unitless,
@@ -58,7 +63,7 @@
 
 def makefig(fullpath, outdir):
 """
- run a pyplot script and save the low and high res PNGs and a PDF in _static
+ run a pyplot script<t and save the low and high res PNGs and a PDF in _static
 """
 
 fullpath = str(fullpath) # todo, why is unicode breaking this
@@ -88,7 +93,8 @@
 plt.close('all') # we need to clear between runs
 matplotlib.rcdefaults()
 
- mplshell.magic_run(fullpath)
+ runfile(fullpath)
+
 for format, dpi in formats:
 outname = os.path.join(outdir, '%s.%s' % (basename, format))
 if os.path.exists(outname): continue
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py	2008年09月12日 21:21:16 UTC (rev 6088)
+++ trunk/matplotlib/lib/matplotlib/text.py	2008年09月13日 14:28:09 UTC (rev 6089)
@@ -41,10 +41,11 @@
 # these are not available for the object inspector until after the
 # class is build so we define an initial set here for the init
 # function and they will be overridden after object defn
-artist.kwdocd['Text'] = """\
+artist.kwdocd['Text'] = """
 ========================== =========================================================================
+ Property Value
+ ========================== =========================================================================
 alpha float
- ========================== =========================================================================
 animated [True | False]
 backgroundcolor any matplotlib color
 bbox rectangle prop dict plus key 'pad' which is a pad in points
@@ -1003,7 +1004,7 @@
 annotation to the point. Valid keys are
 
 ========= ===========================================================
- Key Description
+ Key Description
 ========= ===========================================================
 width the width of the arrow in points
 frac the fraction of the arrow length occupied by the head
@@ -1021,7 +1022,7 @@
 coordinates of *xy* and *xytext*.
 
 ================= ===================================================
- Property Description
+ Property Description
 ================= ===================================================
 'figure points' points from the lower left corner of the figure
 'figure pixels' pixels from the lower left corner of the figure
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.