matplotlib-checkins Mailing List for matplotlib

Revision: 7516
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7516&view=rev
Author: mdboom
Date: 2009年08月21日 18:35:47 +0000 (2009年8月21日)
Log Message:
-----------
Improve documentation re-build speed.
Modified Paths:
--------------
 trunk/matplotlib/doc/sphinxext/gen_gallery.py
 trunk/matplotlib/doc/sphinxext/gen_rst.py
Modified: trunk/matplotlib/doc/sphinxext/gen_gallery.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/gen_gallery.py	2009年08月21日 17:39:46 UTC (rev 7515)
+++ trunk/matplotlib/doc/sphinxext/gen_gallery.py	2009年08月21日 18:35:47 UTC (rev 7516)
@@ -18,6 +18,10 @@
 
 multiimage = re.compile('(.*)_\d\d')
 
+def out_of_date(original, derived):
+ return (not os.path.exists(derived) or
+ os.stat(derived).st_mtime < os.stat(original).st_mtime)
+
 def gen_gallery(app, doctree):
 if app.builder.name != 'html':
 return
@@ -58,10 +62,10 @@
 
 # Create thumbnails based on images in tmpdir, and place
 # them within the build tree
- image.thumbnail(
- str(os.path.join(origdir, filename)),
- str(os.path.join(thumbdir, filename)),
- scale=0.3)
+ orig_path = str(os.path.join(origdir, filename))
+ thumb_path = str(os.path.join(thumbdir, filename))
+ if out_of_date(orig_path, thumb_path):
+ image.thumbnail(orig_path, thumb_path, scale=0.3)
 
 m = multiimage.match(basename)
 if m is None:
Modified: trunk/matplotlib/doc/sphinxext/gen_rst.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/gen_rst.py	2009年08月21日 17:39:46 UTC (rev 7515)
+++ trunk/matplotlib/doc/sphinxext/gen_rst.py	2009年08月21日 18:35:47 UTC (rev 7516)
@@ -113,8 +113,7 @@
 
 fhsubdirIndex.write(' %s\n'%rstfile)
 
- if (not out_of_date(fullpath, outputfile) and
- not out_of_date(fullpath, outrstfile)):
+ if not out_of_date(fullpath, outrstfile):
 continue
 
 fh = file(outrstfile, 'w')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7515
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7515&view=rev
Author: ryanmay
Date: 2009年08月21日 17:39:46 +0000 (2009年8月21日)
Log Message:
-----------
Add an example showing how to dynamically resample for plotting using event handling.
Added Paths:
-----------
 trunk/matplotlib/examples/event_handling/resample.py
Added: trunk/matplotlib/examples/event_handling/resample.py
===================================================================
--- trunk/matplotlib/examples/event_handling/resample.py	 (rev 0)
+++ trunk/matplotlib/examples/event_handling/resample.py	2009年08月21日 17:39:46 UTC (rev 7515)
@@ -0,0 +1,53 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from scikits.audiolab import wavread
+
+# A class that will downsample the data and recompute when zoomed.
+class DataDisplayDownsampler(object):
+ def __init__(self, xdata, ydata):
+ self.origYData = ydata
+ self.origXData = xdata
+ self.numpts = 3000
+ self.delta = xdata[-1] - xdata[0]
+
+ def resample(self, xstart, xend):
+ # Very simple downsampling that takes the points within the range
+ # and picks every Nth point
+ mask = (self.origXData > xstart) & (self.origXData < xend)
+ xdata = self.origXData[mask]
+ ratio = int(xdata.size / self.numpts) + 1
+ xdata = xdata[::ratio]
+
+ ydata = self.origYData[mask]
+ ydata = ydata[::ratio]
+
+ return xdata, ydata
+
+ def update(self, ax):
+ # Update the line
+ lims = ax.viewLim
+ if np.abs(lims.width - self.delta) > 1e-8:
+ self.delta = lims.width
+ xstart, xend = lims.intervalx
+ self.line.set_data(*self.downsample(xstart, xend))
+ ax.figure.canvas.draw_idle()
+
+# Read data
+data = wavread('/usr/share/sounds/purple/receive.wav')[0]
+ydata = np.tile(data[:, 0], 100)
+xdata = np.arange(ydata.size)
+
+d = DataDisplayDownsampler(xdata, ydata)
+
+fig = plt.figure()
+ax = fig.add_subplot(1, 1, 1)
+
+#Hook up the line
+xdata, ydata = d.downsample(xdata[0], xdata[-1])
+d.line, = ax.plot(xdata, ydata)
+ax.set_autoscale_on(False) # Otherwise, infinite loop
+
+# Connect for changing the view limits
+ax.callbacks.connect('xlim_changed', d.update)
+
+plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7514
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7514&view=rev
Author: jdh2358
Date: 2009年08月21日 05:33:25 +0000 (2009年8月21日)
Log Message:
-----------
tweaks to sampledoc
Modified Paths:
--------------
 trunk/sampledoc_tut/custom_look.rst
 trunk/sampledoc_tut/extensions.rst
Modified: trunk/sampledoc_tut/custom_look.rst
===================================================================
--- trunk/sampledoc_tut/custom_look.rst	2009年08月20日 23:16:11 UTC (rev 7513)
+++ trunk/sampledoc_tut/custom_look.rst	2009年08月21日 05:33:25 UTC (rev 7514)
@@ -9,7 +9,7 @@
 the sites created with the default css, so here we'll invoke TS Elliots'
 maxim "Talent imitates, but genius steals" and grab their css
 and part of their layout. As before, you can either get the required
-files :file:`_static/default.css`, :file:`_templates:layout.html` and
+files :file:`_static/default.css`, :file:`_templates/layout.html` and
 :file:`_static/logo.png` from the website or svn (see
 :ref:`fetching-the-data`). Since I did a svn checkout before, I will
 just copy the stuff I need from there::
Modified: trunk/sampledoc_tut/extensions.rst
===================================================================
--- trunk/sampledoc_tut/extensions.rst	2009年08月20日 23:16:11 UTC (rev 7513)
+++ trunk/sampledoc_tut/extensions.rst	2009年08月21日 05:33:25 UTC (rev 7514)
@@ -26,7 +26,7 @@
 In addition to the builtin matplotlib extensions for embedding pyplot
 plots and rendering math with matplotlib's native math engine, we also
 have extensions for syntax highlighting ipython sessions, making
-inhertiance diagrams, and more. 
+inhertiance diagrams, and more.
 
 We need to inform sphinx of our new extensions in the :file:`conf.py`
 file by adding the following. First we tell it where to find the extensions::
@@ -37,7 +37,7 @@
 sys.path.append(os.path.abspath('sphinxext'))
 
 And then we tell it what extensions to load::
- 
+
 # Add any Sphinx extension module names here, as strings. They can
 # be extensions coming with Sphinx (named 'sphinx.ext.*') or your
 # custom ones.
@@ -108,13 +108,13 @@
 
 .. math::
 
- W^{3\beta}_{\delta_1 \rho_1 \sigma_2} \approx U^{3\beta}_{\delta_1 \rho_1} 
+ W^{3\beta}_{\delta_1 \rho_1 \sigma_2} \approx U^{3\beta}_{\delta_1 \rho_1}
 
-which is rendered as 
+which is rendered as
 
 .. math::
 
- W^{3\beta}_{\delta_1 \rho_1 \sigma_2} \approx U^{3\beta}_{\delta_1 \rho_1} 
+ W^{3\beta}_{\delta_1 \rho_1 \sigma_2} \approx U^{3\beta}_{\delta_1 \rho_1}
 
 This documentation framework includes a Sphinx extension,
 :file:`sphinxext/mathmpl.py`, that uses matplotlib to render math
@@ -147,9 +147,19 @@
 
 Inserting automatically-generated plots is easy. Simply put the
 script to generate the plot in the :file:`pyplots` directory, and
-refer to it using the ``plot`` directive. To include the source code
-for the plot in the document, pass the ``include-source`` parameter::
+refer to it using the ``plot`` directive. First make a
+:file:`pyplots` directory at the top level of your project (next to
+:``conf.py``) and copy the :file:`ellipses.py`` file into it::
 
+ home:~/tmp/sampledoc> mkdir pyplots
+ home:~/tmp/sampledoc> cp ../sampledoc_tut/pyplots/ellipses.py pyplots/
+
+
+You can refer to this file in your sphinx documentation; by default it
+will just inline the plot with links to the source and PF and high
+resolution PNGS. To also include the source code for the plot in the
+document, pass the ``include-source`` parameter::
+
 .. plot:: pyplots/ellipses.py
 :include-source:
 
@@ -161,9 +171,9 @@
 :include-source:
 
 
-You can also inline simple plots, and the code will be executed at
-documentation build time and the figure inserted into your docs; the
-following code::
+You can also inline code for plots directly, and the code will be
+executed at documentation build time and the figure inserted into your
+docs; the following code::
 
 .. plot::
 
@@ -192,7 +202,7 @@
 <http://matplotlib.sourceforge.net/users/pyplot_tutorial.html>`_ and
 the `gallery <http://matplotlib.sourceforge.net/gallery.html>`_ for
 lots of examples of matplotlib plots.
- 
+
 Inheritance diagrams
 ====================
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.