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
|
|
From: <jd...@us...> - 2008-10-15 18:48:06
|
Revision: 6213
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6213&view=rev
Author: jdh2358
Date: 2008-10-15 18:48:00 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
updates to installing and interactive shell docs
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/faq/installing_faq.rst
trunk/matplotlib/doc/users/index.rst
trunk/matplotlib/doc/users/installing.rst
Added Paths:
-----------
trunk/matplotlib/doc/users/shell.rst
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2008-10-15 18:35:57 UTC (rev 6212)
+++ trunk/matplotlib/doc/_templates/index.html 2008-10-15 18:48:00 UTC (rev 6213)
@@ -22,10 +22,13 @@
matplotlib tries to make easy things easy and hard things possible.
You can generate plots, histograms, power spectra, bar charts,
errorcharts, scatterplots, etc, with just a few lines of code. For
- example, to make a histogram of data in x, you simply need to type
+ example, to generate 10,000 gaussian random numbers and make a
+ histogram plot binning the data into 100 bins, you simply need to type
<pre>
- >>> hist(x, 100) # use 100 bins
+ >>> from pylab import randn, hist
+ >>> x = randn(10000)
+ >>> hist(x, 100)
</pre>
For the power user, you have full control of line styles, font
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 18:35:57 UTC (rev 6212)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 18:48:00 UTC (rev 6213)
@@ -1,12 +1,16 @@
<h3>Download</h3>
<p>Current version: <b>{{ version }}</b></p>
-<p>Download matplotlib from the sourceforge <a
-href="http://sourceforge.net/projects/matplotlib">project</a> page.
+<p>Download matplotlib from the sourceforge <a
+href="http://sourceforge.net/projects/matplotlib">project</a> page
+(but first take a look at the <a
+href="{{ pathto('users/installing') }}">installing</a> page).
-There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.
+<p>
+There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.
+</p>
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('contents') }}">docs</a>, the <a
+<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>, the <a
href="{{ pathto('faq/index') }}">faq</a>, and join the matplotlib mailing <a
href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>
@@ -20,5 +24,5 @@
<a href="{{ pathto('users/screenshots') }}">screenshots</a> and <a href=examples>examples</a>
+
-
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst 2008-10-15 18:35:57 UTC (rev 6212)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2008-10-15 18:48:00 UTC (rev 6213)
@@ -90,10 +90,10 @@
<locating-matplotlib-install>`
-.. _install_svn:
+.. _install-svn:
-How to install from svn
-=======================
+How to install from svn?
+========================
Checking out the main source::
@@ -249,6 +249,21 @@
OS-X questions
==============
+.. _which-python-for-osx:
+
+Which python for OS X?
+----------------------
+
+Apple ships with its own python, many users have had trouble
+with it so there are alternatives. If it is feasible for you, we
+recommend the enthought python distribution `EPD
+<http://www.enthought.com/products/epd.php>`_ for OS X (which comes
+with matplotlib and much more) or the
+`MacPython <http://wiki.python.org/moin/MacPython/Leopard>`_ or the
+official OS X version from `python.org
+<http://www.python.org/download/>`_.
+
+
.. _easy-install-osx-egg:
How can I easy_install my egg?
Modified: trunk/matplotlib/doc/users/index.rst
===================================================================
--- trunk/matplotlib/doc/users/index.rst 2008-10-15 18:35:57 UTC (rev 6212)
+++ trunk/matplotlib/doc/users/index.rst 2008-10-15 18:48:00 UTC (rev 6213)
@@ -17,6 +17,7 @@
pyplot_tutorial.rst
navigation_toolbar.rst
customizing.rst
+ shell.rst
index_text.rst
artists.rst
event_handling.rst
Modified: trunk/matplotlib/doc/users/installing.rst
===================================================================
--- trunk/matplotlib/doc/users/installing.rst 2008-10-15 18:35:57 UTC (rev 6212)
+++ trunk/matplotlib/doc/users/installing.rst 2008-10-15 18:48:00 UTC (rev 6213)
@@ -4,11 +4,113 @@
Installing
**********
-Dependencies
-============
+There are lots of different ways to install matplotlib, and the best
+way depends on what operating system you are using, what you already
+have installed, and how you want to use it. To avoid wading through
+all the details (and potential complications) on this page, the
+easiest thing for you to do is use one of the pre-packaged python
+distributions that already provide matplotlib built in. The Enthought
+Python Distribution `(EPD)
+<http://www.enthought.com/products/epd.php>`_ for Windows, OS X or
+Redhat is an excellent choice that "just works" out of the box.
+Another excellent alternative for Windows users is `Python (x, y)
+<http://www.pythonxy.com/foreword.php>`_ which tends to be updated a
+bit more frequently. Both of these packages include matplotlib and
+pylab, and *lots* of other useful tools. matplotlib is also packaged
+for pretty much every major linux distribution, so if you are on linux
+your package manager will probably provide matplotlib prebuilt.
-**Requirements**
+One single click installer and you are done.
+Ok, so you want to do it the hard way?
+======================================
+
+For some people, the prepackaged pythons discussed above are not an
+option. That's OK, it's usually pretty easy to get a custom install
+working. You will first need to find out if you have python installed
+on your machine, and if not, install it. The official python builds
+are available for download `here <http://www.python.org/download>`_,
+but OS X users please read :ref:`which-python-for-osx`.
+
+Once you have python up and running, you will need to install `numpy
+<http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`_.
+numpy provides high performance array data structures and mathematical
+functions, and is a requirement for matplotlib. You can test your
+progress::
+
+ >>> import numpy
+ >>> print numpy.__versions__
+
+matplotlib requires numpy version 1.1 or later. Although it is not a
+requirement to use matplotlib, we strongly encourage you to install
+`ipython <http://ipython.scipy.org/dist>`_, which is an interactive
+shell for python that is matplotlib aware. Once you have ipython,
+numpy and matplotlib installed, ipython's "pylab" mode you have a
+matlab-like environment that automatically handles most of the
+configuration details for you, so you can get up and running quickly::
+
+ johnh@flag:~> ipython -pylab
+ Python 2.4.5 (#4, Apr 12 2008, 09:09:16)
+ IPython 0.9.0 -- An enhanced Interactive Python.
+
+ Welcome to pylab, a matplotlib-based Python environment.
+ For more information, type 'help(pylab)'.
+
+ In [1]: x = randn(10000)
+
+ In [2]: hist(x, 100)
+
+And a *voila*, a figure pops up. But we are putting the cart ahead of
+the horse -- first we need to get matplotlib installed. We provide
+prebuilt binaries for OS X and Windows on the matplotlib `download
+<http://sourceforge.net/project/showfiles.php?group_id=80706>`_ page.
+Click on the latest release of the "matplotlib" package, choose your
+python version (2.4 or 2.5) and your platform (macosx or win32) and
+you should be good to go. If you have any problems, please check the
+:ref:`installing-faq`, google around a little bit, and post a question
+the `mailing list
+<http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
+
+Note that when testing matplotlib installations from the interactive
+python console, there are some issues relating to user interface
+toolkits and interactive settings that are discussed in
+:ref:`mpl-shell`.
+
+.. _install_from_source:
+
+Installing from source
+======================
+
+If you are interested perhaps in contributing to matplotlib
+development, or just like to build everything yourself, it is not
+difficult to build matplotlib from source. Grab the lattest *tar.gz*
+release file from `sourceforge
+<http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
+you want to develop matplotlib or just need the latest bugfixed
+version, grab the latest svn version :ref:`install-svn`.
+
+Once you have satisfied the requirements detailed below (mainly
+python, numpy, libpng and freetype), you build matplotlib in the usual
+way::
+
+ cd matplotlib
+ python setup.py build
+ python setup.py install
+
+We provide a `setup.cfg
+<http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/matplotlib/setup.cfg.template?view=markup>`
+file that lives along :file:`setup.py` which you can use to customize
+the build process, for example, which default backend to use, whether
+some of the optional libraries that matplotlib ships with are
+installed, and so on. This file will be particularly useful to those
+packaging matplotlib.
+
+
+.. _install_requrements:
+
+Build requirements
+==================
+
These are external packages which you will need to install before
installing matplotlib. Windows users only need the first two (python
and numpy) since the others are built into the matplotlib windows
@@ -18,12 +120,14 @@
matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
:term:`numpy` 1.1 (or later)
- array support for python (`download <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
+ array support for python (`download
+ <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
libpng 1.1 (or later)
- library for loading and saving :term:`PNG` files (`download <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires zlib. If
- you are a windows user, you can ignore this since we build support
- into the matplotlib single click installer
+ library for loading and saving :term:`PNG` files (`download
+ <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
+ zlib. If you are a windows user, you can ignore this since we
+ build support into the matplotlib single click installer
:term:`freetype` 1.4 (or later)
library for reading true type font files. If you are a windows
@@ -60,32 +164,22 @@
**Required libraries that ship with matplotlib**
-If you are downloading matplotlib or installing from source or
-subversion, you can ignore this section. This is useful for matplotlib
-developers and packagers who may want to disable the matplotlib
-version and ship a packaged version.
-
:term:`agg` 2.4
- The antigrain C++ rendering engine
+ The antigrain C++ rendering engine. matplotlib links against the
+ agg template source statically, so it will not affect anything on
+ your system outside of matplotlib.
pytz 2007g or later
- timezone handling for python datetime objects
+ timezone handling for python datetime objects. By default,
+ matplotlib will install pytz if it isn't already installed on your
+ system. To override the default, use setup.cfg to force or
+ prevent installation of pytz.
dateutil 1.1 or later
- extensions to python datetime handling
+ extensions to python datetime handling. By
+ default, matplotlib will install dateutil if it isn't already
+ installed on your system. To override the default, use setup.cfg
+ to force or prevent installation of dateutil.
-**Optional libraries that ship with matplotlib**
-As above, if you are downloading matplotlib or installing from source
-or subversion, you can ignore this section. This is useful for
-matplotlib developers and packagers who may want to disable the
-matplotlib version and ship a packaged version.
-enthought traits 2.6
- The traits component of the Enthought Tool Suite used in the
- experimental matplotlib traits rc system. matplotlib has decided
- to stop installing this library so packagers should not distribute
- the version included with matplotlib. packagers do not need to
- list this as a requirement because the traits support is
- experimental and disabled by default.
-
Added: trunk/matplotlib/doc/users/shell.rst
===================================================================
--- trunk/matplotlib/doc/users/shell.rst (rev 0)
+++ trunk/matplotlib/doc/users/shell.rst 2008-10-15 18:48:00 UTC (rev 6213)
@@ -0,0 +1,142 @@
+.. _mpl-shell:
+
+**********************************
+Using matplotlib in a python shell
+**********************************
+
+By default, matplotlib defers drawing until the end of the script
+because drawing can be an expensive opertation, and you may not want
+to update the plot every time a single property is changed, only once
+after all the properties have changed.
+
+But when working from the python shell, you usually do want to update
+the plot with every command, eg, after changing the
+:func:`~matplotlib.pyplot.xlabel`, or the marker style of a line.
+While this is simple in concept, in practice it can be tricky, because
+matplotlib is a graphical user interface application under the hood,
+and there are some tricks to make the applications work right in a
+python shell.
+
+
+.. _ipython-pylab:
+
+Ipython to the rescue
+=====================
+
+Fortunately, `ipython <http://ipython.scipy.org/dist>`_, an enhanced
+interactive python shell, has figured out all of these tricks, and is
+matplotlib aware, so when you start ipython in the *pylab* mode::
+
+
+ johnh@flag:~> ipython -pylab
+ Python 2.4.5 (#4, Apr 12 2008, 09:09:16)
+ IPython 0.9.0 -- An enhanced Interactive Python.
+
+ Welcome to pylab, a matplotlib-based Python environment.
+ For more information, type 'help(pylab)'.
+
+ In [1]: x = randn(10000)
+
+ In [2]: hist(x, 100)
+
+it sets everything up for you so interactive plotting works as you
+would expect it to. Call :func:`~matplotlib.pyplot.figure` and a
+figure window pops up, call :func:`~matplotlib.pyplot.plot` and your
+data appears in the figure window.
+
+Note in the example above that we did not import any matplotlib names
+because in pylab mode, ipython will import them automatically.
+ipython also turns on *interactive* mode for you, which causes every
+pyplot command to trigger a figure update, and also provides a
+matplotlib aware ``run`` command to run matplotlib scripts
+efficiently. ipython will turn off interactive mode during a ``run``
+command, and then restore the interactive state at the end of the
+run so you can continue tweaking the figure manually.
+
+There has been a lot of recent work to embed ipython, with pylab
+support, into various GUI applications, so check on the ipython
+mailing `list
+<http://projects.scipy.org/mailman/listinfo/ipython-user>`_ for the
+latest status.
+
+.. _other-shells:
+
+Other python interpreters
+=========================
+
+If you can't use ipython, and still want to use matplotlib/pylab from
+an interactive python shell, eg the plain-ol standard python
+interactive interpreter, or the interpreter in your favorite IDE, you
+are going to need to understand what a matplotlib backend is
+:ref:`what-is-a-backend`.
+
+
+
+With the TkAgg backend, that uses the Tkinter user interface toolkit,
+you can use matplotlib from an arbitrary python shell. Just set your
+``backend : TkAgg`` and ``interactive : True`` in your
+:file:matplotlibrc file (see :ref:`customizing-matplotlib`) and fire
+up python. Then::
+
+ >>> from pylab import *
+ >>> plot([1,2,3])
+ >>> xlabel('hi mom')
+
+should work out of the box. Note, in batch mode, ie when making
+figures from scripts, interactive mode can be slow since it redraws
+the figure with each command. So you may want to think carefully
+before making this the default behavior.
+
+For other user interface toolkits and their corresponding matplotlib
+backends, the situation is complicated by the GUI mainloop which takes
+over the entire process. The solution is to run the GUI in a separate
+thread, and this is the tricky part that ipython solves for all the
+major toolkits that matplotlib supports. There are reports that
+upcoming versions of pygtk will place nicely with the standard python
+shell, so stay tuned.
+
+.. _controlling-interactive:
+
+Controlling interactive updating
+================================
+
+The *interactive* property of the pyplot interface controls whether a
+figure canvas is drawn on every pyplot command. If *interactive* is
+*False*, then the figure state is updated on every plot commands, but
+will only be drawn on explicit calls to
+:func:`~matplotlib.pyplot.draw`. When *interactive* is
+*True*, then every pyplot command triggers a draw.
+
+
+The pyplot interface provides 4 commands that are useful for
+interactive control.
+
+:func:`~matplotlib.pyplot.isinteractive`
+ returns the interactive setting *True|False*
+
+:func:`~matplotlib.pyplot.ion`
+ turns interactive mode on
+
+:func:`~matplotlib.pyplot.ioff`
+ turns interactive mode off
+
+:func:`~matplotlib.pyplot.draw`
+ forces a figure redraw
+
+When working with a big figure in which drawing is expensive, you may
+want to turn matplotlib's interactive setting off temporarily to avoid
+the performance hit::
+
+
+ >>> #create big-expensive-figure
+ >>> ioff() # turn updates off
+ >>> title('now how much would you pay?')
+ >>> xticklabels(fontsize=20, color='green')
+ >>> draw() # force a draw
+ >>> savefig('alldone', dpi=300)
+ >>> close()
+ >>> ion() # turn updating back on
+ >>> plot(rand(20), mfc='g', mec='r', ms=40, mew=4, ls='--', lw=3)
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 18:36:03
|
Revision: 6212
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6212&view=rev
Author: mdboom
Date: 2008-10-15 18:35:57 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Fix over-zealous caching in mathtext that causes one plot's font settings to affect the next. (This resulted in bold tick labels in log_demo.py when building the docs).
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/mathtext.py
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2008-10-15 17:54:38 UTC (rev 6211)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2008-10-15 18:35:57 UTC (rev 6212)
@@ -565,8 +565,6 @@
A generic base class for all font setups that use Truetype fonts
(through ft2font)
"""
- _fonts = {}
-
class CachedFont:
def __init__(self, font):
self.font = font
@@ -579,14 +577,13 @@
def __init__(self, default_font_prop, mathtext_backend):
Fonts.__init__(self, default_font_prop, mathtext_backend)
- self.glyphd = {}
+ self.glyphd = {}
+ self._fonts = {}
- if self._fonts == {}:
- filename = findfont(default_font_prop)
- default_font = self.CachedFont(FT2Font(str(filename)))
+ filename = findfont(default_font_prop)
+ default_font = self.CachedFont(FT2Font(str(filename)))
+ self._fonts['default'] = default_font
- self._fonts['default'] = default_font
-
def destroy(self):
self.glyphd = None
Fonts.destroy(self)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 18:23:54
|
Revision: 6210
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6210&view=rev
Author: mdboom
Date: 2008-10-15 17:54:03 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Fix some HTML errors found with xmllint.
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/_templates/indexsidebar.html
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2008-10-15 17:46:36 UTC (rev 6209)
+++ trunk/matplotlib/doc/_templates/index.html 2008-10-15 17:54:03 UTC (rev 6210)
@@ -1140,8 +1140,5 @@
</tr>
</table>
- </td>
- </tr>
-
</table>
{% endblock %}
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 17:46:36 UTC (rev 6209)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 17:54:03 UTC (rev 6210)
@@ -1,12 +1,12 @@
<h3>Download</h3>
<p>Current version: <b>{{ version }}</b></p>
<p>Download matplotlib from the sourceforge <a
-href="http://sourceforge.net/projects/matplotlib">project</a> page.
+href="http://sourceforge.net/projects/matplotlib">project</a> page.
-There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.
+There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>, the <a
+<p>Check the <a href="{{ pathto('contents') }}">docs</a>, the <a
href="{{ pathto('faq/index') }}">faq</a>, and join the matplotlib mailing <a
href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>
@@ -20,5 +20,5 @@
<a href="{{ pathto('users/screenshots') }}">screenshots</a> and <a href=examples>examples</a>
-
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 18:23:00
|
Revision: 6211
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6211&view=rev
Author: mdboom
Date: 2008-10-15 17:54:38 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Fix some HTML errors found with xmllint.
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2008-10-15 17:54:03 UTC (rev 6210)
+++ trunk/matplotlib/doc/_templates/index.html 2008-10-15 17:54:38 UTC (rev 6211)
@@ -1140,5 +1140,4 @@
</tr>
</table>
-</table>
{% endblock %}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 17:49:31
|
Revision: 6209
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6209&view=rev
Author: mdboom
Date: 2008-10-15 17:46:36 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Use small icon in documentation; large logo for home page only.
Update application icon to use new colors from website.
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/_templates/layout.html
trunk/matplotlib/examples/pylab_examples/matplotlib_icon.py
trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.png
trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.svg
Added Paths:
-----------
trunk/matplotlib/doc/_static/icon.png
Added: trunk/matplotlib/doc/_static/icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/_static/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2008-10-15 15:58:27 UTC (rev 6208)
+++ trunk/matplotlib/doc/_templates/index.html 2008-10-15 17:46:36 UTC (rev 6209)
@@ -1,5 +1,13 @@
{% extends "layout.html" %}
{% set title = 'Overview' %}
+
+{% block relbar1 %}
+<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
+<img src="{{ pathto("_static/logo2.png", 1) }}">
+</div>
+{{ super() }}
+{% endblock %}
+
{% block body %}
<h1>Welcome</h1>
@@ -22,10 +30,10 @@
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 handle graphics interface familiar to Matlab® users.
The plotting functions in the <a href=api/pyplot_api.html>pyplot</a>
- interface have a high degree of Matlab® compatibility.<p>
+ interface have a high degree of Matlab® compatibility.<p>
<br>
<table border=1 cellpadding=3 cellspacing=2>
Modified: trunk/matplotlib/doc/_templates/layout.html
===================================================================
--- trunk/matplotlib/doc/_templates/layout.html 2008-10-15 15:58:27 UTC (rev 6208)
+++ trunk/matplotlib/doc/_templates/layout.html 2008-10-15 17:46:36 UTC (rev 6209)
@@ -1,20 +1,15 @@
{% extends "!layout.html" %}
{% block rootrellink %}
- <li><a href="{{ pathto('index') }}">matplotlib home </a> | </li>
- <li><a href="{{ pathto('contents') }}">documentation </a> »</li>
+ <li><a href="{{ pathto('index') }}">
+ <img style="border: none; vertical-align: middle;" src="{{ pathto('_static/icon.png', 1) }}" width="16" height="16"/>
+ matplotlib home</a> | </li>
+ <li><a href="{{ pathto('contents') }}">documentation</a> »</li>
{% endblock %}
-{% block relbar1 %}
-<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
-<img src="{{ pathto("_static/logo2.png", 1) }}">
-</div>
-{{ super() }}
-{% endblock %}
-
{# put the sidebar before the body #}
{% block sidebar1 %}{{ sidebar() }}{% endblock %}
{% block sidebar2 %}{% endblock %}
-
\ No newline at end of file
+
Modified: trunk/matplotlib/examples/pylab_examples/matplotlib_icon.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/matplotlib_icon.py 2008-10-15 15:58:27 UTC (rev 6208)
+++ trunk/matplotlib/examples/pylab_examples/matplotlib_icon.py 2008-10-15 17:46:36 UTC (rev 6209)
@@ -3,19 +3,19 @@
make the matplotlib svg minimization icon
"""
import matplotlib
-matplotlib.use('SVG')
+#matplotlib.use('Svg')
from pylab import *
rc('grid', ls='-', lw=2, color='k')
fig = figure(figsize=(1, 1), dpi=72)
-axes([0.025, 0.025, 0.95, 0.95], axisbg='y')
+axes([0.025, 0.025, 0.95, 0.95], axisbg='#bfd1d4')
t = arange(0, 2, 0.05)
s = sin(2*pi*t)
-plot(t,s, linewidth=4)
+plot(t,s, linewidth=4, color="#ca7900")
axis([-.2, 2.2, -1.2, 1.2])
-grid(True)
+# grid(True)
setp(gca(), xticklabels=[], yticklabels=[])
-#savefig('../images/matplotlib.svg', facecolor='0.75')
+savefig('matplotlib.svg', facecolor='0.75')
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.svg
===================================================================
--- trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.svg 2008-10-15 15:58:27 UTC (rev 6208)
+++ trunk/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.svg 2008-10-15 17:46:36 UTC (rev 6209)
@@ -1,269 +1,76 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
x="0.0"
y="0.0"
width="72.000000"
- height="72.000000"
- id="svg1">
-<g id="figure1">
-<polygon
-style="stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: #bfbfbf; "
- points = "0.000000,72.000000 0.000000,0.000000 72.000000,0.000000 72.000000,72.000000" />
-<g id="axes1">
-<polygon
-style="stroke: #000000; stroke-width: 1.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: #bfbf00; "
- points = "1.800000,70.200000 1.800000,1.800000 70.200000,1.800000 70.200000,70.200000" />
-<g id="matplotlib.axis1">
-<g id="xtick1">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 7.500000,70.200000 L 7.500000,70.200000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 7.500000,70.200000 L 7.500000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 7.500000,70.200000 L 7.500000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 7.500000,1.800000 L 7.500000,1.800000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 7.500000,5.800000 L 7.500000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 7.500000,5.800000 L 7.500000,1.800000" />
-
-<defs>
- <clipPath id="375800226">
- <rect x="1.800000" y="1.800000" width="68.400000" height="68.400000"
- style="stroke: gray; fill: none;"/>
- </clipPath>
-</defs>
-
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 7.500000,70.200000 L 7.500000,1.800000 " />
-</g>
-<g id="xtick2">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 21.750000,70.200000 L 21.750000,70.200000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 21.750000,70.200000 L 21.750000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 21.750000,70.200000 L 21.750000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 21.750000,1.800000 L 21.750000,1.800000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 21.750000,5.800000 L 21.750000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 21.750000,5.800000 L 21.750000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 21.750000,70.200000 L 21.750000,1.800000 " />
-</g>
-<g id="xtick3">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 36.000000,70.200000 L 36.000000,70.200000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 36.000000,70.200000 L 36.000000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 36.000000,70.200000 L 36.000000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 36.000000,1.800000 L 36.000000,1.800000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 36.000000,5.800000 L 36.000000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 36.000000,5.800000 L 36.000000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 36.000000,70.200000 L 36.000000,1.800000 " />
-</g>
-<g id="xtick4">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 50.250000,70.200000 L 50.250000,70.200000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 50.250000,70.200000 L 50.250000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 50.250000,70.200000 L 50.250000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 50.250000,1.800000 L 50.250000,1.800000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 50.250000,5.800000 L 50.250000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 50.250000,5.800000 L 50.250000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 50.250000,70.200000 L 50.250000,1.800000 " />
-</g>
-<g id="xtick5">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 64.500000,70.200000 L 64.500000,70.200000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 64.500000,70.200000 L 64.500000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 64.500000,70.200000 L 64.500000,66.200000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 64.500000,1.800000 L 64.500000,1.800000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 64.500000,5.800000 L 64.500000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 64.500000,5.800000 L 64.500000,1.800000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 64.500000,70.200000 L 64.500000,1.800000 " />
-</g>
-</g>
-<g id="matplotlib.axis2">
-<g id="ytick1">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 1.800000,64.500000 L 1.800000,64.500000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,64.500000 L 5.800000,64.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,64.500000 L 5.800000,64.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 70.200000,64.500000 L 70.200000,64.500000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,64.500000 L 70.200000,64.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,64.500000 L 70.200000,64.500000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 1.800000,64.500000 L 70.200000,64.500000 " />
-</g>
-<g id="ytick2">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 1.800000,50.250000 L 1.800000,50.250000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,50.250000 L 5.800000,50.250000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,50.250000 L 5.800000,50.250000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 70.200000,50.250000 L 70.200000,50.250000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,50.250000 L 70.200000,50.250000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,50.250000 L 70.200000,50.250000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 1.800000,50.250000 L 70.200000,50.250000 " />
-</g>
-<g id="ytick3">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 1.800000,36.000000 L 1.800000,36.000000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,36.000000 L 5.800000,36.000000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,36.000000 L 5.800000,36.000000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 70.200000,36.000000 L 70.200000,36.000000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,36.000000 L 70.200000,36.000000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,36.000000 L 70.200000,36.000000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 1.800000,36.000000 L 70.200000,36.000000 " />
-</g>
-<g id="ytick4">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 1.800000,21.750000 L 1.800000,21.750000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,21.750000 L 5.800000,21.750000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,21.750000 L 5.800000,21.750000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 70.200000,21.750000 L 70.200000,21.750000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,21.750000 L 70.200000,21.750000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,21.750000 L 70.200000,21.750000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 1.800000,21.750000 L 70.200000,21.750000 " />
-</g>
-<g id="ytick5">
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 1.800000,7.500000 L 1.800000,7.500000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,7.500000 L 5.800000,7.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 1.800000,7.500000 L 5.800000,7.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; "
- d="M 70.200000,7.500000 L 70.200000,7.500000 " />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,7.500000 L 70.200000,7.500000" />
-<path
-style="stroke: #000000; stroke-width: 0.500000; stroke-linejoin: miter; stroke-linecap: butt; opacity: 1.000000; fill: none; "
- d="M 66.200000,7.500000 L 70.200000,7.500000" />
-<path
-style="stroke: #000000; stroke-width: 2.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 1.800000,7.500000 L 70.200000,7.500000 " />
-</g>
-</g>
-<path
-style="stroke: #0000ff; stroke-width: 4.000000; stroke-linejoin: miter; stroke-linecap: square; opacity: 1.000000; fill: none; clip-path:url(#375800226); "
- d="M 7.500000,36.000000 L 8.925000,27.193016 L 10.350000,19.248120 L 11.775000,12.943016 L 13.200000,8.894889 L 14.625000,7.500000 L 16.050000,8.894889 L 17.475000,12.943016 L 18.900000,19.248120 L 20.325000,27.193016 L 21.750000,36.000000 L 23.175000,44.806984 L 24.600000,52.751880 L 26.025000,59.056984 L 27.450000,63.105111 L 28.875000,64.500000 L 30.300000,63.105111 L 31.725000,59.056984 L 33.150000,52.751880 L 34.575000,44.806984 L 36.000000,36.000000 L 37.425000,27.193016 L 38.850000,19.248120 L 40.275000,12.943016 L 41.700000,8.894889 L 43.125000,7.500000 L 44.550000,8.894889 L 45.975000,12.943016 L 47.400000,19.248120 L 48.825000,27.193016 L 50.250000,36.000000 L 51.675000,44.806984 L 53.100000,52.751880 L 54.525000,59.056984 L 55.950000,63.105111 L 57.375000,64.500000 L 58.800000,63.105111 L 60.225000,59.056984 L 61.650000,52.751880 L 63.075000,44.806984 " />
-</g>
-</g>
+ height="72.000000"
+ id="svg1"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="matplotlib.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/wonkabar/data1/builds/matplotlib/lib/matplotlib/mpl-data/images/matplotlib.png"
+ inkscape:export-xdpi="78.900002"
+ inkscape:export-ydpi="78.900002">
+ <metadata
+ id="metadata2903">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs2901">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 36 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="72 : 36 : 1"
+ inkscape:persp3d-origin="36 : 24 : 1"
+ id="perspective2905" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="725"
+ inkscape:window-width="1250"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="6.4722222"
+ inkscape:cx="36"
+ inkscape:cy="36"
+ inkscape:window-x="411"
+ inkscape:window-y="278"
+ inkscape:current-layer="svg1" />
+ <polygon
+ id="polygon2736"
+ points="0,72 0,0 72,0 72,72 0,72 "
+ style="fill:#bfbfbf;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter" />
+ <polygon
+ style="fill:#bfd1d4;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;fill-opacity:1"
+ points="1.8,70.2 1.8,1.8 70.2,1.8 70.2,70.2 1.8,70.2 "
+ id="polygon2739" />
+ <path
+ style="fill:none;stroke:#ca7900;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 7.5,36 L 8.925,27.193016 L 10.35,19.24812 L 11.775,12.943016 L 13.2,8.894889 L 14.625,7.5 L 16.05,8.894889 L 17.475,12.943016 L 18.9,19.24812 L 20.325,27.193016 L 21.75,36 L 23.175,44.806984 L 24.6,52.75188 L 26.025,59.056984 L 27.45,63.105111 L 28.875,64.5 L 30.3,63.105111 L 31.725,59.056984 L 33.15,52.75188 L 34.575,44.806984 L 36,36 L 37.425,27.193016 L 38.85,19.24812 L 40.275,12.943016 L 41.7,8.894889 L 43.125,7.5 L 44.55,8.894889 L 45.975,12.943016 L 47.4,19.24812 L 48.825,27.193016 L 50.25,36 L 51.675,44.806984 L 53.1,52.75188 L 54.525,59.056984 L 55.95,63.105111 L 57.375,64.5 L 58.8,63.105111 L 60.225,59.056984 L 61.65,52.75188 L 63.075,44.806984"
+ id="path2898" />
</svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 16:50:04
|
Revision: 6205
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6205&view=rev
Author: jdh2358
Date: 2008-10-15 15:51:35 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
apllied michaels unicode fix
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:49:26 UTC (rev 6204)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:51:35 UTC (rev 6205)
@@ -50,6 +50,11 @@
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
#ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
+ ur'Generic symbol: $\u23ce$',
+ ]
+
+if sys.maxunicode > 0xffff:
+ stests.append('$\mathrm{\ue0f2 \U0001D538}$')
]
from pylab import *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 16:25:28
|
Revision: 6208
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6208&view=rev
Author: jdh2358
Date: 2008-10-15 15:58:27 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
added unicode flag
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:55:29 UTC (rev 6207)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:58:27 UTC (rev 6208)
@@ -53,7 +53,7 @@
]
if sys.maxunicode > 0xffff:
- stests.append('$\mathrm{\ue0f2 \U0001D538}$')
+ stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
from pylab import *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 15:58:15
|
Revision: 6207
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6207&view=rev
Author: mdboom
Date: 2008-10-15 15:55:29 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
[ 2165316 ] importing pylab overwrites x
[ 2163348 ] error in mathtext_examples.py
[ 2156924 ] Typo: Missing parenthesis
[ 2135925 ] API example barchart_demo.py small error
Modified Paths:
--------------
trunk/matplotlib/examples/api/barchart_demo.py
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
trunk/matplotlib/lib/matplotlib/pyplot.py
trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/examples/api/barchart_demo.py
===================================================================
--- trunk/matplotlib/examples/api/barchart_demo.py 2008-10-15 15:54:33 UTC (rev 6206)
+++ trunk/matplotlib/examples/api/barchart_demo.py 2008-10-15 15:55:29 UTC (rev 6207)
@@ -22,7 +22,8 @@
# add some
ax.set_ylabel('Scores')
ax.set_title('Scores by group and gender')
-ax.set_xticks(ind+width, ('G1', 'G2', 'G3', 'G4', 'G5') )
+ax.set_xticks(ind+width)
+ax.set_xticklabels( ('G1', 'G2', 'G3', 'G4', 'G5') )
ax.legend( (rects1[0], rects2[0]), ('Men', 'Women') )
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:54:33 UTC (rev 6206)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:55:29 UTC (rev 6207)
@@ -49,7 +49,6 @@
r'$\widehat{abc}\widetilde{def}$',
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
- #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
ur'Generic symbol: $\u23ce$',
]
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2008-10-15 15:54:33 UTC (rev 6206)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2008-10-15 15:55:29 UTC (rev 6207)
@@ -898,7 +898,7 @@
draw_if_interactive()
return ret
xscale.__doc__ = dedent(xscale.__doc__) % {
- 'scale': ' | '.join([repr(x) for x in get_scale_names()]),
+ 'scale': ' | '.join([repr(_x) for _x in get_scale_names()]),
'scale_docs': get_scale_docs()}
def yscale(*args, **kwargs):
@@ -918,7 +918,7 @@
draw_if_interactive()
return ret
yscale.__doc__ = dedent(yscale.__doc__) % {
- 'scale': ' | '.join([repr(x) for x in get_scale_names()]),
+ 'scale': ' | '.join([repr(_x) for _x in get_scale_names()]),
'scale_docs': get_scale_docs()}
def xticks(*args, **kwargs):
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py 2008-10-15 15:54:33 UTC (rev 6206)
+++ trunk/matplotlib/lib/matplotlib/ticker.py 2008-10-15 15:55:29 UTC (rev 6207)
@@ -25,7 +25,7 @@
* FixedLocator - Tick locations are fixed
- * IndexLocator - locator for index plots (eg where x = range(len(y))
+ * IndexLocator - locator for index plots (eg. where x = range(len(y)))
* LinearLocator - evenly spaced ticks from min to max
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 15:55:35
|
Revision: 6206
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6206&view=rev
Author: jdh2358
Date: 2008-10-15 15:54:33 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
fixed typo in mathtext introduced in last commit
Modified Paths:
--------------
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:51:35 UTC (rev 6205)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:54:33 UTC (rev 6206)
@@ -55,8 +55,8 @@
if sys.maxunicode > 0xffff:
stests.append('$\mathrm{\ue0f2 \U0001D538}$')
- ]
+
from pylab import *
def doall():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 15:52:13
|
Revision: 6204
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6204&view=rev
Author: jdh2358
Date: 2008-10-15 15:49:26 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
updates to the sidebar, misc fixes
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/_templates/layout.html
trunk/matplotlib/doc/faq/installing_faq.rst
trunk/matplotlib/doc/users/screenshots.rst
trunk/matplotlib/doc/users/toolkits.rst
trunk/matplotlib/examples/misc/longshort.py
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 15:49:26 UTC (rev 6204)
@@ -1,21 +1,24 @@
<h3>Download</h3>
<p>Current version: <b>{{ version }}</b></p>
-<p>Get matplotlib from the sourceforge <a
-href="http://sourceforge.net/projects/matplotlib">download</a> page
+<p>Download matplotlib from the sourceforge <a
+href="http://sourceforge.net/projects/matplotlib">project</a> page.
+There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a> for matplotlib.
+
<h3>Need help?</h3>
-<p>Join the matplotlib <a
-href="http://sourceforge.net/project/showfiles.php?group_id=80706">mailing lists</a>
+<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>, the <a
+href="{{ pathto('faq/index') }}">faq</a>, and join the matplotlib mailing <a
+href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>
-<p>You can file bugs and patches on the sourceforge <a href="http://sourceforge.net/tracker/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
+<p>You can file bugs, patches and feature requests on the sourceforge <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
<h3>Screenshots</h3>
<a href="{{ pathto('users/screenshots') }}"><img align=center src="{{
-pathto("_static/logo_sidebar.png", 1) }}"></a>
+pathto('_static/logo_sidebar.png', 1) }}"></a>
<a href="{{ pathto('users/screenshots') }}">screenshots</a> and <a href=examples>examples</a>
+
-
Modified: trunk/matplotlib/doc/_templates/layout.html
===================================================================
--- trunk/matplotlib/doc/_templates/layout.html 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/doc/_templates/layout.html 2008-10-15 15:49:26 UTC (rev 6204)
@@ -17,3 +17,4 @@
{% block sidebar2 %}{% endblock %}
+
\ No newline at end of file
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2008-10-15 15:49:26 UTC (rev 6204)
@@ -90,6 +90,20 @@
<locating-matplotlib-install>`
+.. _install_svn:
+
+How to install from svn
+=======================
+
+Checking out the main source::
+
+ svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk matplotlib
+
+and build and install as usual with::
+
+ > cd matplotlib
+ > python setup.py install
+
Backends
========
Modified: trunk/matplotlib/doc/users/screenshots.rst
===================================================================
--- trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 15:49:26 UTC (rev 6204)
@@ -158,13 +158,14 @@
================
You can make much more sophisticated financial plots. This example
-emulates one of the `ChartDirector <http://www.advsofteng.com/gallery_finance.html>`
-financial plots. Some of the data in the plot, are real financial
-data, some are random traces that I used since the goal was to
-illustrate plotting techniques, not market analysis!
+emulates one of the `ChartDirector
+<http://www.advsofteng.com/gallery_finance.html>` financial plots.
+Some of the data in the plot, are real financial data, some are random
+traces that I used since the goal was to illustrate plotting
+techniques, not market analysis!
-plot:: ../mpl_examples/pylab_examples/finance_work2.py
+.. plot:: ../mpl_examples/pylab_examples/finance_work2.py
.. _screenshots_basemap_demo:
@@ -178,7 +179,7 @@
proj4 library: cylindrical equidistant, mercator, lambert conformal
conic, lambert azimuthal equal area, albers equal area conic and
stereographic. See the `tutorial
-<http://www.scipy.org/wikis/topical_software/Maps>` entry on the wiki.
+<http://www.scipy.org/wikis/topical_software/Maps>`_ entry on the wiki.
.. plot:: plotmap.py
@@ -197,7 +198,7 @@
-plot:: ../mpl_examples/pylab_examples/log_demo.py
+.. plot:: ../mpl_examples/pylab_examples/log_demo.py
.. _screenshots_polar_demo:
@@ -206,7 +207,7 @@
The :func:`~matplotlib.pyplot.polar` command generates polar plots.
-plot:: ../mpl_examples/pylab_examples/polar_demo.py
+.. plot:: ../mpl_examples/pylab_examples/polar_demo.py
.. _screenshots_legend_demo:
@@ -218,7 +219,7 @@
commands. Thanks to Charles Twardy for input on the legend
command
-plot:: ../mpl_examples/pylab_examples/legend_demo.py
+.. plot:: ../mpl_examples/pylab_examples/legend_demo.py
.. _screenshots_mathtext_examples_demo:
@@ -231,9 +232,9 @@
modern or STIX fonts. See the matplotlib.mathtext module for
additional. matplotlib mathtext is an independent implementation, and
does not required TeX or any external packages installed on your
-computer.
+computer.
-plot:: ../mpl_examples/pylab_examples/mathtext_examples.py
+.. plot:: ../mpl_examples/pylab_examples/mathtext_examples.py
.. _screenshots_tex_demo:
@@ -242,9 +243,9 @@
Although matplotlib's internal math rendering engine is quite
powerful, sometimes you need TeX, and matplotlib supports external TeX
-rendering of strings with the *usetex* option.
+rendering of strings with the *usetex* option.
-plot:: tex_demo.py
+.. plot:: tex_demo.py
.. _screenshots_eeg_demo:
Modified: trunk/matplotlib/doc/users/toolkits.rst
===================================================================
--- trunk/matplotlib/doc/users/toolkits.rst 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/doc/users/toolkits.rst 2008-10-15 15:49:26 UTC (rev 6204)
@@ -12,20 +12,25 @@
=======
Plots data on map projections, with continental and political
-boundaries, `see <http://matplotlib.sf.net/basemap/doc/html>`
+boundaries, `see <http://matplotlib.sf.net/basemap/doc/html>`_
.. _toolkit_gtk:
GTK Tools
=========
-mpl_toolkits.gtktools provides some utilities for working with GTK. This toolkit ships with matplotlib, but requires `pygtk <http://www.pygtk.org/>`.
+mpl_toolkits.gtktools provides some utilities for working with GTK.
+This toolkit ships with matplotlib, but requires `pygtk
+<http://www.pygtk.org/>`_.
+
.. _toolkit_excel:
Excel Tools
===========
-mpl_toolkits.exceltools provides some utilities for working with Excel. This toolkit ships with matplotlib, but requires `pyExcelerator <http://sourceforge.net/projects/pyexcelerator>`
+mpl_toolkits.exceltools provides some utilities for working with
+Excel. This toolkit ships with matplotlib, but requires
+`pyExcelerator <http://sourceforge.net/projects/pyexcelerator>`_
.. _toolkit_natgrid:
@@ -35,6 +40,6 @@
mpl_toolkits.natgrid is an interface to natgrid C library for gridding
irregularly spaced data. This requires a separate installation of the
natgrid toolkit from the sourceforge `download
-<http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792>`
+<http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792>`_
page.
Modified: trunk/matplotlib/examples/misc/longshort.py
===================================================================
--- trunk/matplotlib/examples/misc/longshort.py 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/examples/misc/longshort.py 2008-10-15 15:49:26 UTC (rev 6204)
@@ -41,7 +41,7 @@
fig = plt.figure()
ax = fig.add_subplot(111)
ax.plot(r.date, tr)
-ax.set_title('total return: long appl, short goog')
+ax.set_title('total return: long APPL, short GOOG')
ax.grid()
fig.autofmt_xdate()
plt.show()
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:39:44 UTC (rev 6203)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-10-15 15:49:26 UTC (rev 6204)
@@ -49,7 +49,7 @@
r'$\widehat{abc}\widetilde{def}$',
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
- ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
+ #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
]
from pylab import *
@@ -66,7 +66,7 @@
print (i, s)
text(0.1, -i, s, fontsize=20)
- savefig('mathtext_examples')
+ #savefig('mathtext_examples')
#close('all')
show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 15:42:30
|
Revision: 6203
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6203&view=rev
Author: jdh2358
Date: 2008-10-15 15:39:44 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
more screenshot updates
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/devel/documenting_mpl.rst
trunk/matplotlib/doc/pyplots/plotmap.hires.png
trunk/matplotlib/doc/pyplots/plotmap.pdf
trunk/matplotlib/doc/pyplots/plotmap.png
trunk/matplotlib/doc/pyplots/plotmap.py
trunk/matplotlib/doc/users/screenshots.rst
trunk/matplotlib/examples/api/date_demo.py
trunk/matplotlib/examples/pylab_examples/finance_work2.py
trunk/matplotlib/examples/pylab_examples/log_demo.py
trunk/matplotlib/examples/pylab_examples/scatter_demo2.py
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/setup.py
Added Paths:
-----------
trunk/matplotlib/doc/_static/eeg_large.png
trunk/matplotlib/doc/_static/eeg_small.png
trunk/matplotlib/examples/pylab_examples/usetex_demo.py
trunk/matplotlib/lib/matplotlib/mpl-data/example/
trunk/matplotlib/lib/matplotlib/mpl-data/example/aapl.npy
trunk/matplotlib/lib/matplotlib/mpl-data/example/goog.npy
trunk/matplotlib/lib/matplotlib/mpl-data/example/msft_nasdaq.npy
Added: trunk/matplotlib/doc/_static/eeg_large.png
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/_static/eeg_large.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/matplotlib/doc/_static/eeg_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/_static/eeg_small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2008-10-15 12:43:41 UTC (rev 6202)
+++ trunk/matplotlib/doc/_templates/index.html 2008-10-15 15:39:44 UTC (rev 6203)
@@ -22,12 +22,10 @@
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. A
- summary of the goals of matplotlib and the progress so far can be
- found <a href=goals.html>here</a>.<p>
+ or via a handle graphics interface familiar to matlab users.
- The plotting functions in the <a href=api/pyplot_api.html>pyplot
- interface</a> have a high degree of Matlab® compatibility.<p>
+ The plotting functions in the <a href=api/pyplot_api.html>pyplot</a>
+ interface have a high degree of Matlab® compatibility.<p>
<br>
<table border=1 cellpadding=3 cellspacing=2>
Modified: trunk/matplotlib/doc/devel/documenting_mpl.rst
===================================================================
--- trunk/matplotlib/doc/devel/documenting_mpl.rst 2008-10-15 12:43:41 UTC (rev 6202)
+++ trunk/matplotlib/doc/devel/documenting_mpl.rst 2008-10-15 15:39:44 UTC (rev 6203)
@@ -229,6 +229,26 @@
in mpl and let it handle the scaling. ``:include-source:`` will
present the contents of the file, marked up as source code.
+You can also point to local files with relative path. Use the
+sym-link for mpl_examples in case we do a reorganization of the doc
+directory at some point, eg::
+
+ .. plot:: ../mpl_examples/pylab_examples/simple_plot.py
+
+If the example file needs to access data, it is easy to get screwed up
+with relative paths since the python example may be run from a diffent
+location in the plot directive build framework. To work around this,
+you can add your example data to mpl-data/example and refer to it in
+the example file like so::
+
+ import matplotlib
+ # datafile is a file object
+ datafile = matplotlib.get_example_data('goog.npy')
+ r = np.load(datafile).view(np.recarray)
+
+Try to keep the example datafiles relatively few and relatively small
+to control the size of the binaries we ship.
+
Static figures
--------------
Modified: trunk/matplotlib/doc/pyplots/plotmap.hires.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/doc/pyplots/plotmap.pdf
===================================================================
--- trunk/matplotlib/doc/pyplots/plotmap.pdf 2008-10-15 12:43:41 UTC (rev 6202)
+++ trunk/matplotlib/doc/pyplots/plotmap.pdf 2008-10-15 15:39:44 UTC (rev 6203)
@@ -4,7 +4,7 @@
<< /Type /Catalog /Pages 3 0 R >>
endobj
2 0 obj
-<< /CreationDate (D:20081015040257-07'00')
+<< /CreationDate (D:20081015060838-07'00')
/Producer (matplotlib pdf backend)
/Creator (matplotlib 0.98.3, http://matplotlib.sf.net) >>
endobj
@@ -13,7 +13,7 @@
endobj
4 0 obj
<< /Contents 5 0 R /Type /Page /Resources 10 0 R /Parent 3 0 R
-/MediaBox [ 0 0 576 576 ] >>
+/MediaBox [ 0 0 432 432 ] >>
endobj
10 0 obj
<< /Pattern 8 0 R /XObject 9 0 R /Font 6 0 R /ExtGState 7 0 R
@@ -22,12315 +22,12403 @@
5 0 obj
<< /Filter /FlateDecode /Length 11 0 R >>
stream
-x\x9C\x9C\xBDK\xD2m\xD9r\x95Y߭\xF8[\xF03ߏ*\x865\x8C
-\xC02\xB3"\x81A\x85\xEE3\xBE\xE1>\xF7\xB9R8~|\xAF\xB5\xE6\xC3\xDF>\xBC\xFD\xFCǟ\xFA\xF3\xFF\xE9\xBF\xFF\xFES~\xCA\xCF?\xFF̽\xF4\xFF\xC9\xFF\x97\xFF\xFE\x93\xFE\xED\xFD_\xFD\xF9\xE7\xDF\xEA\xEF\xFD/\xFD\xFF\xFE3\xF7\xEF\xFA\xB9\xF7w\xAD\xB9FY\xA5\xB1\x8FU~Ͽ\xFA\xD3\xCA?\xF5\xFC\xEE>\xFA\xBC\xFD\xDE\xE5g\xFC\xAE\xCF\xDF\xFE\xE9\xBF\xFE\x85\xCF\xFF\xFB\xF9G\xA5\xFF\xB6\x9F^\xEFoYg׳\xEF\xED?\xFF\xF3\xFF\xF9\xF9/?\xFFM\xEFȷ\xFD/1\xFDM7}\xCB\xF9\xA9\xA5\xFC\xFC\xD7\xFE\xF97\xFF\xA1\xFE\xFC\xBB\xFF\xFE\xF3\x9F>\xFF\xE9\xE7\xFF\xEFo{\xEA\xD4\xDF+}\xB7\xB3\xF5\x9F\xF8\xCAVw\xDF뜥%\xA9\xB3\xFD\xDE=V;\xFA\xC7\xE4\xDAZ[\x87_\xC1^\xCF-\xABk\xAA\xE8\xFB\xB7\xEF1\xCF8\xB3\xB1vu\xD6\xDFQ\xEF\xD0#\xCEf\xF4\xBB\x{126DDA}\xBF\xFD\xAE2z\xD7\xFB\xFA\xF7\xD7\xEF>k\xEAO\xDA
-\xFE\xFE[f\xDDsU\xFD\x8A\xE9\xE3\x9C~\xE7\xACc$\xEF\xFAL\xFD\x95\xBEM\xAF\xB3\xCCsg\xF6\xF1[k\xE7\x91{\xF0\xF8\xF9\xAB\xF7X瞦\x85}\xFC\x9E2ʞg\xF1\xF4\xFE;ǘ\xAD\xB6ڗ\xD9\xF5\xF7W\x99S\xEFW\xA7\xE9\xE5\xB6vƮ\xA3&\xFB]Z\xBDy\xD7\xE9\xA27=m
-\xADe\xE95\xF9W\xD3ה\xF4\xF2\xCBJԪw\xEC柿g\x94\xD2[_Mo_\xB4\xF8W\x8F.\xE3\xF4f\xFE\xFD\xAB\x93UwٵO\xD3\xF52K\xAFP\xFA5\xFF\xFE\x89_<C\xBF_\xD6\xEF=s5}\xED=\xF9\xFCS\xB5wz\xAB+\xBAV\xB9\xE8\x81\xE2\xC8\xE7\xDFq\xDBlm\xD6\xC3I\xFB\xDD\xF5\x9ER\xB4\xB9z\xB7k\xBD\xDBЧ\xF9H\x9D£K\xDD7\xD9\xF52{\xFD*GNG\xA5V}\x8F^p\xE4㧎\xC6ik\x9Fi\xFA\\xB3^\xB4\xBB\x93k\x9F\xCBXw]ӏnQ/\xFA\x80\xF8\xFC\xF5\xDBZ?}\x9Dv\xBB\xE9\xEB\x8Cq\xFB\xE4\xE7r\xF9\xEEe\xC5{>\xBF/\xBD\xFFs>\xF61t0X\xCF`_Kk\xB9\x97\xBEv-WmZ\xF1;9\xFA\xA2\x8F58Z\x8E\}\xADU9\xFA\xD7||mǻ\x99gO\xFC\xAB\xF5\xDAʝ-\xF8\xDB҉/\xBAA\xE6?z`\xAB\x92[\xC7\xC9˷t\x83*\xF7\xC9\xFCG\xECzA=\xBEy\xF5u)f_W\x95\xFCWgW\xE8s\x99\xAE\xF7\xBFu\x9Cu\xE3\xFD\xAF\xB6S\xBF\xB6Σ靗\xABM\xE7~\xC9-mg9\xE2\xEE\xBC\xFF\xFC-z}\xDD\xEEǯ\xAA߫m\xAC\xC9\xFB\x8ERo\xD1>s\xC0\xBC{\xA26[\x87\xB0<\x92\x82\xDA]\x84\xBB{\xF27\xBDnё\x9F=\xE8wkOj?\xC9>\x9B\xF6\xEE\xF6s\xAEɺds\xFD\xFBMv\x9D\xA6vu[\xEE\xF6\xE3\x8B~\xB8\x8E\x9F\xF9ۯ~\xFA\\x9D\x98\xFC\xDA\xEA}{\xD9e&\xFF\xD6rhkˊ\xD7㢜;\xE2\xE6\x8B]\xB5\xEB\xF8\xCF|\xBBz$\xB6\xB6\xCEo\xB0k\xB7\xCA:\xAF]wQ\xD2\xFBW\x8C\x85\xD5\xE8\xDE\xFC%\xC1vu+Ĥ\xD7\xEB\xF7\xFC\xEA\x8Eܡ՞;\xF9\x8F\xEE\xAE>\xB0\x99\xAAEԧH\xD0\xD6|\xBA\x83Vz\xEB\xA2A\x96\x90ں\xF4\xAB\xDD\xFCq\xBD{\xD3\xE6\xEDS?\xFDnI\xB5+\xF6"\xB1\x98\xF4\xA9e\x9AW\xAFįs\xDEtϺ\xB64~^bm\xB3\xF1\x88:\xF1K.IN\xC6y\xF4>X\xABv\xA7\xF8\xB5\xA3I4ܹy\x96\x86\x8C\xF3yq0Ξ\xE3}\xFB\x99\;\xBD\xBE\xB99\xA3\xFA\xEB{<\xEER\xCB\xD2\xFF\x9A\xC1]\xAC0$\xC4\xB7\xDET\xFFrZge%\xF48\x84\xFA\xEFُ\xAD\xBA;\x8D\x97]\x8B\xAC\x9Fh\x8FZ\xF6-e\xEAj
-\xA4$`\xA6.\xCA{u\xAE\xE4\xF7Π\xEBp\xA2\xF5\x93\x9F`\xD7)ns\x9Ddѵ1:\xF0\xBA \x92\xF9\xF3\xBA\x83\xFA9km둀\xD5_\x90\x94\xD1jy[\xF5\xE9C7@\xF2vo\xF3\xF7~ur\xF4}5\xF9%1\xA4=t\xE5\x9B\xF9\xB74\xA3\xDE\xC7\xDF\xFC\xE8\x9B%A\xA0c\xBD\xE8etۗ_
-FGMb~\xED\xEC֦mI\xA9\xFB\xF8o\xE3`J\x8D\x99.Uڥ\xA3\xB8y2Xw\xBD\xD5Z\xA6\xB7&\x81\xB2Ϊ;\xF9\xF5m:Ke\x99.\xFD\xD66"cͷ9: \xD2I:\x9A\xF1\xFBz\xF16tҾ\xEF_XKm\xF00\xBB\xC43\xCAr\xCE\xF3\xD8u,\xB8r3\xE9}\xEA\xED\xA5\xDF\xE3u0\x8F\xCC IVѵ\x92\xCDR潞\xBCR\x8E\xFA\xF6\xAA%\xBA\xEF\xEAo\xAF\xF5^\xBF\xEAN\xCC\x9F\xDF\xE02^\xB4\xDD\xDF\xD7\xD7
-]\xD2\xD3\xF1\xFB\xFA\xFF$\xF5\xB43\xF9\xD18:N\x8D{y\xAA^\xA7k\xF3\xF6\x9D\xEB=\xBFaKl鐟\xBE/Bi \xA2\xBDS\xA8\\xA9iY\x83\xED]\xDF.\xA47\xD9)R/?\xA0+)\x99\xD97
-YK!\xA5p\xE3\xFD%\xE5\x96v\xB7n\x9D\xD3;\xA7K\xFA\xF0\xAE\xE4G*\xE9=u[E\xDF2\xAE$\xB1\xCB\xD9aP\xC0/&A2r\xD3/K;h˭\xAET\xB6\xCF}\xC9^Aݵ\xB9N\xB2/,\xB9\x82\xCA4]\xEF&\xC3Hr\xE9=^\xA7\xA9\x95\xA9\xAC\xA6K-\xC0P("cNT\x87\xC5\xDBMD\xAEԗl\xB3\xF3\xCFf\xC9\xEDj\xBA\x8EE[\xA8\xCF'\x92\x8B$\x9C\xCE:\xCB\xC9\xCF\xCB\xEC\x90\xF2*ߵC\xD3i\x81g|\x9CD\xB1\xEC \xAD\xD5WI\xC0ol\xC3xyifta\xE9O!\xE8\xCE\xE9m\xE79f\x97)\x836\xBFO\x9E\xEBKw\xE8\xAF7\xAF\xBC\xC9\xD0/\xF4\xB6\xF2\xE4t\xC90\xDD#\x9D&\xB3뫵6Z\xFDx\xBAn\x8A\x94\xBF\xE4\xDC\xE5bo\x99B\x92\xF4W\xA6I(c\xD1%tt7\xEA\xBA>K'\xC7\xF7\xD2\xEC\xDA\xAD\xAC\xD6NTT}\xB3\xAE\xECO`\xEB\xB0\xB4Q\xE82\xC2\xF4k[\x879ٻ\x84\x92.=\xA6\x82Į\xF4\x95X\x90L\xEDO\xE6J\xEBe\xEA\xE0\xE9hv}.\xA6JK~\x9D\x93\xC9\xD58\xDDt\xD9<\xB2\xDAnOjv>\xBDxi\x97\xA4\xAAT\xD1\xF2)I\xA1'˭UI\xEC\xF8um\x866\xA6q\x88c\xED\x8AT_\xC78\xBC\xA6co]\xE39r\xEDWY2\x9E\xF4\xEB\xD3t\xA4\x93\xDEm\xA4\xBE\x91\xAA\x97 "\xD3T\xAF\x9F\x8F\xFAm\xD9:5w~H\xC8\xC9T\xD2ُ\xAF\x93!"\xF9\x84\xA6L \x99*\xFA\xB6\xEB[\xAB\xBF.A\xE1\xCEwku\xA8\xF7A\xF3\xEB\x9C \xF1zjc\x8E\xBD>PT\xA4\x8E\x9E\xAF\xF3\xAD\xE3\xA1c\xFDνLd}\xD2\xC4\xCE\xF4\xF7Ih\xEB\xCEI\x93乗!K\xB5Y\xAA\xE9\xF9=\xD4[==\xF9\xA5%G'\xC6\xFC\xF2xz\x91F\x9D\xF5\xF1\xA3b\xC7\xFC#vc\xFB\xBC{\xB7dZ@\xD6W
-W.\x91\x87\x9E\x9A\xFCCϒ1\xA0#\xE2ӣ-\xD1\xEBtX\x82Z
-\xED\xCF\xF0\xF2H\xDBK\x80\xEA;6vb+\x92\xE8\xE0X\xBE\x8E\x88\xAD\xFC\xF5`\x91\x921_\x87\xFA\xD1\xDFX'\xCDPm\x97\xA4\9+VW\x8A\/#[\xE9\xA4\x8BƓE\xC1{\xF5%\xBC%\xD6i\x86K\xC8\xE8v,\xCCX\xAFΔH\x97~lόk\xFB\xEF\xC8\xFAX\xD2\xE1ɿ1\xCD\xF4\x93\xA5\xC6隨\xAD\xC0zN\xCC\xE5ާL\xC6ސ\xFC։;\xFD\xB9\xDAh\xDDLI\x9A8ݺ\xB5r1k\xBE\xBFt\xB0NZY^N\xD3u\xBCu~S\xE7\xC0/\xFDpe^\xE5\xE9\xD2\xCEV|\xD2\xFE\xDE_I\xCB'\xD9q|\xBA\xBAn\x9E\xBEW_\xF9\xBE_\xBB_\x86^_\xBF\xBF\xE4\xE8\xD3\xEFn\xED91KF\x94TV\x9Fq7+*CV\xFB\x99χ\xDB:L
-\xA3\xEA\xDD]\xA9\xAE\xD3\xE3\xD7osz\xE2\xE9\xDAw\xC9_XkR\xE3\xE7\xB7 |
|
From: <jd...@us...> - 2008-10-15 12:43:57
|
Revision: 6202
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6202&view=rev
Author: jdh2358
Date: 2008-10-15 12:43:41 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
example updates
Modified Paths:
--------------
trunk/matplotlib/examples/api/date_demo.py
trunk/matplotlib/examples/data/aapl.csv
trunk/matplotlib/examples/pylab_examples/pie_demo.py
trunk/matplotlib/examples/pylab_examples/scatter_demo2.py
trunk/matplotlib/examples/pylab_examples/simple_plot.py
trunk/matplotlib/examples/pylab_examples/subplot_demo.py
trunk/matplotlib/examples/pylab_examples/table_demo.py
trunk/matplotlib/setup.py
Added Paths:
-----------
trunk/matplotlib/examples/data/goog.csv
trunk/matplotlib/examples/data/msft_nasdaq_d.csv
trunk/matplotlib/examples/pylab_examples/finance_work2.py
Modified: trunk/matplotlib/examples/api/date_demo.py
===================================================================
--- trunk/matplotlib/examples/api/date_demo.py 2008-10-15 12:35:23 UTC (rev 6201)
+++ trunk/matplotlib/examples/api/date_demo.py 2008-10-15 12:43:41 UTC (rev 6202)
@@ -1,14 +1,47 @@
+#!/usr/bin/env python
"""
-Simple example showing how to plot a time series with datetime objects
+Show how to make date plots in matplotlib using date tick locators and
+formatters. See major_minor_demo1.py for more information on
+controlling major and minor ticks
+
+All matplotlib date plotting is done by converting date instances into
+days since the 0001-01-01 UTC. The conversion, tick locating and
+formatting is done behind the scenes so this is most transparent to
+you. The dates module provides several converter functions date2num
+and num2date
+
"""
+
import datetime
import matplotlib.pyplot as plt
+import matplotlib.dates as mdates
+import matplotlib.mlab as mlab
-today = datetime.date.today()
-dates = [today+datetime.timedelta(days=i) for i in range(10)]
+years = mdates.YearLocator() # every year
+months = mdates.MonthLocator() # every month
+yearsFmt = mdates.DateFormatter('%Y')
+r = mlab.csv2rec('../data/goog.csv')
+r.sort()
+
fig = plt.figure()
ax = fig.add_subplot(111)
-ax.plot(dates, range(10))
+ax.plot(r.date, r.adj_close)
+
+# format the ticks
+ax.xaxis.set_major_locator(years)
+ax.xaxis.set_major_formatter(yearsFmt)
+ax.xaxis.set_minor_locator(months)
+ax.autoscale_view()
+
+# format the coords message box
+def price(x): return '$%1.2f'%x
+ax.format_xdata = mdates.DateFormatter('%Y-%m-%d')
+ax.format_ydata = price
+ax.grid(True)
+
+# rotates and right aligns the x labels, and moves the bottom of the
+# axes up to make room for them
fig.autofmt_xdate()
+
plt.show()
Modified: trunk/matplotlib/examples/data/aapl.csv
===================================================================
--- trunk/matplotlib/examples/data/aapl.csv 2008-10-15 12:35:23 UTC (rev 6201)
+++ trunk/matplotlib/examples/data/aapl.csv 2008-10-15 12:43:41 UTC (rev 6202)
@@ -1,64 +1,231 @@
Date,Open,High,Low,Close,Volume,Adj Close
-2008-02-15,126.27,127.08,124.06,124.63,32163400,124.63
+2008-10-14,116.26,116.40,103.14,104.08,70749800,104.08
+2008-10-13,104.55,110.53,101.02,110.26,54967000,110.26
+2008-10-10,85.70,100.00,85.00,96.80,79260700,96.80
+2008-10-09,93.35,95.80,86.60,88.74,57763700,88.74
+2008-10-08,85.91,96.33,85.68,89.79,78847900,89.79
+2008-10-07,100.48,101.50,88.95,89.16,67099000,89.16
+2008-10-06,91.96,98.78,87.54,98.14,75264900,98.14
+2008-10-03,104.00,106.50,94.65,97.07,81942800,97.07
+2008-10-02,108.01,108.79,100.00,100.10,57477300,100.10
+2008-10-01,111.92,112.36,107.39,109.12,46303000,109.12
+2008-09-30,108.25,115.00,106.30,113.66,58095800,113.66
+2008-09-29,119.62,119.68,100.59,105.26,93581400,105.26
+2008-09-26,124.91,129.80,123.00,128.24,40208700,128.24
+2008-09-25,129.80,134.79,128.52,131.93,35865600,131.93
+2008-09-24,127.27,130.95,125.15,128.71,37393400,128.71
+2008-09-23,131.85,135.80,126.66,126.84,45727300,126.84
+2008-09-22,139.94,140.25,130.66,131.05,30577300,131.05
+2008-09-19,142.60,144.20,136.31,140.91,51102700,140.91
+2008-09-18,130.57,135.43,120.68,134.09,59819300,134.09
+2008-09-17,138.49,138.51,127.83,127.83,42847200,127.83
+2008-09-16,133.86,142.50,132.15,139.88,42804800,139.88
+2008-09-15,142.03,147.69,140.36,140.36,32852600,140.36
+2008-09-12,150.91,150.91,146.50,148.94,28322400,148.94
+2008-09-11,148.18,152.99,146.00,152.65,34666800,152.65
+2008-09-10,152.32,154.99,148.80,151.61,34755100,151.61
+2008-09-09,156.86,159.96,149.79,151.68,44442500,151.68
+2008-09-08,164.57,164.89,151.46,157.92,37356400,157.92
+2008-09-05,158.59,162.40,157.65,160.18,28083800,160.18
+2008-09-04,165.86,167.91,160.81,161.22,26549500,161.22
+2008-09-03,166.84,168.68,164.00,166.96,26244100,166.96
+2008-09-02,172.40,173.50,165.00,166.19,27884400,166.19
+2008-08-29,172.96,173.50,169.04,169.53,21403200,169.53
+2008-08-28,175.28,176.25,172.75,173.74,15394500,173.74
+2008-08-27,173.31,175.76,172.19,174.67,17045900,174.67
+2008-08-26,172.76,174.88,172.61,173.64,15912500,173.64
+2008-08-25,176.15,176.23,171.66,172.55,17300900,172.55
+2008-08-22,175.82,177.50,175.57,176.79,15700400,176.79
+2008-08-21,174.47,175.45,171.89,174.29,19276600,174.29
+2008-08-20,174.77,176.94,173.61,175.84,18105400,175.84
+2008-08-19,174.54,177.07,171.81,173.53,21997000,173.53
+2008-08-18,175.57,177.81,173.82,175.39,19691200,175.39
+2008-08-15,179.04,179.75,175.05,175.74,25294700,175.74
+2008-08-14,178.33,180.45,177.84,179.32,25393200,179.32
+2008-08-13,177.98,180.00,175.90,179.30,30083800,179.30
+2008-08-12,173.52,179.29,173.51,176.73,29867100,176.73
+2008-08-11,170.07,176.50,169.67,173.56,31821100,173.56
+2008-08-08,163.86,169.65,163.75,169.55,25499900,169.55
+2008-08-07,162.71,166.15,161.50,163.57,24013300,163.57
+2008-08-06,159.97,167.40,158.00,164.19,28264600,164.19
+2008-08-05,155.42,160.80,154.82,160.64,24584700,160.64
+2008-08-04,156.60,157.90,152.91,153.23,21161700,153.23
+2008-08-01,159.90,159.99,155.75,156.66,19451400,156.66
+2008-07-31,157.54,162.20,156.98,158.95,22767800,158.95
+2008-07-30,157.78,160.49,156.08,159.88,25899400,159.88
+2008-07-29,155.41,159.45,153.65,157.08,24431100,157.08
+2008-07-28,162.34,162.47,154.02,154.40,27882600,154.40
+2008-07-25,160.40,163.00,158.65,162.12,22629900,162.12
+2008-07-24,164.32,165.26,158.45,159.03,29986400,159.03
+2008-07-23,164.99,168.37,161.56,166.26,37920300,166.26
+2008-07-22,149.00,162.76,146.53,162.02,67128300,162.02
+2008-07-21,166.90,167.50,161.12,166.29,48588200,166.29
+2008-07-18,168.52,169.65,165.00,165.15,31014800,165.15
+2008-07-17,174.10,174.98,171.39,171.81,27054500,171.81
+2008-07-16,170.20,172.93,168.60,172.81,26706800,172.81
+2008-07-15,172.48,173.74,166.39,169.64,37144400,169.64
+2008-07-14,179.24,179.30,173.08,173.88,31644800,173.88
+2008-07-11,175.47,177.11,171.00,172.58,33214700,172.58
+2008-07-10,174.92,177.34,171.37,176.63,30024600,176.63
+2008-07-09,180.20,180.91,174.14,174.25,31992000,174.25
+2008-07-08,175.40,179.70,172.74,179.55,31726800,179.55
+2008-07-07,173.16,177.13,171.90,175.16,29299700,175.16
+2008-07-03,169.59,172.17,165.75,170.12,18691500,170.12
+2008-07-02,175.20,177.45,168.18,168.18,29911400,168.18
+2008-07-01,164.23,174.72,164.00,174.68,39688600,174.68
+2008-06-30,170.19,172.00,166.62,167.44,24435600,167.44
+2008-06-27,166.51,170.57,164.15,170.09,37223200,170.09
+2008-06-26,174.07,174.84,168.01,168.26,31057500,168.26
+2008-06-25,174.61,178.83,173.88,177.39,23016100,177.39
+2008-06-24,172.37,175.78,171.63,173.25,22212400,173.25
+2008-06-23,174.74,175.88,171.56,173.16,23063600,173.16
+2008-06-20,179.35,181.00,175.00,175.27,31727400,175.27
+2008-06-19,178.55,182.34,176.80,180.90,28283900,180.90
+2008-06-18,181.12,182.20,177.35,178.75,28981000,178.75
+2008-06-17,178.10,181.99,177.41,181.43,32130600,181.43
+2008-06-16,171.30,177.90,169.07,176.84,37561800,176.84
+2008-06-13,171.64,174.16,165.31,172.37,48069900,172.37
+2008-06-12,181.49,182.60,171.20,173.26,46726200,173.26
+2008-06-11,184.34,186.00,179.59,180.81,34341100,180.81
+2008-06-10,180.51,186.78,179.02,185.64,40728600,185.64
+2008-06-09,184.79,184.94,175.75,181.61,67442600,181.61
+2008-06-06,188.00,189.95,185.55,185.64,34438700,185.64
+2008-06-05,186.34,189.84,185.70,189.43,26980200,189.43
+2008-06-04,184.02,187.09,183.23,185.19,25963700,185.19
+2008-06-03,186.86,188.20,182.34,185.37,26804300,185.37
+2008-06-02,188.60,189.65,184.53,186.10,24280000,186.10
+2008-05-30,187.45,189.54,187.38,188.75,21792300,188.75
+2008-05-29,186.76,188.20,185.50,186.69,23113800,186.69
+2008-05-28,187.41,187.95,183.72,187.01,26570700,187.01
+2008-05-27,182.75,186.43,181.84,186.43,28210900,186.43
+2008-05-23,180.77,181.99,177.80,181.17,32389900,181.17
+2008-05-22,179.26,181.33,172.00,177.05,43097700,177.05
+2008-05-21,185.67,187.95,176.25,178.19,41344900,178.19
+2008-05-20,181.82,186.16,180.12,185.90,34637500,185.90
+2008-05-19,187.86,188.69,181.30,183.60,33779300,183.60
+2008-05-16,190.11,190.30,187.00,187.62,27348900,187.62
+2008-05-15,186.81,189.90,184.20,189.73,31186000,189.73
+2008-05-14,191.23,192.24,185.57,186.26,32743700,186.26
+2008-05-13,188.61,191.45,187.86,189.96,29401300,189.96
+2008-05-12,185.21,188.87,182.85,188.16,29234400,188.16
+2008-05-09,183.16,184.25,181.37,183.45,24038300,183.45
+2008-05-08,183.77,186.50,183.07,185.06,32110200,185.06
+2008-05-07,186.05,188.20,180.54,182.59,41326200,182.59
+2008-05-06,184.66,187.12,182.18,186.66,32816800,186.66
+2008-05-05,181.92,185.31,181.05,184.73,30519900,184.73
+2008-05-02,180.19,181.92,178.55,180.94,35931500,180.94
+2008-05-01,174.96,180.00,174.86,180.00,32270600,180.00
+2008-04-30,176.19,180.00,172.92,173.95,40697300,173.95
+2008-04-29,171.11,175.66,170.25,175.05,32981300,175.05
+2008-04-28,169.75,173.75,169.13,172.24,28114800,172.24
+2008-04-25,170.70,171.10,166.42,169.73,35445500,169.73
+2008-04-24,165.34,169.98,159.19,168.94,60573800,168.94
+2008-04-23,164.05,164.84,161.08,162.89,53721100,162.89
+2008-04-22,167.40,168.00,158.09,160.20,51413300,160.20
+2008-04-21,162.21,168.50,161.76,168.16,37112600,168.16
+2008-04-18,159.12,162.26,158.38,161.04,36670200,161.04
+2008-04-17,154.17,156.00,153.35,154.49,25152400,154.49
+2008-04-16,151.72,154.10,150.62,153.70,28420500,153.70
+2008-04-15,149.40,149.72,145.72,148.38,24929900,148.38
+2008-04-14,146.77,149.25,144.54,147.78,30181700,147.78
+2008-04-11,152.72,153.30,146.40,147.14,43217000,147.14
+2008-04-10,151.13,155.42,150.60,154.55,34134400,154.55
+2008-04-09,153.31,153.89,150.46,151.44,31192800,151.44
+2008-04-08,153.55,156.45,152.32,152.84,36224800,152.84
+2008-04-07,156.13,159.69,155.11,155.89,41368800,155.89
+2008-04-04,152.19,154.71,150.75,153.08,30514900,153.08
+2008-04-03,147.06,153.63,147.00,151.61,37556000,151.61
+2008-04-02,148.78,151.20,145.85,147.49,37320300,147.49
+2008-04-01,146.30,149.66,143.61,149.53,36877400,149.53
+2008-03-31,143.27,145.71,142.52,143.50,27430900,143.50
+2008-03-28,141.80,144.65,141.60,143.01,25521800,143.01
+2008-03-27,144.95,145.31,139.99,140.25,35708200,140.25
+2008-03-26,140.87,145.74,140.64,145.06,42217300,145.06
+2008-03-25,139.96,143.10,137.33,140.98,37585400,140.98
+2008-03-24,134.01,140.85,133.64,139.53,38104300,139.53
+2008-03-20,131.12,133.29,129.18,133.27,32456700,133.27
+2008-03-19,133.12,134.29,129.67,129.67,36090600,129.67
+2008-03-18,129.18,133.00,128.67,132.82,43040000,132.82
+2008-03-17,122.55,128.59,122.55,126.73,38307100,126.73
+2008-03-14,129.88,130.30,124.20,126.61,41308600,126.61
+2008-03-13,124.10,129.50,123.00,127.94,45075100,127.94
+2008-03-12,127.04,128.68,125.17,126.03,37843900,126.03
+2008-03-11,124.10,127.48,122.00,127.35,41569400,127.35
+2008-03-10,121.98,123.46,119.37,119.69,35699600,119.69
+2008-03-07,120.41,122.98,119.05,122.25,43945100,122.25
+2008-03-06,124.61,127.50,120.81,120.93,52632100,120.93
+2008-03-05,123.58,125.14,122.25,124.49,43637000,124.49
+2008-03-04,121.99,124.88,120.40,124.62,63763700,124.62
+2008-03-03,124.44,125.98,118.00,121.73,56894400,121.73
+2008-02-29,129.29,130.21,124.80,125.02,44838600,125.02
+2008-02-28,127.20,132.20,125.77,129.91,57794800,129.91
+2008-02-27,118.23,123.05,118.09,122.96,52683500,122.96
+2008-02-26,117.64,121.09,115.44,119.15,53746000,119.15
+2008-02-25,118.59,120.17,116.66,119.74,44884800,119.74
+2008-02-22,122.48,122.51,115.87,119.46,54638500,119.46
+2008-02-21,126.05,126.47,120.86,121.54,33504100,121.54
+2008-02-20,122.20,124.60,121.68,123.82,34551400,123.82
+2008-02-19,125.99,126.75,121.44,122.18,35894500,122.18
+2008-02-15,126.27,127.08,124.06,124.63,32189300,124.63
2008-02-14,129.40,130.80,127.01,127.46,34074900,127.46
-2008-02-13,126.68,129.78,125.63,129.40,34542300,129.40
-2008-02-12,130.70,131.00,123.62,124.86,43749900,124.86
-2008-02-11,128.01,129.98,127.20,129.45,42886900,129.45
-2008-02-08,122.08,125.70,121.60,125.48,48412700,125.48
+2008-02-13,126.68,129.78,125.63,129.40,34590500,129.40
+2008-02-12,130.70,131.00,123.62,124.86,43785000,124.86
+2008-02-11,128.01,129.98,127.20,129.45,42908300,129.45
+2008-02-08,122.08,125.70,121.60,125.48,48427600,125.48
2008-02-07,119.97,124.78,117.27,121.24,74404700,121.24
-2008-02-06,130.83,131.92,121.77,122.00,56093900,122.00
-2008-02-05,130.43,134.00,128.90,129.36,40723400,129.36
-2008-02-04,134.21,135.90,131.42,131.65,32103400,131.65
-2008-02-01,136.24,136.59,132.18,133.75,36085400,133.75
-2008-01-31,129.45,136.65,129.40,135.36,48004500,135.36
-2008-01-30,131.37,135.45,130.00,132.18,44323500,132.18
-2008-01-29,131.15,132.79,129.05,131.54,39269800,131.54
-2008-01-28,128.16,133.20,126.45,130.01,52628400,130.01
-2008-01-25,138.99,139.09,129.61,130.01,55440400,130.01
-2008-01-24,139.99,140.70,132.01,135.60,71564900,135.60
-2008-01-23,136.19,140.00,126.14,139.07,120415200,139.07
-2008-01-22,148.06,159.98,146.00,155.64,86214800,155.64
-2008-01-18,161.71,165.75,159.61,161.36,61547400,161.36
+2008-02-06,130.83,131.92,121.77,122.00,56188300,122.00
+2008-02-05,130.43,134.00,128.90,129.36,40751500,129.36
+2008-02-04,134.21,135.90,131.42,131.65,32115500,131.65
+2008-02-01,136.24,136.59,132.18,133.75,36098000,133.75
+2008-01-31,129.45,136.65,129.40,135.36,48059800,135.36
+2008-01-30,131.37,135.45,130.00,132.18,44394700,132.18
+2008-01-29,131.15,132.79,129.05,131.54,39285100,131.54
+2008-01-28,128.16,133.20,126.45,130.01,52673000,130.01
+2008-01-25,138.99,139.09,129.61,130.01,55526400,130.01
+2008-01-24,139.99,140.70,132.01,135.60,71638100,135.60
+2008-01-23,136.19,140.00,126.14,139.07,120463200,139.07
+2008-01-22,148.06,159.98,146.00,155.64,86955500,155.64
+2008-01-18,161.71,165.75,159.61,161.36,61583700,161.36
2008-01-17,161.51,165.36,158.42,160.89,62780700,160.89
2008-01-16,165.23,169.01,156.70,159.64,79065900,159.64
2008-01-15,177.72,179.22,164.66,169.04,83688500,169.04
-2008-01-14,177.52,179.42,175.17,178.78,39256900,178.78
-2008-01-11,176.00,177.85,170.00,172.69,43936100,172.69
-2008-01-10,177.58,181.00,175.41,178.02,52904500,178.02
+2008-01-14,177.52,179.42,175.17,178.78,39301800,178.78
+2008-01-11,176.00,177.85,170.00,172.69,44010200,172.69
+2008-01-10,177.58,181.00,175.41,178.02,52963400,178.02
2008-01-09,171.30,179.50,168.30,179.40,64781500,179.40
-2008-01-08,180.14,182.46,170.80,171.25,54338200,171.25
-2008-01-07,181.25,183.60,170.23,177.64,73972900,177.64
-2008-01-04,191.45,193.00,178.89,180.05,51959400,180.05
-2008-01-03,195.41,197.39,192.69,194.93,30052300,194.93
-2008-01-02,199.27,200.26,192.55,194.84,38519200,194.84
-2007-12-31,199.50,200.50,197.75,198.08,19249800,198.08
-2007-12-28,200.59,201.56,196.88,199.83,24766200,199.83
-2007-12-27,198.95,202.96,197.80,198.57,28383000,198.57
-2007-12-26,199.01,200.96,196.82,198.95,25110500,198.95
+2008-01-08,180.14,182.46,170.80,171.25,54422000,171.25
+2008-01-07,181.25,183.60,170.23,177.64,74006900,177.64
+2008-01-04,191.45,193.00,178.89,180.05,51994000,180.05
+2008-01-03,195.41,197.39,192.69,194.93,30073800,194.93
+2008-01-02,199.27,200.26,192.55,194.84,38542100,194.84
+2007-12-31,199.50,200.50,197.75,198.08,19261900,198.08
+2007-12-28,200.59,201.56,196.88,199.83,24987400,199.83
+2007-12-27,198.95,202.96,197.80,198.57,28411700,198.57
+2007-12-26,199.01,200.96,196.82,198.95,25133300,198.95
2007-12-24,195.03,199.33,194.79,198.80,17150100,198.80
2007-12-21,190.12,193.91,189.89,193.91,35498600,193.91
-2007-12-20,185.43,187.83,183.33,187.21,27603200,187.21
-2007-12-19,182.98,184.64,180.90,183.12,29484300,183.12
-2007-12-18,186.52,187.33,178.60,182.98,43649200,182.98
-2007-12-17,190.72,192.65,182.98,184.40,36556700,184.40
+2007-12-20,185.43,187.83,183.33,187.21,27644900,187.21
+2007-12-19,182.98,184.64,180.90,183.12,29552800,183.12
+2007-12-18,186.52,187.33,178.60,182.98,43664400,182.98
+2007-12-17,190.72,192.65,182.98,184.40,36596200,184.40
2007-12-14,190.37,193.20,189.54,190.39,24082600,190.39
2007-12-13,190.19,192.12,187.82,191.83,30879200,191.83
-2007-12-12,193.44,194.48,185.76,190.86,43696200,190.86
-2007-12-11,194.75,196.83,187.39,188.54,39589700,188.54
-2007-12-10,193.59,195.66,192.69,194.21,25776800,194.21
-2007-12-07,190.54,194.99,188.04,194.30,38057700,194.30
+2007-12-12,193.44,194.48,185.76,190.86,43773600,190.86
+2007-12-11,194.75,196.83,187.39,188.54,39675900,188.54
+2007-12-10,193.59,195.66,192.69,194.21,25799200,194.21
+2007-12-07,190.54,194.99,188.04,194.30,38073800,194.30
2007-12-06,186.19,190.10,186.12,189.95,32136100,189.95
-2007-12-05,182.89,186.00,182.41,185.50,31833300,185.50
-2007-12-04,177.15,180.90,176.99,179.81,27625500,179.81
-2007-12-03,181.86,184.14,177.70,178.86,34308100,178.86
-2007-11-30,187.34,187.70,179.70,182.22,42400500,182.22
-2007-11-29,179.43,185.17,179.15,184.29,37413100,184.29
-2007-11-28,176.82,180.60,175.35,180.22,41073100,180.22
-2007-11-27,175.22,175.79,170.01,174.81,47005000,174.81
-2007-11-26,173.59,177.27,172.35,172.54,46603400,172.54
-2007-11-23,172.00,172.05,169.75,171.54,16622500,171.54
+2007-12-05,182.89,186.00,182.41,185.50,31871500,185.50
+2007-12-04,177.15,180.90,176.99,179.81,27635700,179.81
+2007-12-03,181.86,184.14,177.70,178.86,34338200,178.86
+2007-11-30,187.34,187.70,179.70,182.22,42421500,182.22
+2007-11-29,179.43,185.17,179.15,184.29,37533100,184.29
+2007-11-28,176.82,180.60,175.35,180.22,41104000,180.22
+2007-11-27,175.22,175.79,170.01,174.81,47036800,174.81
+2007-11-26,173.59,177.27,172.35,172.54,46634100,172.54
+2007-11-23,172.00,172.05,169.75,171.54,16634200,171.54
2007-11-21,165.84,172.35,164.67,168.46,43493200,168.46
-2007-11-20,165.67,171.79,163.53,168.85,55076200,168.85
+2007-11-20,165.67,171.79,163.53,168.85,55130100,168.85
2007-11-19,166.10,168.20,162.10,163.95,41196800,163.95
2007-11-16,165.30,167.02,159.33,166.39,49391300,166.39
2007-11-15,166.39,169.59,160.30,164.30,53095600,164.30
@@ -68,44 +235,44 @@
2007-11-09,171.15,175.12,165.21,165.37,54458700,165.37
2007-11-08,186.67,186.90,167.77,175.47,67458500,175.47
2007-11-07,190.61,192.68,186.13,186.30,35473400,186.30
-2007-11-06,187.05,192.00,185.27,191.79,34068500,191.79
-2007-11-05,185.29,188.96,184.24,186.18,28703700,186.18
-2007-11-02,189.21,189.44,183.49,187.87,35769600,187.87
-2007-11-01,188.60,190.10,180.00,187.44,28734100,187.44
-2007-10-31,187.63,190.12,184.95,189.95,29699700,189.95
-2007-10-30,186.18,189.37,184.73,187.00,33495900,187.00
-2007-10-29,185.45,186.59,184.70,185.09,19281800,185.09
+2007-11-06,187.05,192.00,185.27,191.79,34097400,191.79
+2007-11-05,185.29,188.96,184.24,186.18,28720600,186.18
+2007-11-02,189.21,189.44,183.49,187.87,35789800,187.87
+2007-11-01,188.60,190.10,180.00,187.44,28751300,187.44
+2007-10-31,187.63,190.12,184.95,189.95,29761100,189.95
+2007-10-30,186.18,189.37,184.73,187.00,33550500,187.00
+2007-10-29,185.45,186.59,184.70,185.09,19305500,185.09
2007-10-26,185.29,185.37,182.88,184.70,25219800,184.70
-2007-10-25,184.87,185.90,181.66,182.78,34729500,182.78
-2007-10-24,185.81,187.21,179.24,185.93,45961300,185.93
-2007-10-23,188.56,188.60,182.76,186.16,64005900,186.16
-2007-10-22,170.35,174.90,169.96,174.36,56203900,174.36
-2007-10-19,174.24,174.63,170.00,170.42,46063800,170.42
+2007-10-25,184.87,185.90,181.66,182.78,34771500,182.78
+2007-10-24,185.81,187.21,179.24,185.93,46017200,185.93
+2007-10-23,188.56,188.60,182.76,186.16,64113000,186.16
+2007-10-22,170.35,174.90,169.96,174.36,58910700,174.36
+2007-10-19,174.24,174.63,170.00,170.42,46135000,170.42
2007-10-18,171.50,174.19,171.05,173.50,29417000,173.50
-2007-10-17,172.69,173.04,169.18,172.75,39969400,172.75
-2007-10-16,165.54,170.18,165.15,169.58,38093400,169.58
-2007-10-15,167.98,169.57,163.50,166.98,38448900,166.98
-2007-10-12,163.01,167.28,161.80,167.25,35244200,167.25
-2007-10-11,169.49,171.88,153.21,162.23,58671500,162.23
-2007-10-10,167.55,167.88,165.60,166.79,23779600,166.79
+2007-10-17,172.69,173.04,169.18,172.75,40271900,172.75
+2007-10-16,165.54,170.18,165.15,169.58,38136800,169.58
+2007-10-15,167.98,169.57,163.50,166.98,38497500,166.98
+2007-10-12,163.01,167.28,161.80,167.25,35292000,167.25
+2007-10-11,169.49,171.88,153.21,162.23,58714000,162.23
+2007-10-10,167.55,167.88,165.60,166.79,23842500,166.79
2007-10-09,170.20,171.11,166.68,167.86,39438800,167.86
-2007-10-08,163.49,167.91,162.97,167.91,29815900,167.91
-2007-10-05,158.37,161.58,157.70,161.45,33595200,161.45
-2007-10-04,158.00,158.08,153.50,156.24,23402900,156.24
-2007-10-03,157.78,159.18,157.01,157.92,24696400,157.92
-2007-10-02,156.55,158.59,155.89,158.45,28250600,158.45
-2007-10-01,154.63,157.41,152.93,156.34,29861300,156.34
-2007-09-28,153.44,154.60,152.75,153.47,21915800,153.47
-2007-09-27,153.77,154.52,152.32,154.50,23427700,154.50
-2007-09-26,154.47,155.00,151.25,152.77,34801900,152.77
-2007-09-25,146.84,153.22,146.82,153.18,42572900,153.18
-2007-09-24,146.73,149.85,146.65,148.28,37506200,148.28
-2007-09-21,141.14,144.65,140.31,144.15,40651300,144.15
-2007-09-20,140.15,141.79,139.32,140.31,24575400,140.31
-2007-09-19,143.02,143.16,139.40,140.77,36633200,140.77
-2007-09-18,139.06,142.85,137.83,140.92,37951300,140.92
-2007-09-17,138.99,140.59,137.60,138.41,28301900,138.41
-2007-09-14,136.57,138.98,136.20,138.81,21674400,138.81
+2007-10-08,163.49,167.91,162.97,167.91,29854600,167.91
+2007-10-05,158.37,161.58,157.70,161.45,33695400,161.45
+2007-10-04,158.00,158.08,153.50,156.24,23462800,156.24
+2007-10-03,157.78,159.18,157.01,157.92,24732800,157.92
+2007-10-02,156.55,158.59,155.89,158.45,28288200,158.45
+2007-10-01,154.63,157.41,152.93,156.34,29895300,156.34
+2007-09-28,153.44,154.60,152.75,153.47,21967900,153.47
+2007-09-27,153.77,154.52,152.32,154.50,23507100,154.50
+2007-09-26,154.47,155.00,151.25,152.77,34831000,152.77
+2007-09-25,146.84,153.22,146.82,153.18,42591100,153.18
+2007-09-24,146.73,149.85,146.65,148.28,37577200,148.28
+2007-09-21,141.14,144.65,140.31,144.15,40674300,144.15
+2007-09-20,140.15,141.79,139.32,140.31,24708600,140.31
+2007-09-19,143.02,143.16,139.40,140.77,36674300,140.77
+2007-09-18,139.06,142.85,137.83,140.92,38003200,140.92
+2007-09-17,138.99,140.59,137.60,138.41,28334700,138.41
+2007-09-14,136.57,138.98,136.20,138.81,21690000,138.81
2007-09-13,138.83,139.00,136.65,137.20,23434400,137.20
2007-09-12,135.99,139.40,135.75,136.85,36527500,136.85
2007-09-11,137.90,138.30,133.75,135.49,34710200,135.49
@@ -3132,3 +3299,2784 @@
1995-09-11,44.88,45.50,44.25,44.25,6160800,11.03
1995-09-08,44.75,44.88,44.50,44.75,6243200,11.15
1995-09-07,44.00,45.31,43.75,44.75,9373600,11.15
+1995-09-06,43.88,44.17,43.50,43.75,7175600,10.90
+1995-09-05,43.50,43.50,42.75,43.50,6443200,10.84
+1995-09-01,43.00,43.50,42.88,42.94,3532400,10.70
+1995-08-31,43.38,43.50,43.00,43.00,3148000,10.72
+1995-08-30,43.25,43.75,43.13,43.38,5482000,10.81
+1995-08-29,43.00,43.25,42.50,43.13,11325600,10.75
+1995-08-28,44.88,45.00,43.00,43.00,8680000,10.72
+1995-08-25,45.88,45.88,44.63,44.75,4819200,11.15
+1995-08-24,45.63,46.25,45.50,45.75,10285200,11.40
+1995-08-23,44.88,45.88,44.63,45.50,9078000,11.34
+1995-08-22,44.38,45.13,44.13,44.75,7769200,11.15
+1995-08-21,44.88,45.38,44.13,44.13,9721200,11.00
+1995-08-18,44.88,45.13,43.75,44.88,8620000,11.19
+1995-08-17,44.63,45.50,44.13,44.63,8827600,11.12
+1995-08-16,44.00,44.50,43.63,44.50,10457600,11.09
+1995-08-15,43.88,44.13,43.13,44.06,11370800,10.95
+1995-08-14,43.00,43.75,42.88,43.38,5989200,10.78
+1995-08-11,42.88,43.13,41.88,43.06,7407600,10.70
+1995-08-10,43.13,43.25,42.63,42.75,5868000,10.63
+1995-08-09,42.63,43.75,42.50,43.13,13190000,10.72
+1995-08-08,43.63,43.75,42.38,42.50,8388800,10.56
+1995-08-07,44.13,44.63,43.13,43.38,6920000,10.78
+1995-08-04,45.00,45.13,43.75,44.25,6884400,11.00
+1995-08-03,44.13,45.63,43.88,45.00,7640800,11.18
+1995-08-02,43.88,45.00,43.75,44.38,9840800,11.03
+1995-08-01,44.88,44.88,43.50,43.50,7540000,10.81
+1995-07-31,45.50,45.63,44.75,45.00,5673600,11.18
+1995-07-28,46.75,47.25,45.00,45.50,9341200,11.31
+1995-07-27,45.50,47.50,45.50,46.81,11621200,11.63
+1995-07-26,46.25,46.25,45.38,45.38,6125200,11.28
+1995-07-25,46.00,46.38,45.63,45.75,9418000,11.37
+1995-07-24,44.00,45.50,43.75,45.38,7679200,11.28
+1995-07-21,43.00,44.88,43.00,43.75,27082400,10.87
+1995-07-20,46.00,47.38,45.00,47.06,11848800,11.70
+1995-07-19,47.00,48.00,45.00,45.50,18613200,11.31
+1995-07-18,49.00,49.56,47.75,48.13,9102000,11.96
+1995-07-17,48.88,49.75,48.63,49.00,8098000,12.18
+1995-07-14,47.38,49.00,47.00,48.75,9929200,12.12
+1995-07-13,47.38,48.75,47.13,47.63,12596400,11.84
+1995-07-12,47.25,48.00,46.13,47.00,10145200,11.68
+1995-07-11,47.75,48.63,47.06,47.13,7683200,11.71
+1995-07-10,48.63,49.88,48.13,48.63,10640800,12.09
+1995-07-07,46.88,49.25,46.75,48.63,13840000,12.09
+1995-07-06,46.50,47.00,45.75,47.00,6583200,11.68
+1995-07-05,46.88,47.88,46.50,46.50,6325600,11.56
+1995-07-03,46.50,47.13,46.25,46.94,1410800,11.67
+1995-06-30,47.25,47.88,46.13,46.44,5927600,11.54
+1995-06-29,46.38,48.13,46.00,47.25,8320000,11.74
+1995-06-28,46.00,47.50,45.38,46.63,9531200,11.59
+1995-06-27,47.38,48.25,46.38,46.38,7772400,11.53
+1995-06-26,48.25,48.50,47.63,48.13,5465600,11.96
+1995-06-23,48.75,49.00,47.75,48.75,8286800,12.12
+1995-06-22,49.00,49.63,48.63,49.13,16928800,12.21
+1995-06-21,47.63,50.13,46.75,49.38,22378800,12.27
+1995-06-20,46.00,47.75,46.00,47.38,26385200,11.78
+1995-06-19,43.88,45.25,43.50,44.38,16774400,11.03
+1995-06-16,43.88,44.00,43.50,43.88,3200800,10.91
+1995-06-15,43.63,43.75,43.38,43.63,3331200,10.84
+1995-06-14,43.88,43.88,43.38,43.63,4224800,10.84
+1995-06-13,44.50,44.63,43.88,44.00,4508000,10.94
+1995-06-12,44.00,44.50,43.88,44.17,7584400,10.98
+1995-06-09,43.63,43.75,43.13,43.50,6679200,10.81
+1995-06-08,43.38,43.38,42.13,42.94,4874400,10.67
+1995-06-07,44.13,44.13,43.13,43.13,4451200,10.72
+1995-06-06,43.63,44.38,43.50,44.00,11270800,10.94
+1995-06-05,42.38,43.50,42.13,43.50,9103200,10.81
+1995-06-02,41.88,42.38,41.50,42.13,3783200,10.47
+1995-06-01,41.88,42.50,41.75,42.19,6685200,10.49
+1995-05-31,42.13,42.13,41.00,41.56,5707600,10.33
+1995-05-30,42.63,42.88,41.50,42.00,7021200,10.44
+1995-05-26,43.00,43.13,42.25,42.69,4097600,10.61
+1995-05-25,43.25,44.00,43.00,43.38,6536800,10.75
+1995-05-24,43.75,44.25,42.88,43.50,9459200,10.78
+1995-05-23,44.13,44.38,43.50,43.88,9881200,10.88
+1995-05-22,42.50,44.13,42.25,44.13,13282400,10.94
+1995-05-19,42.88,43.75,42.63,42.75,11522000,10.60
+1995-05-18,44.13,44.13,43.25,43.38,13287600,10.75
+1995-05-17,43.75,44.38,43.50,44.00,9419200,10.91
+1995-05-16,43.13,44.38,42.50,43.75,11895600,10.84
+1995-05-15,43.13,43.75,42.50,43.63,14053200,10.81
+1995-05-12,40.88,43.69,40.50,43.63,23153200,10.81
+1995-05-11,41.63,41.63,40.38,41.00,18712400,10.16
+1995-05-10,41.50,41.88,40.75,41.44,9837600,10.27
+1995-05-09,40.63,41.38,40.00,41.25,11540800,10.22
+1995-05-08,39.88,41.00,39.75,40.50,13832000,10.04
+1995-05-05,38.75,39.13,38.13,38.88,7445200,9.64
+1995-05-04,38.25,39.88,38.00,38.50,10846800,9.54
+1995-05-03,38.25,38.63,38.00,38.13,6043600,9.45
+1995-05-02,38.25,38.38,37.50,38.13,4289200,9.45
+1995-05-01,38.25,38.75,38.00,38.25,6375600,9.48
+1995-04-28,38.00,38.38,37.50,38.25,6984400,9.48
+1995-04-27,38.50,38.50,37.75,37.88,5014800,9.39
+1995-04-26,37.63,38.75,37.38,38.25,8246800,9.48
+1995-04-25,39.13,39.38,37.25,37.75,9780000,9.36
+1995-04-24,39.00,39.63,38.50,39.00,9724400,9.67
+1995-04-21,37.25,39.50,37.13,39.13,23812400,9.70
+1995-04-20,37.13,38.50,36.63,37.63,11772400,9.33
+1995-04-19,37.50,37.50,35.63,36.38,9990800,9.02
+1995-04-18,38.50,38.63,37.50,37.50,8263200,9.29
+1995-04-17,38.13,39.38,37.88,38.38,7467600,9.51
+1995-04-13,39.25,39.25,37.88,38.25,6242400,9.48
+1995-04-12,38.25,39.63,37.38,39.00,16973200,9.67
+1995-04-11,36.75,37.88,36.63,37.75,7673200,9.36
+1995-04-10,36.88,37.00,36.13,36.63,4211200,9.08
+1995-04-07,37.00,37.13,36.25,36.75,10562400,9.11
+1995-04-06,37.25,38.00,35.53,36.75,25823600,9.11
+1995-04-05,34.13,34.75,33.75,34.75,9470000,8.61
+1995-04-04,35.75,35.88,33.63,33.88,15300000,8.40
+1995-04-03,35.50,35.75,35.13,35.50,5528000,8.80
+1995-03-31,35.13,35.63,34.75,35.25,6558000,8.74
+1995-03-30,34.63,35.50,34.50,35.38,9767600,8.77
+1995-03-29,34.00,34.88,33.88,34.38,17760000,8.52
+1995-03-28,36.25,36.34,34.13,34.38,24655600,8.52
+1995-03-27,37.63,37.63,36.63,37.19,5111200,9.22
+1995-03-24,37.38,37.88,37.25,37.75,4584400,9.36
+1995-03-23,37.88,38.00,36.98,37.13,6094400,9.20
+1995-03-22,36.25,39.50,36.25,38.06,17130800,9.43
+1995-03-21,35.50,36.75,35.25,36.25,10920800,8.98
+1995-03-20,35.13,35.63,35.00,35.25,6793600,8.74
+1995-03-17,35.50,35.50,34.88,35.13,7713600,8.71
+1995-03-16,35.25,36.00,35.00,35.25,11330000,8.74
+1995-03-15,35.50,36.25,34.88,35.00,26120800,8.67
+1995-03-14,38.25,38.25,34.50,35.00,26015200,8.67
+1995-03-13,39.63,39.63,38.00,38.13,11653200,9.45
+1995-03-10,39.63,40.38,39.38,39.50,4923200,9.79
+1995-03-09,39.88,40.38,39.38,39.75,7038000,9.85
+1995-03-08,38.75,40.13,37.75,39.56,13048800,9.81
+1995-03-07,39.88,39.88,38.25,38.31,5399200,9.50
+1995-03-06,39.75,40.00,39.50,39.75,4751200,9.85
+1995-03-03,39.75,40.69,39.50,40.25,5209200,9.98
+1995-03-02,40.13,40.75,39.75,40.00,9619200,9.91
+1995-03-01,39.75,40.13,39.42,40.00,8025200,9.91
+1995-02-28,38.50,39.88,38.00,39.50,7965200,9.79
+1995-02-27,38.25,39.00,38.11,38.25,9600800,9.48
+1995-02-24,40.13,40.38,38.50,39.00,20334400,9.67
+1995-02-23,41.13,41.88,40.00,40.19,11262000,9.96
+1995-02-22,40.63,41.00,40.13,40.81,10501200,10.12
+1995-02-21,42.63,42.75,40.88,41.00,10776800,10.16
+1995-02-17,42.88,43.00,42.50,42.50,4366400,10.53
+1995-02-16,43.13,43.25,42.63,43.19,7821200,10.70
+1995-02-15,43.25,43.50,42.50,42.56,6604400,10.55
+1995-02-14,43.75,44.13,42.63,42.94,5934400,10.64
+1995-02-13,43.50,44.50,43.25,43.75,10120800,10.84
+1995-02-10,43.63,44.19,43.38,43.75,12542400,10.81
+1995-02-09,42.13,43.88,42.13,43.63,16988800,10.78
+1995-02-08,41.00,42.38,40.88,42.31,14403600,10.46
+1995-02-07,40.38,41.00,40.00,40.81,7200000,10.09
+1995-02-06,40.75,40.75,39.50,40.50,8702000,10.01
+1995-02-03,42.00,42.13,40.38,40.50,11400800,10.01
+1995-02-02,40.13,41.88,40.13,41.63,7288000,10.29
+1995-02-01,40.75,40.75,39.88,40.13,5665200,9.92
+1995-01-31,40.50,40.88,40.00,40.38,7621200,9.98
+1995-01-30,40.13,40.50,39.88,40.13,8255200,9.92
+1995-01-27,39.88,40.38,39.00,39.88,10676400,9.86
+1995-01-26,40.88,41.50,39.25,39.50,8822000,9.76
+1995-01-25,39.50,42.00,39.50,40.98,18482000,10.13
+1995-01-24,42.25,42.38,41.38,41.63,7805600,10.29
+1995-01-23,41.88,42.63,41.00,42.25,14252400,10.44
+1995-01-20,47.00,47.00,42.50,42.63,35731200,10.54
+1995-01-19,45.50,46.00,45.00,45.88,11238800,11.34
+1995-01-18,45.00,45.63,44.75,45.63,4581200,11.28
+1995-01-17,44.50,45.50,44.13,45.00,11806400,11.12
+1995-01-16,44.88,45.25,44.25,44.50,6765600,11.00
+1995-01-13,46.13,46.13,44.38,44.88,12565600,11.09
+1995-01-12,46.13,46.38,44.75,45.38,19721200,11.22
+1995-01-11,43.75,48.06,42.69,46.75,31212400,11.56
+1995-01-10,41.25,44.00,41.25,43.69,21977600,10.80
+1995-01-09,41.63,41.88,41.00,41.20,9805200,10.18
+1995-01-06,41.63,43.13,41.13,42.00,38456800,10.38
+1995-01-05,39.25,39.38,38.75,38.88,2646800,9.61
+1995-01-04,38.63,39.63,38.63,39.38,5682400,9.73
+1995-01-03,38.88,38.88,37.88,38.38,3726400,9.49
+1994-12-30,39.38,39.88,38.75,39.00,2616400,9.64
+1994-12-29,39.25,39.88,39.13,39.50,4341200,9.76
+1994-12-28,39.13,39.25,38.25,39.13,3198000,9.67
+1994-12-27,39.25,39.75,38.88,39.13,2928800,9.67
+1994-12-23,38.50,39.38,38.50,38.88,3372000,9.61
+1994-12-22,38.50,38.88,38.25,38.63,4771200,9.55
+1994-12-21,37.88,38.50,37.50,38.38,5635600,9.49
+1994-12-20,39.13,39.25,38.38,38.50,6263600,9.52
+1994-12-19,37.25,39.38,37.25,39.13,11890000,9.67
+1994-12-16,37.25,37.75,36.75,37.25,6432400,9.21
+1994-12-15,38.00,38.38,36.88,37.13,8133200,9.18
+1994-12-14,36.50,38.13,36.50,37.88,11123600,9.36
+1994-12-13,36.63,36.94,36.25,36.38,4266800,8.99
+1994-12-12,36.38,36.75,35.50,36.50,8004400,9.02
+1994-12-09,35.88,36.38,34.75,36.25,9329200,8.96
+1994-12-08,36.88,37.00,35.75,35.88,6081200,8.87
+1994-12-07,37.50,37.81,36.06,36.63,4916800,9.05
+1994-12-06,37.00,38.38,36.88,37.56,8516400,9.28
+1994-12-05,36.50,37.38,36.13,37.19,6460000,9.19
+1994-12-02,36.50,36.75,35.63,36.56,6170000,9.04
+1994-12-01,37.00,37.63,36.00,36.19,11051200,8.95
+1994-11-30,38.38,39.38,37.00,37.25,11157600,9.21
+1994-11-29,38.00,38.50,37.75,38.25,5163200,9.45
+1994-11-28,37.63,38.25,37.31,37.81,4971200,9.35
+1994-11-25,36.88,37.75,36.75,37.75,3012400,9.33
+1994-11-23,37.00,37.88,36.38,36.88,11723200,9.12
+1994-11-22,37.75,39.13,37.25,37.38,8018800,9.24
+1994-11-21,40.00,40.25,38.00,38.13,7255600,9.42
+1994-11-18,40.00,40.50,39.63,40.00,5257600,9.89
+1994-11-17,40.88,41.00,39.88,40.00,5380000,9.86
+1994-11-16,40.75,41.56,40.63,40.94,6700000,10.09
+1994-11-15,42.50,43.00,41.25,41.38,6001200,10.20
+1994-11-14,41.25,42.75,41.25,42.50,5002000,10.47
+1994-11-11,41.25,41.50,41.00,41.13,2237600,10.14
+1994-11-10,41.75,41.88,41.00,41.31,5476800,10.18
+1994-11-09,42.75,43.00,41.00,41.63,14530000,10.26
+1994-11-08,40.63,42.63,40.25,42.25,12476400,10.41
+1994-11-07,40.38,41.25,40.13,40.75,4058000,10.04
+1994-11-04,41.50,41.63,40.00,40.38,6869200,9.95
+1994-11-03,41.75,42.00,41.00,41.50,3962400,10.23
+1994-11-02,43.13,43.25,41.38,41.38,7819200,10.20
+1994-11-01,42.88,43.48,42.38,43.13,7805600,10.63
+1994-10-31,42.00,43.38,41.50,43.19,12728000,10.64
+1994-10-28,42.38,42.88,41.75,42.13,9762400,10.38
+1994-10-27,43.25,43.75,42.50,42.75,5700800,10.54
+1994-10-26,42.63,43.27,42.63,43.25,7043200,10.66
+1994-10-25,41.63,42.63,41.50,42.63,10771200,10.51
+1994-10-24,42.75,43.13,41.88,42.25,7316800,10.41
+1994-10-21,40.75,42.75,40.75,42.63,11528000,10.51
+1994-10-20,41.25,41.81,40.50,41.00,7808000,10.10
+1994-10-19,41.00,42.13,41.00,41.25,12549200,10.17
+1994-10-18,40.63,41.63,40.50,41.25,16749200,10.17
+1994-10-17,40.88,41.50,38.88,39.75,10866400,9.80
+1994-10-14,41.50,42.00,40.88,41.13,6292000,10.14
+1994-10-13,42.63,42.88,40.63,41.13,18761200,10.14
+1994-10-12,39.63,42.63,39.13,42.13,21340000,10.38
+1994-10-11,41.38,41.88,39.38,39.63,30083600,9.77
+1994-10-10,37.13,39.63,37.00,38.88,18700800,9.58
+1994-10-07,36.13,37.06,35.50,37.00,13022000,9.12
+1994-10-06,37.38,37.48,36.00,36.25,18828800,8.93
+1994-10-05,33.63,38.13,33.38,37.88,25366800,9.33
+1994-10-04,33.25,34.00,33.00,33.75,5822000,8.32
+1994-10-03,33.63,33.75,32.50,33.13,4644400,8.16
+1994-09-30,34.13,34.50,33.63,33.69,2561200,8.30
+1994-09-29,33.75,34.38,33.38,34.13,3921200,8.41
+1994-09-28,34.00,34.38,33.63,33.88,2914800,8.35
+1994-09-27,33.75,34.13,33.38,33.88,3904800,8.35
+1994-09-26,33.88,34.50,33.63,33.94,5072400,8.36
+1994-09-23,33.88,34.50,33.88,33.94,4760000,8.36
+1994-09-22,34.25,34.25,33.63,33.88,5235600,8.35
+1994-09-21,34.50,34.63,33.75,34.13,8402400,8.41
+1994-09-20,35.13,35.38,34.38,34.56,7047600,8.52
+1994-09-19,36.38,36.75,35.50,35.50,6242000,8.75
+1994-09-16,35.88,37.25,35.50,36.38,13008000,8.97
+1994-09-15,35.13,36.13,35.13,36.00,9253200,8.87
+1994-09-14,35.63,35.75,35.00,35.13,3549200,8.66
+1994-09-13,35.75,36.25,35.63,35.81,3723600,8.82
+1994-09-12,35.63,35.75,35.38,35.75,3252400,8.81
+1994-09-09,35.75,36.00,35.38,35.75,5624400,8.81
+1994-09-08,36.00,36.25,35.63,36.13,5691200,8.90
+1994-09-07,35.63,36.63,35.38,36.13,7283200,8.90
+1994-09-06,35.25,35.63,35.00,35.56,3279200,8.76
+1994-09-02,35.25,35.50,35.00,35.38,3628000,8.72
+1994-09-01,35.38,35.75,34.63,35.00,7305200,8.63
+1994-08-31,36.00,37.38,35.75,36.19,12568800,8.92
+1994-08-30,35.25,36.38,35.13,36.25,6515600,8.93
+1994-08-29,35.75,36.13,35.25,35.38,5450800,8.72
+1994-08-26,35.25,36.13,35.25,35.75,7300000,8.81
+1994-08-25,34.25,36.38,34.25,35.06,10688800,8.64
+1994-08-24,34.75,35.00,34.38,34.88,6132400,8.60
+1994-08-23,34.88,35.88,34.75,35.00,7669200,8.63
+1994-08-22,34.75,35.00,34.63,34.88,5445600,8.60
+1994-08-19,34.75,35.00,34.25,34.88,4674800,8.60
+1994-08-18,34.75,35.25,34.50,34.63,7370000,8.53
+1994-08-17,34.88,35.38,34.63,35.00,10232400,8.63
+1994-08-16,34.38,34.75,34.00,34.75,5563200,8.56
+1994-08-15,34.75,35.00,34.25,34.63,4293200,8.53
+1994-08-12,34.38,35.13,33.88,34.75,6425200,8.53
+1994-08-11,34.25,35.13,33.88,34.31,10649200,8.43
+1994-08-10,33.63,34.88,33.25,34.63,9065200,8.50
+1994-08-09,33.50,33.88,33.13,33.63,2811200,8.26
+1994-08-08,33.13,34.00,33.00,33.75,5048800,8.29
+1994-08-05,32.88,33.38,32.88,33.25,3123200,8.17
+1994-08-04,33.13,33.75,33.13,33.25,6620000,8.17
+1994-08-03,32.75,33.25,32.13,33.13,8113600,8.14
+1994-08-02,33.50,33.63,32.38,32.56,9642400,8.00
+1994-08-01,33.63,33.75,32.75,33.38,8204400,8.20
+1994-07-29,31.87,34.00,31.87,33.69,19853600,8.27
+1994-07-28,31.00,32.13,30.87,31.87,8762000,7.83
+1994-07-27,31.25,31.37,30.62,31.06,4788000,7.63
+1994-07-26,31.75,32.00,31.12,31.37,6756400,7.70
+1994-07-25,31.12,31.87,30.75,31.69,15103200,7.78
+1994-07-22,31.62,31.97,30.00,31.00,28098800,7.61
+1994-07-21,26.62,28.50,26.50,28.00,10348800,6.88
+1994-07-20,27.37,27.62,26.37,26.62,7765200,6.54
+1994-07-19,28.62,28.75,27.37,27.69,4176400,6.80
+1994-07-18,28.12,29.00,28.00,28.37,2734800,6.97
+1994-07-15,28.23,28.62,27.50,28.25,3409200,6.94
+1994-07-14,29.62,29.75,28.25,28.62,6459200,7.03
+1994-07-13,28.50,30.25,28.50,29.69,16081200,7.29
+1994-07-12,27.00,28.44,26.37,28.37,8662000,6.97
+1994-07-11,27.12,27.37,26.62,27.00,3801200,6.63
+1994-07-08,26.50,27.62,26.50,27.06,7457600,6.65
+1994-07-07,25.87,27.00,25.50,26.81,6097600,6.58
+1994-07-06,26.25,26.50,26.00,26.12,3499200,6.41
+1994-07-05,25.62,26.75,25.62,26.50,3080800,6.51
+1994-07-01,26.37,26.50,25.37,25.75,6404400,6.32
+1994-06-30,26.25,26.87,26.25,26.50,3652000,6.51
+1994-06-29,26.75,27.12,25.87,26.12,4842400,6.41
+1994-06-28,26.25,27.12,25.62,26.75,6235200,6.57
+1994-06-27,25.25,26.25,24.62,26.25,9153200,6.45
+1994-06-24,25.12,26.12,24.75,25.61,10470000,6.29
+1994-06-23,26.25,26.25,24.87,25.12,7283200,6.17
+1994-06-22,26.25,26.75,26.00,26.25,4081200,6.45
+1994-06-21,26.87,27.25,25.75,26.00,8693200,6.39
+1994-06-20,26.25,27.25,26.00,27.12,7150000,6.66
+1994-06-17,26.00,26.75,25.87,26.50,8027600,6.51
+1994-06-16,27.75,27.75,26.12,26.37,7812400,6.48
+1994-06-15,27.00,28.00,26.87,27.81,5704400,6.83
+1994-06-14,27.25,27.37,26.62,27.06,5531200,6.65
+1994-06-13,26.37,27.19,26.37,27.00,3339200,6.63
+1994-06-10,27.12,27.37,26.37,26.50,5107600,6.51
+1994-06-09,25.62,27.00,25.50,27.00,10485200,6.63
+1994-06-08,27.50,27.62,26.00,26.12,9809200,6.41
+1994-06-07,27.25,27.75,27.25,27.50,5013600,6.75
+1994-06-06,27.50,27.75,27.00,27.37,4513200,6.72
+1994-06-03,27.12,28.00,26.75,27.62,12649200,6.78
+1994-06-02,28.37,28.50,27.12,27.37,13762400,6.72
+1994-06-01,28.50,28.62,27.87,28.25,13786800,6.94
+1994-05-31,29.50,29.50,28.50,29.25,9211200,7.18
+1994-05-27,30.25,30.75,29.50,29.94,3882400,7.35
+1994-05-26,31.50,31.50,30.25,30.50,2613200,7.46
+1994-05-25,30.25,31.75,30.00,31.25,4873200,7.64
+1994-05-24,31.00,31.25,30.25,30.75,4536400,7.52
+1994-05-23,31.00,31.25,30.00,30.50,4286400,7.46
+1994-05-20,31.75,32.25,31.00,31.06,3519200,7.60
+1994-05-19,30.75,32.50,30.50,32.13,9776800,7.86
+1994-05-18,29.75,30.75,29.25,30.62,4436800,7.49
+1994-05-17,29.75,29.75,28.75,29.37,6450800,7.18
+1994-05-16,30.00,30.50,29.50,29.50,4854800,7.22
+1994-05-13,29.75,30.50,29.25,30.00,3323200,7.34
+1994-05-12,30.50,30.75,29.50,29.69,3839200,7.26
+1994-05-11,31.00,31.50,29.75,30.25,5218000,7.40
+1994-05-10,31.75,32.00,31.00,31.00,5246800,7.58
+1994-05-09,32.25,32.50,30.75,31.25,5026400,7.64
+1994-05-06,32.25,32.75,31.25,32.31,6721200,7.90
+1994-05-05,33.25,33.75,32.25,32.88,10307600,8.04
+1994-05-04,31.00,33.25,30.50,33.00,13008800,8.07
+1994-05-03,31.00,31.25,29.50,30.25,4761200,7.40
+1994-05-02,30.00,31.25,30.00,31.00,4401200,7.58
+1994-04-29,30.00,30.50,29.75,30.00,3399200,7.34
+1994-04-28,31.00,31.25,29.75,30.25,3604400,7.40
+1994-04-26,31.50,31.50,31.00,31.25,5879200,7.64
+1994-04-25,29.75,31.00,29.50,31.00,12846800,7.58
+1994-04-22,31.25,32.00,28.50,29.75,24923600,7.28
+1994-04-21,28.50,30.50,27.00,29.62,14674400,7.25
+1994-04-20,29.25,30.00,28.00,28.25,10080800,6.91
+1994-04-19,29.75,30.00,28.50,29.00,5947600,7.09
+1994-04-18,30.50,30.50,29.25,29.62,8238800,7.25
+1994-04-15,31.25,31.50,30.00,30.25,6730800,7.40
+1994-04-14,30.50,31.75,30.00,31.50,7933200,7.71
+1994-04-13,32.25,32.50,31.25,31.75,8330000,7.77
+1994-04-12,33.38,33.38,31.75,32.00,4890800,7.83
+1994-04-11,33.50,33.50,32.50,33.50,3823600,8.19
+1994-04-08,33.75,34.00,33.25,33.50,6336400,8.19
+1994-04-07,33.50,33.75,32.75,33.38,2764800,8.17
+1994-04-06,34.00,34.00,32.75,33.50,4616400,8.19
+1994-04-05,33.75,34.25,33.50,33.50,3505600,8.19
+1994-04-04,32.25,33.25,31.75,33.25,6016800,8.13
+1994-03-31,32.50,33.50,31.50,33.25,7481200,8.13
+1994-03-30,32.50,33.25,31.75,32.50,6079200,7.95
+1994-03-29,33.25,33.75,32.25,32.75,7640000,8.01
+1994-03-28,33.00,34.00,32.75,33.25,10098800,8.13
+1994-03-25,34.75,34.75,32.75,32.75,12291200,8.01
+1994-03-24,35.13,35.25,34.00,34.63,6738800,8.47
+1994-03-23,35.25,35.50,34.25,35.13,7749200,8.59
+1994-03-22,35.25,35.50,34.50,35.00,8690800,8.56
+1994-03-21,36.38,36.50,35.25,35.50,8806400,8.68
+1994-03-18,36.75,36.75,35.75,36.38,8004400,8.90
+1994-03-17,36.75,37.00,36.25,36.50,5590800,8.93
+1994-03-16,37.50,37.75,36.50,36.75,5265200,8.99
+1994-03-15,38.25,38.25,37.25,37.63,7319200,9.20
+1994-03-14,38.50,38.50,37.75,38.13,15783600,9.33
+1994-03-11,37.00,37.75,36.75,37.25,5791200,9.11
+1994-03-10,37.25,37.63,36.75,37.25,5142400,9.11
+1994-03-09,36.63,37.50,36.00,37.50,8896800,9.17
+1994-03-08,38.00,38.00,36.75,37.00,6647600,9.05
+1994-03-07,37.00,38.13,36.75,37.88,11088800,9.27
+1994-03-04,36.00,37.50,35.75,36.75,8113600,8.99
+1994-03-03,35.75,36.25,35.50,35.75,6737600,8.75
+1994-03-02,35.25,36.25,34.75,35.63,10519200,8.72
+1994-03-01,36.75,36.75,35.75,36.25,7570800,8.87
+1994-02-28,36.25,37.00,36.00,36.50,4434800,8.93
+1994-02-25,37.00,37.25,35.50,36.00,8468000,8.81
+1994-02-24,37.00,37.25,36.25,36.63,7081200,8.96
+1994-02-23,37.25,38.25,37.00,37.25,9318800,9.11
+1994-02-22,36.25,37.50,35.75,37.25,7676400,9.11
+1994-02-18,36.50,37.00,36.25,36.25,5326400,8.87
+1994-02-17,37.25,37.88,36.25,37.00,5197600,9.05
+1994-02-16,37.50,37.50,36.75,36.75,4379200,8.99
+1994-02-15,36.75,37.50,36.25,37.13,4654400,9.08
+1994-02-14,37.00,38.00,36.75,37.00,8775200,9.05
+1994-02-11,36.25,37.50,36.25,37.00,5880800,9.05
+1994-02-10,36.25,37.50,36.00,36.50,10802000,8.93
+1994-02-09,35.75,36.50,35.25,36.25,6699200,8.87
+1994-02-08,36.00,36.50,35.25,35.75,10210800,8.75
+1994-02-07,33.50,37.13,33.50,36.50,25925200,8.93
+1994-02-04,33.50,35.00,33.25,33.50,12645200,8.17
+1994-02-03,33.00,33.63,32.50,33.50,4933200,8.17
+1994-02-02,33.25,33.25,32.50,33.00,5247600,8.04
+1994-02-01,33.00,33.50,32.25,33.25,5618000,8.10
+1994-01-31,33.50,33.75,32.75,32.75,8532400,7.98
+1994-01-28,34.25,34.75,33.75,34.00,4891200,8.29
+1994-01-27,33.50,34.25,33.00,34.13,4724800,8.32
+1994-01-26,33.75,34.00,33.25,33.50,5922400,8.17
+1994-01-25,34.75,35.00,33.25,33.88,15818800,8.26
+1994-01-24,33.25,35.25,33.25,35.00,24742000,8.53
+1994-01-21,33.25,33.50,32.25,33.38,35007600,8.14
+1994-01-20,29.50,30.75,29.50,29.87,9582400,7.28
+1994-01-19,29.25,29.75,28.75,29.25,10066400,7.13
+1994-01-18,30.25,30.25,29.00,29.37,12978000,7.16
+1994-01-17,31.00,31.50,30.00,30.37,5206400,7.40
+1994-01-14,30.75,31.75,30.50,31.00,7673200,7.56
+1994-01-13,30.00,30.75,29.75,30.62,19000000,7.46
+1994-01-12,32.25,32.25,30.50,30.50,15684400,7.43
+1994-01-11,33.50,33.75,31.75,31.87,12700000,7.77
+1994-01-10,33.00,33.88,32.75,33.63,7222000,8.20
+1994-01-07,32.00,33.25,31.25,33.13,10688800,8.08
+1994-01-06,33.75,34.00,32.50,32.75,13095200,7.98
+1994-01-05,31.75,33.88,31.75,33.75,21874400,8.23
+1994-01-04,30.25,31.50,30.00,31.50,10198800,7.68
+1994-01-03,29.50,30.00,29.00,29.87,6485200,7.28
+1993-12-31,29.75,30.25,29.25,29.25,5765200,7.13
+1993-12-30,28.50,30.25,28.50,29.75,11253200,7.25
+1993-12-29,29.25,29.25,28.50,28.50,3853200,6.95
+1993-12-28,28.75,29.50,28.50,29.12,5705600,7.10
+1993-12-27,27.75,28.75,27.25,28.50,5730000,6.95
+1993-12-23,27.25,27.25,26.50,27.25,8120000,6.64
+1993-12-22,27.25,28.50,27.00,28.00,6498800,6.82
+1993-12-21,28.50,28.75,27.25,27.50,8973600,6.70
+1993-12-20,29.25,29.75,28.25,28.50,6768800,6.95
+1993-12-17,29.50,29.75,29.12,29.50,5197600,7.19
+1993-12-16,29.50,29.75,29.00,29.37,4532000,7.16
+1993-12-15,29.00,29.75,29.00,29.75,4438000,7.25
+1993-12-14,29.25,29.75,29.00,29.12,10492400,7.10
+1993-12-13,28.25,29.50,27.75,29.50,8729200,7.19
+1993-12-10,30.25,30.50,27.75,28.25,17781200,6.89
+1993-12-09,31.75,32.00,29.75,30.00,6531200,7.31
+1993-12-08,32.00,32.25,31.50,31.87,1422000,7.77
+1993-12-07,32.00,32.25,31.50,32.25,2280800,7.86
+1993-12-06,31.50,32.50,31.25,32.25,5610000,7.86
+1993-12-03,31.75,32.00,31.00,31.50,4314800,7.68
+1993-12-02,31.75,32.00,31.00,31.75,3614400,7.74
+1993-12-01,32.00,32.25,31.25,31.50,3978800,7.68
+1993-11-30,31.75,32.63,31.50,31.50,4036800,7.68
+1993-11-29,32.25,32.50,31.50,31.75,3462000,7.74
+1993-11-26,32.75,33.00,32.25,32.63,1569200,7.95
+1993-11-24,32.75,33.50,32.63,33.00,3246800,8.04
+1993-11-23,32.50,33.00,31.25,33.00,6653600,8.04
+1993-11-22,32.75,33.00,32.25,32.50,5389200,7.92
+1993-11-19,33.00,33.50,32.50,33.00,4409200,8.04
+1993-11-18,33.50,33.75,33.00,33.50,4089200,8.14
+1993-11-17,34.00,35.00,32.75,33.50,10812400,8.14
+1993-11-16,32.00,34.25,31.75,34.00,10838000,8.26
+1993-11-15,31.50,32.75,31.50,32.00,5616800,7.77
+1993-11-12,31.50,32.00,30.50,31.75,5136800,7.71
+1993-11-11,30.75,32.00,30.50,31.37,5090800,7.62
+1993-11-10,30.25,30.75,30.00,30.75,2765600,7.47
+1993-11-09,31.00,31.25,29.75,30.12,6136400,7.32
+1993-11-08,32.00,32.13,30.50,30.75,5966400,7.47
+1993-11-05,31.87,32.25,30.75,31.87,13513200,7.74
+1993-11-04,31.50,32.25,30.75,32.25,6632000,7.83
+1993-11-03,33.00,33.00,31.00,31.62,6320000,7.68
+1993-11-02,31.25,33.00,31.00,32.75,8013600,7.95
+1993-11-01,30.75,31.50,30.25,31.50,3798800,7.65
+1993-10-29,31.00,31.75,30.50,30.75,4892400,7.47
+1993-10-28,31.75,32.25,31.00,31.00,8736800,7.53
+1993-10-27,30.00,32.25,29.75,31.75,16415200,7.71
+1993-10-26,29.75,30.00,29.00,29.75,7960000,7.23
+1993-10-25,30.25,30.50,29.62,30.00,7840800,7.29
+1993-10-22,30.50,31.50,29.75,30.25,14160000,7.35
+1993-10-21,27.50,31.25,27.25,30.25,22417600,7.35
+1993-10-20,28.00,28.25,27.25,27.75,4956400,6.74
+1993-10-19,28.25,28.50,27.25,27.75,7643200,6.74
+1993-10-18,28.00,28.75,27.75,28.37,11900000,6.89
+1993-10-15,27.75,28.50,26.75,28.25,34136400,6.86
+1993-10-14,24.00,24.50,23.50,23.75,5749200,5.77
+1993-10-13,24.25,24.25,23.50,24.00,6322400,5.83
+1993-10-12,24.00,25.00,23.75,24.00,10952400,5.83
+1993-10-11,22.75,24.00,22.75,23.75,5775200,5.77
+1993-10-08,23.25,23.25,22.25,22.62,4989200,5.49
+1993-10-07,23.50,23.75,22.75,23.00,4828000,5.59
+1993-10-06,23.75,24.00,23.37,23.62,6271200,5.74
+1993-10-05,23.00,24.00,23.00,23.50,6306400,5.71
+1993-10-04,22.62,23.00,22.00,22.75,6891200,5.53
+1993-10-01,22.75,23.00,22.50,22.75,12022000,5.53
+1993-09-30,24.00,24.00,23.00,23.37,9828000,5.68
+1993-09-29,24.25,24.87,23.75,23.87,8463600,5.80
+1993-09-28,24.75,25.00,24.25,24.75,3386400,6.01
+1993-09-27,25.00,25.25,24.25,24.75,4043200,6.01
+1993-09-24,25.00,25.25,24.50,25.00,2743200,6.07
+1993-09-23,25.50,25.50,24.50,24.75,4697600,6.01
+1993-09-22,24.25,25.50,24.25,25.50,3960800,6.19
+1993-09-21,24.75,25.25,23.87,24.50,5250000,5.95
+1993-09-20,25.25,25.50,24.75,24.87,3968800,6.04
+1993-09-17,24.37,25.50,24.25,25.25,6157600,6.13
+1993-09-16,24.25,25.00,24.25,24.75,3086800,6.01
+1993-09-15,24.50,25.00,23.50,24.50,9206800,5.95
+1993-09-14,24.25,25.00,24.00,24.25,9880000,5.89
+1993-09-13,26.25,26.50,24.75,25.25,9143600,6.13
+1993-09-10,26.25,26.25,25.37,26.25,4804800,6.38
+1993-09-09,26.75,27.00,26.00,26.00,5352000,6.31
+1993-09-08,26.25,27.00,26.00,26.75,8102000,6.50
+1993-09-07,26.00,27.00,25.75,26.25,5130000,6.38
+1993-09-03,26.00,26.00,25.25,25.75,5830000,6.25
+1993-09-02,26.00,26.25,25.25,25.75,10081200,6.25
+1993-09-01,26.50,26.75,25.75,26.12,8065200,6.34
+1993-08-31,26.50,26.75,26.00,26.50,4570800,6.44
+1993-08-30,26.50,26.50,25.87,26.00,9785600,6.31
+1993-08-27,27.00,27.00,26.25,26.50,6676400,6.44
+1993-08-26,27.25,27.25,26.50,26.87,6296800,6.53
+1993-08-25,28.00,28.25,26.75,27.25,5209200,6.62
+1993-08-24,28.25,28.75,27.75,28.00,3625600,6.80
+1993-08-23,28.00,28.75,27.50,28.37,3265600,6.89
+1993-08-20,27.75,28.00,27.00,28.00,3574400,6.80
+1993-08-19,28.75,28.75,27.50,27.50,5452000,6.68
+1993-08-18,29.00,29.75,28.25,28.50,6751200,6.92
+1993-08-17,27.75,28.50,27.25,28.37,3876800,6.89
+1993-08-16,27.50,28.00,27.25,27.50,3669200,6.68
+1993-08-13,26.50,27.75,26.25,27.37,4978800,6.62
+1993-08-12,27.50,27.75,26.00,26.50,12098800,6.41
+1993-08-11,28.50,28.50,27.00,27.50,5965200,6.65
+1993-08-10,29.50,29.75,28.25,28.50,5465600,6.89
+1993-08-09,29.25,30.25,29.00,29.75,5767600,7.19
+1993-08-06,29.25,30.25,29.25,29.25,4506800,7.07
+1993-08-05,30.75,30.75,29.00,29.50,7498800,7.13
+1993-08-04,29.25,30.50,29.00,30.25,8700000,7.31
+1993-08-03,29.00,29.25,28.75,29.00,6315600,7.01
+1993-08-02,28.25,29.25,28.00,28.50,7728000,6.89
+1993-07-30,27.50,28.25,27.00,27.75,7669200,6.71
+1993-07-29,27.00,27.50,26.75,27.25,4343200,6.59
+1993-07-28,26.25,27.00,26.25,26.87,3300000,6.50
+1993-07-27,26.75,27.50,26.25,26.50,7100800,6.41
+1993-07-26,26.75,27.50,26.00,26.87,5468000,6.50
+1993-07-23,27.00,27.50,26.00,26.25,8365600,6.35
+1993-07-22,26.00,27.00,25.75,26.50,7554400,6.41
+1993-07-21,26.00,26.75,25.50,26.25,16283600,6.35
+1993-07-20,26.25,27.75,25.75,26.87,19017600,6.50
+1993-07-19,28.00,28.75,25.50,25.62,28813200,6.20
+1993-07-16,28.50,29.62,26.50,27.50,75744400,6.65
+1993-07-15,37.25,37.75,35.25,35.75,12091200,8.64
+1993-07-14,36.75,37.50,35.75,37.25,8816800,9.01
+1993-07-13,38.75,38.75,37.00,37.25,5650800,9.01
+1993-07-12,36.75,38.13,36.25,38.00,6215600,9.19
+1993-07-09,37.00,37.25,36.50,36.75,5604400,8.89
+1993-07-08,36.50,37.50,36.25,36.50,4964800,8.83
+1993-07-07,37.50,37.88,36.25,36.50,8124400,8.83
+1993-07-06,38.25,39.00,37.50,37.75,5558800,9.13
+1993-07-02,38.25,38.75,37.75,38.50,6846400,9.31
+1993-07-01,39.00,39.75,38.00,38.00,7809200,9.19
+1993-06-30,38.75,39.75,38.50,39.50,7170000,9.55
+1993-06-29,40.25,40.25,38.50,39.00,10526400,9.43
+1993-06-28,40.50,40.50,38.75,40.13,12645600,9.70
+1993-06-25,40.38,40.75,39.50,40.00,9198000,9.67
+1993-06-24,40.50,41.75,40.00,41.75,7980000,10.10
+1993-06-23,41.75,41.75,40.00,40.50,6462400,9.79
+1993-06-22,40.88,42.00,39.75,41.38,12021200,10.01
+1993-06-21,40.50,40.50,39.50,39.63,9776800,9.58
+1993-06-18,41.63,42.13,39.75,41.00,11138800,9.91
+1993-06-17,42.50,42.50,40.50,41.25,14635600,9.97
+1993-06-16,42.25,43.25,41.50,42.25,12615600,10.22
+1993-06-15,45.25,45.25,41.88,42.00,16018000,10.16
+1993-06-14,44.00,44.75,43.50,44.63,8927600,10.79
+1993-06-11,45.00,45.25,43.38,43.75,8662400,10.58
+1993-06-10,43.50,44.75,42.75,44.50,19783600,10.76
+1993-06-09,45.00,45.63,44.00,44.25,42090000,10.70
+1993-06-08,48.75,50.00,48.00,49.50,22194400,11.97
+1993-06-07,54.50,54.75,50.38,50.75,17239200,12.27
+1993-06-04,55.75,56.25,54.50,54.88,7649200,13.27
+1993-06-03,57.00,57.25,56.00,56.38,5603200,13.63
+1993-06-02,56.75,58.25,56.00,57.00,7160000,13.78
+1993-06-01,56.50,57.75,56.50,57.00,4837600,13.78
+1993-05-28,57.00,57.50,56.25,56.63,6575200,13.69
+1993-05-27,57.75,58.50,57.25,57.50,7049200,13.87
+1993-05-26,56.00,57.75,55.38,57.75,4353600,13.94
+1993-05-25,56.75,57.50,55.75,56.38,6462400,13.60
+1993-05-24,56.75,58.75,56.75,57.63,5373200,13.91
+1993-05-21,58.75,59.13,56.75,57.50,5300000,13.87
+1993-05-20,57.25,59.00,57.25,58.75,10385200,14.18
+1993-05-19,54.75,57.50,54.50,57.25,6176400,13.81
+1993-05-18,55.50,56.25,55.00,55.50,5860000,13.39
+1993-05-17,55.50,56.00,55.00,55.75,2491200,13.45
+1993-05-14,55.25,56.00,55.00,55.50,4212000,13.39
+1993-05-13,53.50,55.75,53.50,55.50,12940800,13.39
+1993-05-12,54.25,54.75,53.00,53.25,3779200,12.85
+1993-05-11,55.00,55.25,54.00,54.50,5665600,13.15
+1993-05-10,55.00,55.88,55.00,55.00,4929200,13.27
+1993-05-07,53.50,54.75,53.50,54.75,2927600,13.21
+1993-05-06,54.50,54.75,53.50,53.75,2536800,12.97
+1993-05-05,53.00,55.50,53.00,54.50,9059200,13.15
+1993-05-04,52.25,54.25,52.00,53.38,6112400,12.88
+1993-05-03,51.25,52.00,51.00,51.88,2332400,12.52
+1993-04-30,50.75,52.50,50.75,51.25,4730000,12.37
+1993-04-29,51.50,51.75,50.13,50.75,2958000,12.25
+1993-04-28,49.75,52.00,49.75,51.38,5846800,12.40
+1993-04-27,48.75,50.25,48.75,50.25,4648800,12.13
+1993-04-26,49.25,49.75,48.50,49.00,3689200,11.82
+1993-04-23,49.75,50.25,48.75,49.25,4808000,11.88
+1993-04-22,49.25,50.50,49.00,50.00,5648800,12.06
+1993-04-21,50.25,50.75,49.25,49.63,7337600,11.98
+1993-04-20,48.75,50.25,48.25,50.00,8580800,12.06
+1993-04-19,48.50,49.50,48.25,48.50,8148000,11.70
+1993-04-16,48.25,48.75,47.38,48.13,24533200,11.61
+1993-04-15,48.25,48.25,46.75,47.25,7816800,11.40
+1993-04-14,48.25,48.75,47.63,48.75,6092400,11.76
+1993-04-13,50.50,51.25,48.25,48.50,5893600,11.70
+1993-04-12,49.50,51.00,49.50,50.00,3324800,12.06
+1993-04-08,50.00,50.50,49.00,49.75,5857600,12.00
+1993-04-07,49.00,50.75,48.50,50.50,5825200,12.19
+1993-04-06,50.00,50.25,48.75,48.75,6020800,11.76
+1993-04-05,50.00,50.50,49.50,50.00,5332000,12.06
+1993-04-02,50.50,51.25,49.50,50.13,9077600,12.10
+1993-04-01,51.25,52.00,51.00,51.75,3878000,12.49
+1993-03-31,52.50,52.75,51.25,51.50,7968800,12.43
+1993-03-30,51.13,52.25,50.25,52.25,9447600,12.61
+1993-03-29,52.25,52.50,50.75,51.00,9362000,12.31
+1993-03-26,54.75,54.75,52.50,53.25,5431200,12.85
+1993-03-25,53.75,54.75,53.50,54.75,6125200,13.21
+1993-03-24,52.75,54.25,52.50,53.75,5126400,12.97
+1993-03-23,53.25,54.00,52.63,52.75,3674400,12.73
+1993-03-22,53.50,53.88,52.75,53.25,5911200,12.85
+1993-03-19,55.00,55.25,53.50,53.75,5516800,12.97
+1993-03-18,55.00,55.63,54.50,54.50,3810800,13.15
+1993-03-17,56.50,57.00,55.00,55.13,6301200,13.30
+1993-03-16,57.25,57.75,56.50,56.50,3626800,13.63
+1993-03-15,56.00,57.25,55.38,57.00,4868800,13.75
+1993-03-12,56.75,56.75,55.50,56.25,4527600,13.57
+1993-03-11,57.00,57.25,56.25,56.88,5167600,13.73
+1993-03-10,56.75,57.25,56.00,56.75,4738800,13.69
+1993-03-09,56.50,57.50,56.50,56.75,5535200,13.69
+1993-03-08,55.00,56.75,55.00,56.50,6322400,13.63
+1993-03-05,54.75,55.75,54.75,55.00,4001200,13.27
+1993-03-04,54.50,55.25,53.50,55.00,6730000,13.27
+1993-03-03,54.00,55.00,53.25,54.63,7261200,13.18
+1993-03-02,53.00,54.50,53.00,54.25,5294400,13.09
+1993-03-01,53.00,53.50,52.75,53.25,4272400,12.85
+1993-02-26,54.25,54.25,52.25,53.00,10538000,12.79
+1993-02-25,53.25,54.75,53.25,54.75,5979200,13.21
+1993-02-24,52.13,53.88,52.13,53.63,10253600,12.94
+1993-02-23,55.00,55.25,54.00,54.25,6937600,13.09
+1993-02-22,55.00,56.00,54.75,55.13,3531200,13.30
+1993-02-19,55.25,55.50,54.75,55.00,6366800,13.27
+1993-02-18,55.00,55.25,53.50,55.00,10006800,13.27
+1993-02-17,53.25,54.00,52.00,53.88,8932400,13.00
+1993-02-16,53.50,53.50,51.50,53.00,14563200,12.79
+1993-02-12,55.00,55.50,53.75,53.88,9855600,13.00
+1993-02-11,55.75,56.25,55.00,55.13,6015200,13.27
+1993-02-10,57.00,57.25,55.00,55.75,9593600,13.42
+1993-02-09,57.00,57.38,56.50,56.88,8525600,13.70
+1993-02-08,57.00,57.50,55.50,56.50,10060000,13.60
+1993-02-05,59.25,59.50,56.25,57.25,13134400,13.78
+1993-02-04,60.00,60.25,59.00,59.50,7453200,14.33
+1993-02-03,61.00,61.00,58.50,60.00,9455200,14.45
+1993-02-02,60.75,61.50,60.25,60.25,6530000,14.51
+1993-02-01,59.25,61.25,59.25,61.25,8608800,14.75
+1993-01-29,60.25,61.25,59.00,59.50,9516800,14.33
+1993-01-28,60.00,60.25,59.25,59.88,6580000,14.42
+1993-01-27,61.00,61.75,58.75,60.25,8101200,14.51
+1993-01-26,60.50,62.00,60.50,60.75,10201200,14.63
+1993-01-25,59.25,60.50,59.25,60.00,7237600,14.45
+1993-01-22,60.25,60.25,59.00,59.50,5252400,14.33
+1993-01-21,59.75,60.25,58.75,60.00,6601200,14.45
+1993-01-20,59.75,60.25,59.50,60.00,5685600,14.45
+1993-01-19,59.75,60.50,59.25,59.75,9802400,14.39
+1993-01-18,59.50,60.00,58.00,59.50,11935600,14.33
+1993-01-15,61.00,62.25,60.00,60.25,32257600,14.51
+1993-01-14,64.00,65.25,63.75,65.00,13145200,15.65
+1993-01-13,61.50,64.00,61.25,63.50,7135600,15.29
+1993-01-12,62.75,63.75,61.50,61.50,12364400,14.81
+1993-01-11,62.00,64.37,61.75,64.12,9785200,15.44
+1993-01-08,60.75,63.00,59.75,62.25,11474400,14.99
+1993-01-07,61.75,62.50,60.63,61.00,9741200,14.69
+1993-01-06,60.75,62.00,60.50,61.75,10055600,14.87
+1993-01-05,58.00,59.25,57.25,59.25,6658800,14.27
+1993-01-04,59.50,60.00,57.75,58.25,4618800,14.03
+1992-12-31,58.75,60.00,58.75,59.75,3302000,14.39
+1992-12-30,59.75,59.75,58.75,58.75,3610800,14.15
+1992-12-29,59.50,60.75,59.50,59.63,4171200,14.36
+1992-12-28,59.25,59.75,59.25,59.50,2536400,14.33
+1992-12-24,60.00,60.00,59.00,59.00,1642400,14.21
+1992-12-23,60.25,60.50,59.25,59.75,4018800,14.39
+1992-12-22,59.75,61.25,59.75,60.63,10009200,14.60
+1992-12-21,58.25,60.00,58.00,59.63,9159200,14.36
+1992-12-18,57.50,59.25,57.25,58.25,8414400,14.03
+1992-12-17,55.25,57.50,55.25,56.88,8370800,13.70
+1992-12-16,56.25,57.00,54.50,55.00,8085200,13.24
+1992-12-15,56.75,57.00,55.50,56.38,6541200,13.57
+1992-12-14,57.50,57.75,56.75,57.25,3962000,13.78
+1992-12-11,57.25,58.25,57.25,57.50,4299200,13.84
+1992-12-10,57.25,57.63,56.50,57.25,5010800,13.78
+1992-12-09,57.75,58.00,57.25,57.63,5700800,13.88
+1992-12-08,57.75,58.75,57.75,58.13,7035600,14.00
+1992-12-07,56.75,57.75,56.75,57.75,5168000,13.90
+1992-12-04,57.25,57.50,56.50,56.88,3432400,13.70
+1992-12-03,56.50,57.63,56.13,57.50,6710800,13.84
+1992-12-02,58.25,58.50,57.00,57.25,3498800,13.78
+1992-12-01,57.25,59.00,56.75,58.25,4652400,14.03
+1992-11-30,56.25,57.50,55.63,57.50,5739200,13.84
+1992-11-27,56.50,57.25,56.25,56.50,1688800,13.57
+1992-11-25,57.00,57.25,56.00,56.50,4208000,13.57
+1992-11-24,57.00,57.50,56.50,57.50,5601200,13.82
+1992-11-23,56.50,57.00,56.25,56.75,5462400,13.63
+1992-11-20,58.50,58.75,57.00,57.50,5572000,13.82
+1992-11-19,57.75,59.50,57.75,58.25,8608000,14.00
+1992-11-18,56.00,58.25,55.50,57.75,10889200,13.88
+1992-11-17,57.25,57.50,54.88,55.25,6045200,13.27
+1992-11-16,56.25,57.75,56.00,57.38,2419200,13.79
+1992-11-13,57.00,57.25,56.00,56.25,3042000,13.51
+1992-11-12,57.00,57.50,56.38,56.88,3844400,13.67
+1992-11-11,56.50,58.25,56.25,56.75,5023600,13.63
+1992-11-10,55.00,56.50,54.75,56.25,4368000,13.51
+1992-11-09,56.00,56.00,54.75,55.25,4052000,13.27
+1992-11-06,54.75,56.50,54.75,55.75,9443200,13.39
+1992-11-05,52.50,55.00,52.50,55.00,10647600,13.21
+1992-11-04,52.00,52.75,52.00,52.50,5086800,12.61
+1992-11-03,52.50,52.50,51.50,52.00,4042000,12.49
+1992-11-02,52.50,52.75,51.75,52.25,6094400,12.55
+1992-10-30,53.50,53.50,52.00,52.50,4657600,12.61
+1992-10-29,52.25,54.00,51.50,53.25,7661200,12.79
+1992-10-28,51.25,52.75,50.75,52.25,7033200,12.55
+1992-10-27,51.50,52.50,51.00,51.50,7575600,12.37
+1992-10-26,48.75,51.50,48.50,51.50,8972000,12.37
+1992-10-23,49.25,49.50,48.25,48.75,3279200,11.71
+1992-10-22,48.50,49.25,48.25,48.75,3026400,11.71
+1992-10-21,49.25,49.50,48.00,48.50,4080800,11.65
+1992-10-20,49.00,50.00,48.50,49.13,10269200,11.80
+1992-10-19,49.00,49.25,48.50,49.00,7002400,11.77
+1992-10-16,46.75,49.50,46.50,49.00,16142000,11.77
+1992-10-15,45.75,46.00,45.25,45.50,2701200,10.93
+1992-10-14,45.25,46.25,45.00,46.00,3429200,11.05
+1992-10-13,44.75,46.00,44.00,45.38,5265600,10.90
+1992-10-12,43.25,44.25,43.25,44.00,2580000,10.57
+1992-10-09,43.50,44.00,43.00,43.38,2108000,10.42
+1992-10-08,44.00,44.25,43.00,43.50,4543200,10.45
+1992-10-07,45.00,45.25,43.50,43.75,4050800,10.51
+1992-10-06,43.75,45.00,42.75,44.75,4058000,10.75
+1992-10-05,43.25,43.75,41.50,43.50,9475600,10.45
+1992-10-02,44.50,44.75,43.00,43.75,4063600,10.51
+1992-10-01,44.75,45.13,44.25,44.25,4396400,10.63
+1992-09-30,45.00,45.50,44.50,45.13,3580800,10.84
+1992-09-29,44.50,45.50,44.00,44.88,5626400,10.78
+1992-09-28,45.00,45.00,43.75,44.75,5351200,10.75
+1992-09-25,46.25,46.50,45.25,45.50,4926400,10.93
+1992-09-24,47.25,47.75,46.25,46.25,4492000,11.11
+1992-09-23,46.00,47.50,45.50,47.50,4443200,11.41
+1992-09-22,46.75,46.75,45.25,45.75,3996800,10.99
+1992-09-21,46.75,47.75,46.25,46.50,3204400,11.17
+1992-09-18,45.75,46.88,45.25,46.50,4133600,11.17
+1992-09-17,47.25,47.25,45.38,46.00,6180000,11.05
+1992-09-16,47.75,48.25,46.50,47.00,6395600,11.29
+1992-09-15,49.25,49.25,47.75,48.25,7806800,11.59
+1992-09-14,49.00,50.00,48.50,49.50,7682400,11.89
+1992-09-11,49.00,49.25,47.50,47.63,6438000,11.44
+1992-09-10,48.00,49.50,47.50,4...
[truncated message content] |
|
From: <md...@us...> - 2008-10-15 12:39:35
|
Revision: 6201
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6201&view=rev
Author: mdboom
Date: 2008-10-15 12:35:23 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Minor code cleanup.
Modified Paths:
--------------
trunk/matplotlib/src/agg_py_path_iterator.h
Modified: trunk/matplotlib/src/agg_py_path_iterator.h
===================================================================
--- trunk/matplotlib/src/agg_py_path_iterator.h 2008-10-15 12:34:59 UTC (rev 6200)
+++ trunk/matplotlib/src/agg_py_path_iterator.h 2008-10-15 12:35:23 UTC (rev 6201)
@@ -360,7 +360,7 @@
double paradNorm2 = paradx*paradx + parady*parady;
m_lastMax = false;
- if (totdot >= 0)
+ if (totdot >= 0.0)
{
if (paradNorm2 > m_dnorm2Max)
{
@@ -388,6 +388,7 @@
#endif
continue;
}
+
//if we get here, then this vector was not similar enough to the
//line we are building, so we need to draw that line and start the
//next one.
@@ -395,7 +396,6 @@
//if the line needs to extend in the opposite direction from the
//direction we are drawing in, move back to we start drawing from
//back there.
-
_push(x, y);
break;
@@ -406,7 +406,7 @@
// m_source->vertex again and segfault.
if (cmd == agg::path_cmd_stop)
{
- if (m_origdNorm2 != 0)
+ if (m_origdNorm2 != 0.0)
{
if (m_haveMin)
{
@@ -432,12 +432,6 @@
}
private:
- VertexSource* m_source;
- bool m_quantize;
- bool m_simplify;
- double m_width, m_height;
-
- static const int m_queue_size = 6;
struct item
{
item() {}
@@ -451,30 +445,37 @@
double x;
double y;
};
- int m_queue_read;
- int m_queue_write;
+
+ VertexSource* m_source;
+ bool m_quantize;
+ bool m_simplify;
+ double m_width, m_height;
+
+ static const int m_queue_size = 6;
+ int m_queue_read;
+ int m_queue_write;
item m_queue[m_queue_size];
- bool m_moveto;
- bool m_after_moveto;
+ bool m_moveto;
+ bool m_after_moveto;
double m_lastx, m_lasty;
- bool m_clipped;
- bool m_do_clipping;
+ bool m_clipped;
+ bool m_do_clipping;
double m_origdx;
double m_origdy;
double m_origdNorm2;
double m_dnorm2Max;
double m_dnorm2Min;
- bool m_haveMin;
- bool m_lastMax;
+ bool m_haveMin;
+ bool m_lastMax;
double m_maxX;
double m_maxY;
double m_minX;
double m_minY;
double m_lastWrittenX;
double m_lastWrittenY;
- bool m_done;
+ bool m_done;
#if DEBUG_SIMPLIFY
unsigned m_pushed;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 12:39:21
|
Revision: 6200
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6200&view=rev
Author: mdboom
Date: 2008-10-15 12:34:59 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Fix typo. (Thanks, Benjamin Drung)
Modified Paths:
--------------
trunk/matplotlib/matplotlibrc.template
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template 2008-10-15 12:28:30 UTC (rev 6199)
+++ trunk/matplotlib/matplotlibrc.template 2008-10-15 12:34:59 UTC (rev 6200)
@@ -4,7 +4,7 @@
# of it on your system in
# site-packages/matplotlib/mpl-data/matplotlibrc. If you edit it
# there, please note that it will be overridden in your next install.
-# If you want to keep a permanent local bopy that will not be
+# If you want to keep a permanent local copy that will not be
# over-written, place it in HOME/.matplotlib/matplotlibrc (unix/linux
# like systems) and C:\Documents and Settings\yourname\.matplotlib
# (win32 systems).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-10-15 12:28:36
|
Revision: 6199
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6199&view=rev
Author: mdboom
Date: 2008-10-15 12:28:30 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Removing old matplotlib.css
Removed Paths:
-------------
trunk/matplotlib/doc/_static/matplotlib.css
Deleted: trunk/matplotlib/doc/_static/matplotlib.css
===================================================================
--- trunk/matplotlib/doc/_static/matplotlib.css 2008-10-15 11:27:38 UTC (rev 6198)
+++ trunk/matplotlib/doc/_static/matplotlib.css 2008-10-15 12:28:30 UTC (rev 6199)
@@ -1,13 +0,0 @@
-@import "default.css";
-
-dl.class, dl.function {
- border-top: 2px solid #888;
-}
-
-dl.method, dl.attribute {
- border-top: 1px solid #aaa;
-}
-
-img.inheritance {
- border: 0px
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 11:27:50
|
Revision: 6198
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6198&view=rev
Author: jdh2358
Date: 2008-10-15 11:27:38 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
more updates to docs
Modified Paths:
--------------
trunk/matplotlib/doc/conf.py
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/pyplots/make.py
trunk/matplotlib/doc/users/index.rst
trunk/matplotlib/doc/users/screenshots.rst
Added Paths:
-----------
trunk/matplotlib/doc/pyplots/plotmap.hires.png
trunk/matplotlib/doc/pyplots/plotmap.pdf
trunk/matplotlib/doc/pyplots/plotmap.png
trunk/matplotlib/doc/pyplots/plotmap.py
trunk/matplotlib/doc/users/toolkits.rst
Modified: trunk/matplotlib/doc/conf.py
===================================================================
--- trunk/matplotlib/doc/conf.py 2008-10-15 03:04:37 UTC (rev 6197)
+++ trunk/matplotlib/doc/conf.py 2008-10-15 11:27:38 UTC (rev 6198)
@@ -152,7 +152,7 @@
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
- ('index', 'Matplotlib.tex', 'Matplotlib', 'Darren Dale, Michael Droettboom, Eric Firing, John Hunter', 'manual'),
+ ('contents', 'Matplotlib.tex', 'Matplotlib', 'Darren Dale, Michael Droettboom, Eric Firing, John Hunter', 'manual'),
]
Modified: trunk/matplotlib/doc/pyplots/README
===================================================================
--- trunk/matplotlib/doc/pyplots/README 2008-10-15 03:04:37 UTC (rev 6197)
+++ trunk/matplotlib/doc/pyplots/README 2008-10-15 11:27:38 UTC (rev 6198)
@@ -4,3 +4,12 @@
tex_demo.py and tex_unicode_demo.py:
latex
dvipng
+
+
+plotmap.py:
+ basemap toolkit
+
+ some data files - do a svn co
+ https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/htdocs/screenshots/data/
+ to get the data and then set the datadir variable in the
+ plotmap.py file to point to this data direcotry
Modified: trunk/matplotlib/doc/pyplots/make.py
===================================================================
--- trunk/matplotlib/doc/pyplots/make.py 2008-10-15 03:04:37 UTC (rev 6197)
+++ trunk/matplotlib/doc/pyplots/make.py 2008-10-15 11:27:38 UTC (rev 6198)
@@ -32,6 +32,10 @@
plt.close('all') # we need to clear between runs
mplshell.magic_run(basename)
for imagefile, dpi in imagefiles.iteritems():
+ # todo: this will get called even if the run script
+ # fails and exits, thus creating a stub pdf and png
+ # iles preventing them from getting built successfully
+ # later
plt.savefig(imagefile, dpi=dpi)
print 'all figures made'
Added: trunk/matplotlib/doc/pyplots/plotmap.hires.png
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/pyplots/plotmap.hires.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/matplotlib/doc/pyplots/plotmap.pdf
===================================================================
--- trunk/matplotlib/doc/pyplots/plotmap.pdf (rev 0)
+++ trunk/matplotlib/doc/pyplots/plotmap.pdf 2008-10-15 11:27:38 UTC (rev 6198)
@@ -0,0 +1,14134 @@
+%PDF-1.4
+%\xAC\xDC \xAB\xBA
+1 0 obj
+<< /Type /Catalog /Pages 3 0 R >>
+endobj
+2 0 obj
+<< /CreationDate (D:20081015040257-07'00')
+/Producer (matplotlib pdf backend)
+/Creator (matplotlib 0.98.3, http://matplotlib.sf.net) >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Type /Page /Resources 10 0 R /Parent 3 0 R
+/MediaBox [ 0 0 576 576 ] >>
+endobj
+10 0 obj
+<< /Pattern 8 0 R /XObject 9 0 R /Font 6 0 R /ExtGState 7 0 R
+/ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >>
+endobj
+5 0 obj
+<< /Filter /FlateDecode /Length 11 0 R >>
+stream
+x\x9C\x9C\xBDK\xD2m\xD9r\x95Y߭\xF8[\xF03ߏ*\x865\x8C
+\xC02\xB3"\x81A\x85\xEE3\xBE\xE1>\xF7\xB9R8~|\xAF\xB5\xE6\xC3\xDF>\xBC\xFD\xFCǟ\xFA\xF3\xFF\xE9\xBF\xFF\xFES~\xCA\xCF?\xFF̽\xF4\xFF\xC9\xFF\x97\xFF\xFE\x93\xFE\xED\xFD_\xFD\xF9\xE7\xDF\xEA\xEF\xFD/\xFD\xFF\xFE3\xF7\xEF\xFA\xB9\xF7w\xAD\xB9FY\xA5\xB1\x8FU~Ͽ\xFA\xD3\xCA?\xF5\xFC\xEE>\xFA\xBC\xFD\xDE\xE5g\xFC\xAE\xCF\xDF\xFE\xE9\xBF\xFE\x85\xCF\xFF\xFB\xF9G\xA5\xFF\xB6\x9F^\xEFoYg׳\xEF\xED?\xFF\xF3\xFF\xF9\xF9/?\xFFM\xEFȷ\xFD/1\xFDM7}\xCB\xF9\xA9\xA5\xFC\xFC\xD7\xFE\xF97\xFF\xA1\xFE\xFC\xBB\xFF\xFE\xF3\x9F>\xFF\xE9\xE7\xFF\xEFo{\xEA\xD4\xDF+}\xB7\xB3\xF5\x9F\xF8\xCAVw\xDF뜥%\xA9\xB3\xFD\xDE=V;\xFA\xC7\xE4\xDAZ[\x87_\xC1^\xCF-\xABk\xAA\xE8\xFB\xB7\xEF1\xCF8\xB3\xB1vu\xD6\xDFQ\xEF\xD0#\xCEf\xF4\xBB\x{126DDA}\xBF\xFD\xAE2z\xD7\xFB\xFA\xF7\xD7\xEF>k\xEAO\xDA
+\xFE\xFE[f\xDDsU\xFD\x8A\xE9\xE3\x9C~\xE7\xACc$\xEF\xFAL\xFD\x95\xBEM\xAF\xB3\xCCsg\xF6\xF1[k\xE7\x91{\xF0\xF8\xF9\xAB\xF7X瞦\x85}\xFC\x9E2ʞg\xF1\xF4\xFE;ǘ\xAD\xB6ڗ\xD9\xF5\xF7W\x99S\xEFW\xA7\xE9\xE5\xB6vƮ\xA3&\xFB]Z\xBDy\xD7\xE9\xA27=m
+\xADe\xE95\xF9W\xD3ה\xF4\xF2\xCBJԪw\xEC柿g\x94\xD2[_Mo_\xB4\xF8W\x8F.\xE3\xF4f\xFE\xFD\xAB\x93UwٵO\xD3\xF52K\xAFP\xFA5\xFF\xFE\x89_<C\xBF_\xD6\xEF=s5}\xED=\xF9\xFCS\xB5wz\xAB+\xBAV\xB9\xE8\x81\xE2\xC8\xE7\xDFq\xDBlm\xD6\xC3I\xFB\xDD\xF5\x9ER\xB4\xB9z\xB7k\xBD\xDBЧ\xF9H\x9D£K\xDD7\xD9\xF52{\xFD*GNG\xA5V}\x8F^p\xE4㧎\xC6ik\x9Fi\xFA\\xB3^\xB4\xBB\x93k\x9F\xCBXw]ӏnQ/\xFA\x80\xF8\xFC\xF5\xDBZ?}\x9Dv\xBB\xE9\xEB\x8Cq\xFB\xE4\xE7r\xF9\xEEe\xC5{>\xBF/\xBD\xFFs>\xF61t0X\xCF`_Kk\xB9\x97\xBEv-WmZ\xF1;9\xFA\xA2\x8F58Z\x8E\}\xADU9\xFA\xD7||mǻ\x99gO\xFC\xAB\xF5\xDAʝ-\xF8\xDB҉/\xBAA\xE6?z`\xAB\x92[\xC7\xC9˷t\x83*\xF7\xC9\xFCG\xECzA=\xBEy\xF5u)f_W\x95\xFCWgW\xE8s\x99\xAE\xF7\xBFu\x9Cu\xE3\xFD\xAF\xB6S\xBF\xB6Σ靗\xABM\xE7~\xC9-mg9\xE2\xEE\xBC\xFF\xFC-z}\xDD\xEEǯ\xAA߫m\xAC\xC9\xFB\x8ERo\xD1>s\xC0\xBC{\xA26[\x87\xB0<\x92\x82\xDA]\x84\xBB{\xF27\xBDnё\x9F=\xE8wkOj?\xC9>\x9B\xF6\xEE\xF6s\xAEɺds\xFD\xFBMv\x9D\xA6vu[\xEE\xF6\xE3\x8B~\xB8\x8E\x9F\xF9ۯ~\xFA\\x9D\x98\xFC\xDA\xEA}{\xD9e&\xFF\xD6rhkˊ\xD7㢜;\xE2\xE6\x8B]\xB5\xEB\xF8\xCF|\xBBz$\xB6\xB6\xCEo\xB0k\xB7\xCA:\xAF]wQ\xD2\xFBW\x8C\x85\xD5\xE8\xDE\xFC%\xC1vu+Ĥ\xD7\xEB\xF7\xFC\xEA\x8Eܡ՞;\xF9\x8F\xEE\xAE>\xB0\x99\xAAEԧH\xD0\xD6|\xBA\x83Vz\xEB\xA2A\x96\x90ں\xF4\xAB\xDD\xFCq\xBD{\xD3\xE6\xEDS?\xFDnI\xB5+\xF6"\xB1\x98\xF4\xA9e\x9AW\xAFįs\xDEtϺ\xB64~^bm\xB3\xF1\x88:\xF1K.IN\xC6y\xF4>X\xABv\xA7\xF8\xB5\xA3I4ܹy\x96\x86\x8C\xF3yq0Ξ\xE3}\xFB\x99\;\xBD\xBE\xB99\xA3\xFA\xEB{<\xEER\xCB\xD2\xFF\x9A\xC1]\xAC0$\xC4\xB7\xDET\xFFrZge%\xF48\x84\xFA\xEFُ\xAD\xBA;\x8D\x97]\x8B\xAC\x9Fh\x8FZ\xF6-e\xEAj
+\xA4$`\xA6.\xCA{u\xAE\xE4\xF7Π\xEBp\xA2\xF5\x93\x9F`\xD7)ns\x9Ddѵ1:\xF0\xBA \x92\xF9\xF3\xBA\x83\xFA9km둀\xD5_\x90\x94\xD1jy[\xF5\xE9C7@\xF2vo\xF3\xF7~ur\xF4}5\xF9%1\xA4=t\xE5\x9B\xF9\xB74\xA3\xDE\xC7\xDF\xFC\xE8\x9B%A\xA0c\xBD\xE8etۗ_
+FGMb~\xED\xEC֦mI\xA9\xFB\xF8o\xE3`J\x8D\x99.Uڥ\xA3\xB8y2Xw\xBD\xD5Z\xA6\xB7&\x81\xB2Ϊ;\xF9\xF5m:Ke\x99.\xFD\xD66"cͷ9: \xD2I:\x9A\xF1\xFBz\xF16tҾ\xEF_XKm\xF00\xBB\xC43\xCAr\xCE\xF3\xD8u,\xB8r3\xE9}\xEA\xED\xA5\xDF\xE3u0\x8F\xCC IVѵ\x92\xCDR潞\xBCR\x8E\xFA\xF6\xAA%\xBA\xEF\xEAo\xAF\xF5^\xBF\xEAN\xCC\x9F\xDF\xE02^\xB4\xDD\xDF\xD7\xD7
+]\xD2\xD3\xF1\xFB\xFA\xFF$\xF5\xB43\xF9\xD18:N\x8D{y\xAA^\xA7k\xF3\xF6\x9D\xEB=\xBFaKl鐟\xBE/Bi \xA2\xBDS\xA8\\xA9iY\x83\xED]\xDF.\xA47\xD9)R/?\xA0+)\x99\xD97
+YK!\xA5p\xE3\xFD%\xE5\x96v\xB7n\x9D\xD3;\xA7K\xFA\xF0\xAE\xE4G*\xE9=u[E\xDF2\xAE$\xB1\xCB\xD9aP\xC0/&A2r\xD3/K;h˭\xAET\xB6\xCF}\xC9^Aݵ\xB9N\xB2/,\xB9\x82\xCA4]\xEF&\xC3Hr\xE9=^\xA7\xA9\x95\xA9\xAC\xA6K-\xC0P("cNT\x87\xC5\xDBMD\xAEԗl\xB3\xF3\xCFf\xC9\xEDj\xBA\x8EE[\xA8\xCF'\x92\x8B$\x9C\xCE:\xCB\xC9\xCF\xCB\xEC\x90\xF2*ߵC\xD3i\x81g|\x9CD\xB1\xEC \xAD\xD5WI\xC0ol\xC3xyifta\xE9O!\xE8\xCE\xE9m\xE79f\x97)\x836\xBFO\x9E\xEBKw\xE8\xAF7\xAF\xBC\xC9\xD0/\xF4\xB6\xF2\xE4t\xC90\xDD#\x9D&\xB3뫵6Z\xFDx\xBAn\x8A\x94\xBF\xE4\xDC\xE5bo\x99B\x92\xF4W\xA6I(c\xD1%tt7\xEA\xBA>K'\xC7\xF7\xD2\xEC\xDA\xAD\xAC\xD6NTT}\xB3\xAE\xECO`\xEB\xB0\xB4Q\xE82\xC2\xF4k[\x879ٻ\x84\x92.=\xA6\x82Į\xF4\x95X\x90L\xEDO\xE6J\xEBe\xEA\xE0\xE9hv}.\xA6JK~\x9D\x93\xC9\xD58\xDDt\xD9<\xB2\xDAnOjv>\xBDxi\x97\xA4\xAAT\xD1\xF2)I\xA1'˭UI\xEC\xF8um\x866\xA6q\x88c\xED\x8AT_\xC78\xBC\xA6co]\xE39r\xEDWY2\x9E\xF4\xEB\xD3t\xA4\x93\xDEm\xA4\xBE\x91\xAA\x97 "\xD3T\xAF\x9F\x8F\xFAm\xD9:5w~H\xC8\xC9T\xD2ُ\xAF\x93!"\xF9\x84\xA6L \x99*\xFA\xB6\xEB[\xAB\xBF.A\xE1\xCEwku\xA8\xF7A\xF3\xEB\x9C \xF1zjc\x8E\xBD>PT\xA4\x8E\x9E\xAF\xF3\xAD\xE3\xA1c\xFDνLd}\xD2\xC4\xCE\xF4\xF7Ih\xEB\xCEI\x93乗!K\xB5Y\xAA\xE9\xF9=\xD4[==\xF9\xA5%G'\xC6\xFC\xF2xz\x91F\x9D\xF5\xF1\xA3b\xC7\xFC#vc\xFB\xBC{\xB7dZ@\xD6W
+W.\x91\x87\x9E\x9A\xFCCϒ1\xA0#\xE2ӣ-\xD1\xEBtX\x82Z
+\xED\xCF\xF0\xF2H\xDBK\x80\xEA;6vb+\x92\xE8\xE0X\xBE\x8E\x88\xAD\xFC\xF5`\x91\x921_\x87\xFA\xD1\xDFX'\xCDPm\x97\xA4\9+VW\x8A\/#[\xE9\xA4\x8BƓE\xC1{\xF5%\xBC%\xD6i\x86K\xC8\xE8v,\xCCX\xAFΔH\x97~lόk\xFB\xEF\xC8\xFAX\xD2\xE1ɿ1\xCD\xF4\x93\xA5\xC6隨\xAD\xC0zN\xCC\xE5ާL\xC6ސ\xFC։;\xFD\xB9\xDAh\xDDLI\x9A8ݺ\xB5r1k\xBE\xBFt\xB0NZY^N\xD3u\xBCu~S\xE7\xC0/\xFDpe^\xE5\xE9\xD2\xCEV|\xD2\xFE\xDE_I\xCB'\xD9q|\xBA\xBAn\x9E\xBEW_\xF9\xBE_\xBB_\x86^_\xBF\xBF\xE4\xE8\xD3\xEFn\xED91KF\x94TV\x9Fq7+*CV\xFB\x99χ\xDB:L
+\xA3\xEA\xDD]\xA9\xAE\xD3\xE3\xD7osz\xE2\xE9\xDAw\xC9_XkR\xE3\xE7\xB7 |
|
From: <jd...@us...> - 2008-10-15 03:04:44
|
Revision: 6197
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6197&view=rev
Author: jdh2358
Date: 2008-10-15 03:04:37 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
updated slider widget example
Added Paths:
-----------
trunk/matplotlib/examples/widgets/slider_demo.py
Removed Paths:
-------------
trunk/matplotlib/examples/widgets/sliders.py
Added: trunk/matplotlib/examples/widgets/slider_demo.py
===================================================================
--- trunk/matplotlib/examples/widgets/slider_demo.py (rev 0)
+++ trunk/matplotlib/examples/widgets/slider_demo.py 2008-10-15 03:04:37 UTC (rev 6197)
@@ -0,0 +1,43 @@
+from pylab import *
+from matplotlib.widgets import Slider, Button, RadioButtons
+
+ax = subplot(111)
+subplots_adjust(left=0.25, bottom=0.25)
+t = arange(0.0, 1.0, 0.001)
+a0 = 5
+f0 = 3
+s = a0*sin(2*pi*f0*t)
+l, = plot(t,s, lw=2, color='red')
+axis([0, 1, -10, 10])
+
+axcolor = 'lightgoldenrodyellow'
+axfreq = axes([0.25, 0.1, 0.65, 0.03], axisbg=axcolor)
+axamp = axes([0.25, 0.15, 0.65, 0.03], axisbg=axcolor)
+
+sfreq = Slider(axfreq, 'Freq', 0.1, 30.0, valinit=f0)
+samp = Slider(axamp, 'Amp', 0.1, 10.0, valinit=a0)
+
+def update(val):
+ amp = samp.val
+ freq = sfreq.val
+ l.set_ydata(amp*sin(2*pi*freq*t))
+ draw()
+sfreq.on_changed(update)
+samp.on_changed(update)
+
+resetax = axes([0.8, 0.025, 0.1, 0.04])
+button = Button(resetax, 'Reset', color=axcolor, hovercolor=0.975)
+def reset(event):
+ sfreq.reset()
+ samp.reset()
+button.on_clicked(reset)
+
+rax = axes([0.025, 0.5, 0.15, 0.15], axisbg=axcolor)
+radio = RadioButtons(rax, ('red', 'blue', 'green'), active=0)
+def colorfunc(label):
+ l.set_color(label)
+ draw()
+radio.on_clicked(colorfunc)
+
+show()
+
Deleted: trunk/matplotlib/examples/widgets/sliders.py
===================================================================
--- trunk/matplotlib/examples/widgets/sliders.py 2008-10-15 03:01:07 UTC (rev 6196)
+++ trunk/matplotlib/examples/widgets/sliders.py 2008-10-15 03:04:37 UTC (rev 6197)
@@ -1,36 +0,0 @@
-from pylab import *
-from matplotlib.widgets import Slider, Button
-
-ax = subplot(111)
-subplots_adjust(bottom=0.25)
-t = arange(0.0, 1.0, 0.001)
-s = sin(2*pi*t)
-l, = plot(t,s, lw=2)
-axis([0, 1, -10, 10])
-
-axcolor = 'lightgoldenrodyellow'
-axfreq = axes([0.125, 0.1, 0.775, 0.03], axisbg=axcolor)
-axamp = axes([0.125, 0.15, 0.775, 0.03], axisbg=axcolor)
-
-sfreq = Slider(axfreq, 'Freq', 0.1, 30.0, valinit=1, facecolor='blue', alpha=0.5)
-samp = Slider(axamp, 'Amp', 0.1, 10.0, valinit=1, facecolor='red', alpha=0.5)
-
-def update(val):
- amp = samp.val
- freq = sfreq.val
- l.set_ydata(amp*sin(2*pi*freq*t))
- draw()
-sfreq.on_changed(update)
-samp.on_changed(update)
-
-resetax = axes([0.8, 0.025, 0.1, 0.04])
-button = Button(resetax, 'Reset')
-
-def reset(event):
- sfreq.reset()
- samp.reset()
-button.on_clicked(reset)
-
-
-show()
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 03:01:13
|
Revision: 6196
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6196&view=rev
Author: jdh2358
Date: 2008-10-15 03:01:07 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
minor fixes to docs
Modified Paths:
--------------
trunk/matplotlib/doc/users/screenshots.rst
Modified: trunk/matplotlib/doc/users/screenshots.rst
===================================================================
--- trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 02:52:29 UTC (rev 6195)
+++ trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 03:01:07 UTC (rev 6196)
@@ -126,7 +126,7 @@
and widgets. See matplotlib.widgets and the widget `examples
<examples/widgets>`
-[.. plot:: ../mpl_examples/widgets/slider_demo.py
+.. plot:: ../mpl_examples/widgets/sliders.py
.. _screenshots_fill_demo:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 02:52:33
|
Revision: 6195
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6195&view=rev
Author: jdh2358
Date: 2008-10-15 02:52:29 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
doc updates
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/users/screenshots.rst
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 02:33:38 UTC (rev 6194)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-15 02:52:29 UTC (rev 6195)
@@ -5,7 +5,7 @@
<h3>Need help?</h3>
<p>Join the matplotlib <a
-href="http://sourceforge.net/mail/?group_id=80706">mailing lists</a>
+href="http://sourceforge.net/project/showfiles.php?group_id=80706">mailing lists</a>
<p>You can file bugs and patches on the sourceforge <a href="http://sourceforge.net/tracker/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
Modified: trunk/matplotlib/doc/users/screenshots.rst
===================================================================
--- trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 02:33:38 UTC (rev 6194)
+++ trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 02:52:29 UTC (rev 6195)
@@ -1,3 +1,9 @@
+.. _matplotlibscreenshots:
+
+**********************
+matplotlib screenshots
+**********************
+
Here you will find a host of example figures with the code that
generated them
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 02:33:46
|
Revision: 6194
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6194&view=rev
Author: jdh2358
Date: 2008-10-15 02:33:38 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
using exiting examples rather than new pyplot ones for screenshots
Modified Paths:
--------------
trunk/matplotlib/doc/users/intro.rst
trunk/matplotlib/doc/users/screenshots.rst
Removed Paths:
-------------
trunk/matplotlib/doc/pyplots/screenshots_barchart_demo.py
trunk/matplotlib/doc/pyplots/screenshots_date_demo.py
trunk/matplotlib/doc/pyplots/screenshots_ellipse_demo.py
trunk/matplotlib/doc/pyplots/screenshots_fill_demo.py
trunk/matplotlib/doc/pyplots/screenshots_histogram_demo.py
trunk/matplotlib/doc/pyplots/screenshots_path_patch_demo.py
trunk/matplotlib/doc/pyplots/screenshots_pie_demo.py
trunk/matplotlib/doc/pyplots/screenshots_scatter_demo.py
trunk/matplotlib/doc/pyplots/screenshots_simple_plots.py
trunk/matplotlib/doc/pyplots/screenshots_slider_demo.py
trunk/matplotlib/doc/pyplots/screenshots_subplot_demo.py
trunk/matplotlib/doc/pyplots/screenshots_table_demo.py
Deleted: trunk/matplotlib/doc/pyplots/screenshots_barchart_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_barchart_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_barchart_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,24 +0,0 @@
-# a bar plot with errorbars
-# a bar plot with errorbars
-from pylab import *
-
-N = 5
-menMeans = (20, 35, 30, 35, 27)
-menStd = ( 2, 3, 4, 1, 2)
-
-ind = arange(N) # the x locations for the groups
-width = 0.35 # the width of the bars
-p1 = bar(ind, menMeans, width, color='r', yerr=menStd)
-
-womenMeans = (25, 32, 34, 20, 25)
-womenStd = ( 3, 5, 2, 3, 3)
-p2 = bar(ind+width, womenMeans, width, color='y', yerr=womenStd)
-
-ylabel('Scores')
-title('Scores by group and gender')
-xticks(ind+width, ('G1', 'G2', 'G3', 'G4', 'G5') )
-xlim(-width,len(ind))
-yticks(arange(0,41,10))
-
-legend( (p1[0], p2[0]), ('Men', 'Women'), shadow=True)
-show()
Deleted: trunk/matplotlib/doc/pyplots/screenshots_date_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_date_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_date_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-"""
-Show how to make date plots in matplotlib using date tick locators and
-formatters. See major_minor_demo1.py for more information on
-controlling major and minor ticks
-
-All matplotlib date plotting is done by converting date instances into
-days since the 0001-01-01 UTC. The conversion, tick locating and
-formatting is done behind the scenes so this is most transparent to
-you. The dates module provides several converter functions date2num
-and num2date
-
-"""
-
-import datetime
-import matplotlib.pyplot as plt
-import matplotlib.dates as mdates
-import matplotlib.mlab as mlab
-
-years = mdates.YearLocator() # every year
-months = mdates.MonthLocator() # every month
-yearsFmt = mdates.DateFormatter('%Y')
-
-intc = mlab.csv2rec('mpl_examples/data/intc.csv')
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
-ax.plot(intc.date, intc.adj_close)
-
-# format the ticks
-ax.xaxis.set_major_locator(years)
-ax.xaxis.set_major_formatter(yearsFmt)
-ax.xaxis.set_minor_locator(months)
-ax.autoscale_view()
-
-# format the coords message box
-def price(x): return '$%1.2f'%x
-ax.format_xdata = mdates.DateFormatter('%Y-%m-%d')
-ax.format_ydata = price
-
-ax.grid(True)
-plt.show()
Deleted: trunk/matplotlib/doc/pyplots/screenshots_ellipse_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_ellipse_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_ellipse_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,149 +0,0 @@
-
-# This example can be boiled down to a more simplistic example
-# to show the problem, but bu including the upper and lower
-# bound ellipses, it demonstrates how significant this error
-# is to our plots.
-
-import math
-from pylab import *
-from matplotlib.patches import Ellipse, Arc
-
-# given a point x, y
-x = 2692.440
-y = 6720.850
-
-# get is the radius of a circle through this point
-r = math.sqrt( x*x+y*y )
-
-# show some comparative circles
-delta = 6
-
-
-##################################################
-def custom_ellipse( ax, x, y, major, minor, theta, numpoints = 750, **kwargs ):
- xs = []
- ys = []
- incr = 2.0*math.pi / numpoints
- incrTheta = 0.0
- while incrTheta <= (2.0*math.pi):
- a = major * math.cos( incrTheta )
- b = minor * math.sin( incrTheta )
- l = math.sqrt( ( a**2 ) + ( b**2 ) )
- phi = math.atan2( b, a )
- incrTheta += incr
-
- xs.append( x + ( l * math.cos( theta + phi ) ) )
- ys.append( y + ( l * math.sin( theta + phi ) ) )
- # end while
-
- incrTheta = 2.0*math.pi
- a = major * math.cos( incrTheta )
- b = minor * math.sin( incrTheta )
- l = sqrt( ( a**2 ) + ( b**2 ) )
- phi = math.atan2( b, a )
- xs.append( x + ( l * math.cos( theta + phi ) ) )
- ys.append( y + ( l * math.sin( theta + phi ) ) )
-
- ellipseLine = ax.plot( xs, ys, **kwargs )
-
-
-
-
-##################################################
-# make the axes
-ax1 = subplot( 311, aspect='equal' )
-ax1.set_aspect( 'equal', 'datalim' )
-
-# make the lower-bound ellipse
-diam = (r - delta) * 2.0
-lower_ellipse = Ellipse( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkgreen" )
-ax1.add_patch( lower_ellipse )
-
-# make the target ellipse
-diam = r * 2.0
-target_ellipse = Ellipse( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkred" )
-ax1.add_patch( target_ellipse )
-
-# make the upper-bound ellipse
-diam = (r + delta) * 2.0
-upper_ellipse = Ellipse( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkblue" )
-ax1.add_patch( upper_ellipse )
-
-# make the target
-diam = delta * 2.0
-target = Ellipse( (x, y), diam, diam, 0.0, fill=False, edgecolor="#DD1208" )
-ax1.add_patch( target )
-
-# give it a big marker
-ax1.plot( [x], [y], marker='x', linestyle='None', mfc='red', mec='red', markersize=10 )
-
-##################################################
-# make the axes
-ax = subplot( 312, aspect='equal' , sharex=ax1, sharey=ax1)
-ax.set_aspect( 'equal', 'datalim' )
-
-# make the lower-bound arc
-diam = (r - delta) * 2.0
-lower_arc = Arc( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkgreen" )
-ax.add_patch( lower_arc )
-
-# make the target arc
-diam = r * 2.0
-target_arc = Arc( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkred" )
-ax.add_patch( target_arc )
-
-# make the upper-bound arc
-diam = (r + delta) * 2.0
-upper_arc = Arc( (0.0, 0.0), diam, diam, 0.0, fill=False, edgecolor="darkblue" )
-ax.add_patch( upper_arc )
-
-# make the target
-diam = delta * 2.0
-target = Arc( (x, y), diam, diam, 0.0, fill=False, edgecolor="#DD1208" )
-ax.add_patch( target )
-
-# give it a big marker
-ax.plot( [x], [y], marker='x', linestyle='None', mfc='red', mec='red', markersize=10 )
-
-
-
-
-
-##################################################
-# now lets do the same thing again using a custom ellipse function
-
-
-
-# make the axes
-ax = subplot( 313, aspect='equal', sharex=ax1, sharey=ax1 )
-ax.set_aspect( 'equal', 'datalim' )
-
-# make the lower-bound ellipse
-custom_ellipse( ax, 0.0, 0.0, r-delta, r-delta, 0.0, color="darkgreen" )
-
-# make the target ellipse
-custom_ellipse( ax, 0.0, 0.0, r, r, 0.0, color="darkred" )
-
-# make the upper-bound ellipse
-custom_ellipse( ax, 0.0, 0.0, r+delta, r+delta, 0.0, color="darkblue" )
-
-# make the target
-custom_ellipse( ax, x, y, delta, delta, 0.0, color="#BB1208" )
-
-# give it a big marker
-ax.plot( [x], [y], marker='x', linestyle='None', mfc='red', mec='red', markersize=10 )
-
-
-# give it a big marker
-ax.plot( [x], [y], marker='x', linestyle='None', mfc='red', mec='red', markersize=10 )
-
-##################################################
-# lets zoom in to see the area of interest
-
-ax1.set_xlim(2650, 2735)
-ax1.set_ylim(6705, 6735)
-
-savefig("ellipse")
-show()
-
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_fill_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_fill_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_fill_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,7 +0,0 @@
-from pylab import *
-t = arange(0.0, 1.01, 0.01)
-s = sin(2*2*pi*t)
-
-fill(t, s*exp(-5*t), 'r')
-grid(True)
-show()
Deleted: trunk/matplotlib/doc/pyplots/screenshots_histogram_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_histogram_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_histogram_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,20 +0,0 @@
-from matplotlib import rcParams
-from pylab import *
-
-
-mu, sigma = 100, 15
-x = mu + sigma*randn(10000)
-
-# the histogram of the data
-n, bins, patches = hist(x, 100, normed=1)
-
-# add a 'best fit' line
-y = normpdf( bins, mu, sigma)
-l = plot(bins, y, 'r--', linewidth=2)
-xlim(40, 160)
-
-xlabel('Smarts')
-ylabel('P')
-title(r'$\rm{IQ:}\/ \mu=100,\/ \sigma=15$')
-
-show()
Deleted: trunk/matplotlib/doc/pyplots/screenshots_path_patch_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_path_patch_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_path_patch_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,36 +0,0 @@
-import numpy as np
-import matplotlib.path as mpath
-import matplotlib.patches as mpatches
-import matplotlib.pyplot as plt
-
-Path = mpath.Path
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
-
-pathdata = [
- (Path.MOVETO, (1.58, -2.57)),
- (Path.CURVE4, (0.35, -1.1)),
- (Path.CURVE4, (-1.75, 2.0)),
- (Path.CURVE4, (0.375, 2.0)),
- (Path.LINETO, (0.85, 1.15)),
- (Path.CURVE4, (2.2, 3.2)),
- (Path.CURVE4, (3, 0.05)),
- (Path.CURVE4, (2.0, -0.5)),
- (Path.CLOSEPOLY, (1.58, -2.57)),
- ]
-
-codes, verts = zip(*pathdata)
-path = mpath.Path(verts, codes)
-patch = mpatches.PathPatch(path, facecolor='red', edgecolor='yellow', alpha=0.5)
-ax.add_patch(patch)
-
-x, y = zip(*path.vertices)
-line, = ax.plot(x, y, 'go-')
-ax.grid()
-ax.set_xlim(-3,4)
-ax.set_ylim(-3,4)
-ax.set_title('spline paths')
-plt.show()
-
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_pie_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_pie_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_pie_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,26 +0,0 @@
-"""
-Make a pie chart - see
-http://matplotlib.sf.net/matplotlib.pylab.html#-pie for the docstring.
-
-This example shows a basic pie chart with labels optional features,
-like autolabeling the percentage, offsetting a slice with "explode"
-and adding a shadow.
-
-Requires matplotlib0-0.70 or later
-
-"""
-from pylab import *
-
-# make a square figure and axes
-figure(1, figsize=(6,6))
-ax = axes([0.1, 0.1, 0.8, 0.8])
-
-labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
-fracs = [15,30,45, 10]
-
-explode=(0, 0.05, 0, 0)
-pie(fracs, explode=explode, labels=labels, autopct='%1.1f%%', shadow=True)
-title('Raining Hogs and Dogs', bbox={'facecolor':'0.8', 'pad':5})
-
-show()
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_scatter_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_scatter_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_scatter_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,28 +0,0 @@
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
-
-intc = mlab.csv2rec('mpl_examples/data/intc.csv')
-
-delta1 = np.diff(intc.adj_close)/intc.adj_close[:-1]
-
-# size in points ^2
-volume = (15*intc.volume[:-2]/intc.volume[0])**2
-close = 0.003*intc.close[:-2]/0.003*intc.open[:-2]
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
-ax.scatter(delta1[:-1], delta1[1:], c=close, s=volume, alpha=0.75)
-
-#ticks = arange(-0.06, 0.061, 0.02)
-#xticks(ticks)
-#yticks(ticks)
-
-ax.set_xlabel(r'$\Delta_i$', fontsize=20)
-ax.set_ylabel(r'$\Delta_{i+1}$', fontsize=20)
-ax.set_title('Volume and percent change')
-ax.grid(True)
-
-plt.show()
-
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_simple_plots.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_simple_plots.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_simple_plots.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,11 +0,0 @@
-from pylab import *
-
-t = arange(0.0, 2.0, 0.01)
-s = sin(2*pi*t)
-plot(t, s, linewidth=1.0)
-
-xlabel('time (s)')
-ylabel('voltage (mV)')
-title('About as simple as it gets, folks')
-grid(True)
-show()
Deleted: trunk/matplotlib/doc/pyplots/screenshots_slider_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_slider_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_slider_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,43 +0,0 @@
-from pylab import *
-from matplotlib.widgets import Slider, Button, RadioButtons
-
-ax = subplot(111)
-subplots_adjust(left=0.25, bottom=0.25)
-t = arange(0.0, 1.0, 0.001)
-a0 = 5
-f0 = 3
-s = a0*sin(2*pi*f0*t)
-l, = plot(t,s, lw=2, color='red')
-axis([0, 1, -10, 10])
-
-axcolor = 'lightgoldenrodyellow'
-axfreq = axes([0.25, 0.1, 0.65, 0.03], axisbg=axcolor)
-axamp = axes([0.25, 0.15, 0.65, 0.03], axisbg=axcolor)
-
-sfreq = Slider(axfreq, 'Freq', 0.1, 30.0, valinit=f0)
-samp = Slider(axamp, 'Amp', 0.1, 10.0, valinit=a0)
-
-def update(val):
- amp = samp.val
- freq = sfreq.val
- l.set_ydata(amp*sin(2*pi*freq*t))
- draw()
-sfreq.on_changed(update)
-samp.on_changed(update)
-
-resetax = axes([0.8, 0.025, 0.1, 0.04])
-button = Button(resetax, 'Reset', color=axcolor, hovercolor=0.975)
-def reset(event):
- sfreq.reset()
- samp.reset()
-button.on_clicked(reset)
-
-rax = axes([0.025, 0.5, 0.15, 0.15], axisbg=axcolor)
-radio = RadioButtons(rax, ('red', 'blue', 'green'), active=0)
-def colorfunc(label):
- l.set_color(label)
- draw()
-radio.on_clicked(colorfunc)
-
-show()
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_subplot_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_subplot_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_subplot_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-from pylab import *
-
-def f(t):
- s1 = cos(2*pi*t)
- e1 = exp(-t)
- return multiply(s1,e1)
-
-t1 = arange(0.0, 5.0, 0.1)
-t2 = arange(0.0, 5.0, 0.02)
-t3 = arange(0.0, 2.0, 0.01)
-
-subplot(211)
-plot(t1, f(t1), 'bo', t2, f(t2), 'k--', markerfacecolor='green')
-grid(True)
-title('A tale of 2 subplots')
-ylabel('Damped oscillation')
-
-subplot(212)
-plot(t3, cos(2*pi*t3), 'r.')
-grid(True)
-xlabel('time (s)')
-ylabel('Undamped')
-show()
-
Deleted: trunk/matplotlib/doc/pyplots/screenshots_table_demo.py
===================================================================
--- trunk/matplotlib/doc/pyplots/screenshots_table_demo.py 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/pyplots/screenshots_table_demo.py 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,94 +0,0 @@
-#!/usr/bin/env python
-import matplotlib
-
-from pylab import *
-from matplotlib.colors import colorConverter
-
-
-#Some simple functions to generate colours.
-def pastel(colour, weight=2.4):
- """ Convert colour into a nice pastel shade"""
- rgb = asarray(colorConverter.to_rgb(colour))
- # scale colour
- maxc = max(rgb)
- if maxc < 1.0 and maxc > 0:
- # scale colour
- scale = 1.0 / maxc
- rgb = rgb * scale
- # now decrease saturation
- total = sum(rgb)
- slack = 0
- for x in rgb:
- slack += 1.0 - x
-
- # want to increase weight from total to weight
- # pick x s.t. slack * x == weight - total
- # x = (weight - total) / slack
- x = (weight - total) / slack
-
- rgb = [c + (x * (1.0-c)) for c in rgb]
-
- return rgb
-
-def get_colours(n):
- """ Return n pastel colours. """
- base = asarray([[1,0,0], [0,1,0], [0,0,1]])
-
- if n <= 3:
- return base[0:n]
-
- # how many new colours to we need to insert between
- # red and green and between green and blue?
- needed = (((n - 3) + 1) / 2, (n - 3) / 2)
-
- colours = []
- for start in (0, 1):
- for x in linspace(0, 1, needed[start]+2):
- colours.append((base[start] * (1.0 - x)) +
- (base[start+1] * x))
-
- return [pastel(c) for c in colours[0:n]]
-
-
-
-axes([0.2, 0.2, 0.7, 0.6]) # leave room below the axes for the table
-
-data = [[ 66386, 174296, 75131, 577908, 32015],
- [ 58230, 381139, 78045, 99308, 160454],
- [ 89135, 80552, 152558, 497981, 603535],
- [ 78415, 81858, 150656, 193263, 69638],
- [ 139361, 331509, 343164, 781380, 52269]]
-
-colLabels = ('Freeze', 'Wind', 'Flood', 'Quake', 'Hail')
-rowLabels = ['%d year' % x for x in (100, 50, 20, 10, 5)]
-
-# Get some pastel shades for the colours
-colours = get_colours(len(colLabels))
-colours.reverse()
-rows = len(data)
-
-ind = arange(len(colLabels)) + 0.3 # the x locations for the groups
-cellText = []
-width = 0.4 # the width of the bars
-yoff = array([0.0] * len(colLabels)) # the bottom values for stacked bar chart
-for row in xrange(rows):
- bar(ind, data[row], width, bottom=yoff, color=colours[row])
- yoff = yoff + data[row]
- cellText.append(['%1.1f' % (x/1000.0) for x in yoff])
-
-# Add a table at the bottom of the axes
-colours.reverse()
-cellText.reverse()
-the_table = table(cellText=cellText,
- rowLabels=rowLabels, rowColours=colours,
- colLabels=colLabels,
- loc='bottom')
-ylabel("Loss $1000's")
-vals = arange(0, 2500, 500)
-yticks(vals*1000, ['%d' % val for val in vals])
-xticks([])
-title('Loss by Disaster')
-#savefig('table_demo_small', dpi=75)
-#savefig('table_demo_large', dpi=300)
-
-show()
Modified: trunk/matplotlib/doc/users/intro.rst
===================================================================
--- trunk/matplotlib/doc/users/intro.rst 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/users/intro.rst 2008-10-15 02:33:38 UTC (rev 6194)
@@ -2,11 +2,11 @@
============
matplotlib is a library for making 2D plots of arrays in `Python
-<http://www.python.org>`_. Although it has its origins in emulating
-the `MATLAB™ <http://www.mathworks.com>`_ graphics commands, it does
-not require MATLAB, and can be used in a Pythonic, object oriented
+<http://www.python.org>`. Although it has its origins in emulating
+the `MATLAB™ <http://www.mathworks.com>` graphics commands, it is
+independent of MATLAB, and can be used in a Pythonic, object oriented
way. Although matplotlib is written primarily in pure Python, it
-makes heavy use of `NumPy <http://www.numpy.org>`_ and other extension
+makes heavy use of `NumPy <http://www.numpy.org>` and other extension
code to provide good performance even for large arrays.
matplotlib is designed with the philosophy that you should be able to
@@ -25,7 +25,8 @@
programming language, and decided to start over in Python. Python
more than makes up for all of MATLAB's deficiencies as a programming
language, but I was having difficulty finding a 2D plotting package
-(for 3D `VTK <http://www.vtk.org/>`_) more than exceeds all of my needs).
+(for 3D `VTK <http://www.vtk.org/>` more than exceeds all of my
+needs).
When I went searching for a Python plotting package, I had several
requirements:
@@ -57,26 +58,28 @@
The matplotlib code is conceptually divided into three parts: the
*pylab interface* is the set of functions provided by
:mod:`matplotlib.pylab` which allow the user to create plots with code
-quite similar to MATLAB figure generating code. The *matplotlib
-frontend* or *matplotlib API* is the set of classes that do the heavy
-lifting, creating and managing figures, text, lines, plots and so on.
-This is an abstract interface that knows nothing about output. The
-*backends* are device dependent drawing devices, aka renderers, that
-transform the frontend representation to hardcopy or a display device.
-Example backends: PS creates `PostScript®
-<http://http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
-creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
+quite similar to MATLAB figure generating code
+(:ref:`pyplot-tutorial`). The *matplotlib frontend* or *matplotlib
+API* is the set of classes that do the heavy lifting, creating and
+managing figures, text, lines, plots and so on
+(:ref:`artist-tutorial`). This is an abstract interface that knows
+nothing about output. The *backends* are device dependent drawing
+devices, aka renderers, that transform the frontend representation to
+hardcopy or a display device (:ref:`what-is-a-backend`). Example
+backends: PS creates `PostScript®
+<http://http://www.adobe.com/products/postscript/>` hardcopy, SVG
+creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`
hardcopy, Agg creates PNG output using the high quality `Anti-Grain
-Geometry <http://www.antigrain.com>`_ library that ships with
-matplotlib, GTK embeds matplotlib in a `Gtk+ <http://www.gtk.org/>`_
+Geometry <http://www.antigrain.com>` library that ships with
+matplotlib, GTK embeds matplotlib in a `Gtk+ <http://www.gtk.org/>`
application, GTKAgg uses the Anti-Grain renderer to create a figure
and embed it a Gtk+ application, and so on for `PDF
-<http://www.adobe.com/products/acrobat/adobepdf.html>`_, `WxWidgets
-<http://www.wxpython.org/>`_, `Tkinter
-<http://docs.python.org/lib/module-Tkinter.html>`_ etc.
+<http://www.adobe.com/products/acrobat/adobepdf.html>`, `WxWidgets
+<http://www.wxpython.org/>`, `Tkinter
+<http://docs.python.org/lib/module-Tkinter.html>` etc.
matplotlib is used by many people in many different contexts. Some
-people want to automatically generate PostScript® files to send
+people want to automatically generate PostScript files to send
to a printer or publishers. Others deploy matplotlib on a web
application server to generate PNG output for inclusion in
dynamically-generated web pages. Some use matplotlib interactively
Modified: trunk/matplotlib/doc/users/screenshots.rst
===================================================================
--- trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 02:14:48 UTC (rev 6193)
+++ trunk/matplotlib/doc/users/screenshots.rst 2008-10-15 02:33:38 UTC (rev 6194)
@@ -1,16 +1,13 @@
Here you will find a host of example figures with the code that
generated them
-.. _screenshots_simple_plot:
-
Simple Plot
===========
The most basic :func:`~matplotlib.pyplot.plot`, with text labels
-.. plot:: screenshots_simple_plots.py
+.. plot:: ../mpl_examples/pylab_examples/simple_plot.py
-
.. _screenshots_subplot_demo:
Subplot demo
@@ -19,9 +16,8 @@
Multiple regular axes (numrows by numcolumns) are created with the
:func:`~matplotlib.pyplot.subplot` command.
-.. plot:: screenshots_subplot_demo.py
+.. plot:: ../mpl_examples/pylab_examples/subplot_demo.py
-
.. _screenshots_histogram_demo:
Histograms
@@ -30,8 +26,9 @@
The :func:`~matplotlib.pyplot.hist` command automatically generates
histograms and will return the bin counts or probabilities
-.. plot:: screenshots_histogram_demo.py
+.. plot:: ../mpl_examples/pylab_examples/histogram_demo.py
+
.. _screenshots_path_demo:
Path demo
@@ -40,9 +37,8 @@
You can add aribitrary paths in matplotlib as of release 0.98. See
the :mod:`matplotlib.path`.
-.. plot:: screenshots_path_patch_demo.py
+.. plot:: ../mpl_examples/api/path_patch_demo.py
-
.. _screenshots_ellipse_demo:
Ellipses
@@ -57,9 +53,8 @@
provides a scale free, accurate graph of the arc regardless of zoom
level
-.. plot:: screenshots_ellipse_demo.py
+.. plot:: ../mpl_examples/pylab_examples/ellipse_demo.py
-
.. _screenshots_barchart_demo:
Bar charts
@@ -68,11 +63,11 @@
The :func:`~matplotlib.pyplot.bar`
command takes error bars as an optional argument. You can also use up
and down bars, stacked bars, candlestic' bars, etc, ... See
-`bar_stacked.py <examples/pylab_examples/bar_stacked.py>`_ for another example.
+`bar_stacked.py <examples/pylab_examples/bar_stacked.py>`_ for another example.
You can make horizontal bar charts with the
:func:`~matplotlib.pyplot.barh` command.
-.. plot:: screenshots_barchart_demo.py
+.. plot:: ../mpl_examples/pylab_examples/barchart_demo.py
.. _screenshots_pie_demo:
@@ -87,7 +82,7 @@
Take a close look at the attached code that produced this figure; nine
lines of code.
-.. plot:: screenshots_pie_demo.py
+.. plot:: ../mpl_examples/pylab_examples/pie_demo.py
.. _screenshots_table_demo:
@@ -97,7 +92,7 @@
The :func:`~matplotlib.pyplot.table` command will place a text table
on the axes
-.. plot:: screenshots_table_demo.py
+.. plot:: ../mpl_examples/pylab_examples/table_demo.py
.. _screenshots_scatter_demo:
@@ -112,7 +107,7 @@
alpha attribute is used to make semitransparent circle markers with
the Agg backend (see :ref:`what-is-a-backend`)
-.. plot:: screenshots_scatter_demo.py
+.. plot:: ../mpl_examples/pylab_examples/scatter_demo2.py
.. _screenshots_slider_demo:
@@ -123,9 +118,9 @@
Matplotlib has basic GUI widgets that are independent of the graphical
user interface you are using, allowing you to write cross GUI figures
and widgets. See matplotlib.widgets and the widget `examples
-<examples/widgets>`_
+<examples/widgets>`
-.. plot:: screenshots_slider_demo.py
+[.. plot:: ../mpl_examples/widgets/slider_demo.py
.. _screenshots_fill_demo:
@@ -137,7 +132,7 @@
plot filled polygons. Thanks to Andrew Straw for providing this
function
-.. plot:: screenshots_fill_demo.py
+.. plot:: ../mpl_examples/pylab_examples/fill_demo.py
.. _screenshots_date_demo:
@@ -147,9 +142,9 @@
You can plot date data with major and minor ticks and custom tick
formatters for both the major and minor ticks; see matplotlib.ticker
-and matplotlib.dates for details and usage.
+and matplotlib.dates for details and usage.
-.. plot:: screenshots_date_demo.py
+.. plot:: ../mpl_examples/api/date_demo.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-15 02:14:51
|
Revision: 6193
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6193&view=rev
Author: jdh2358
Date: 2008-10-15 02:14:48 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
added mpl CSS style file
Added Paths:
-----------
trunk/matplotlib/doc/_static/mpl.css
Added: trunk/matplotlib/doc/_static/mpl.css
===================================================================
--- trunk/matplotlib/doc/_static/mpl.css (rev 0)
+++ trunk/matplotlib/doc/_static/mpl.css 2008-10-15 02:14:48 UTC (rev 6193)
@@ -0,0 +1,507 @@
+/**
+ * Alternate Sphinx design
+ * Originally created by Armin Ronacher for Werkzeug, adapted by Georg Brandl.
+ */
+
+body {
+ font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
+ font-size: 14px;
+ letter-spacing: -0.01em;
+ line-height: 150%;
+ text-align: center;
+ /*background-color: #AFC1C4; */
+ background-color: #BFD1D4;
+ color: black;
+ padding: 0;
+ border: 1px solid #aaa;
+
+ margin: 0px 80px 0px 80px;
+ min-width: 740px;
+}
+
+a {
+ color: #CA7900;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #2491CF;
+}
+
+pre {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.015em;
+ padding: 0.5em;
+ border: 1px solid #ccc;
+ background-color: #f8f8f8;
+}
+
+td.linenos pre {
+ padding: 0.5em 0;
+ border: 0;
+ background-color: transparent;
+ color: #aaa;
+}
+
+table.highlighttable {
+ margin-left: 0.5em;
+}
+
+table.highlighttable td {
+ padding: 0 0.5em 0 0.5em;
+}
+
+cite, code, tt {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.01em;
+}
+
+hr {
+ border: 1px solid #abc;
+ margin: 2em;
+}
+
+tt {
+ background-color: #f2f2f2;
+ border-bottom: 1px solid #ddd;
+ color: #333;
+}
+
+tt.descname {
+ background-color: transparent;
+ font-weight: bold;
+ font-size: 1.2em;
+ border: 0;
+}
+
+tt.descclassname {
+ background-color: transparent;
+ border: 0;
+}
+
+tt.xref {
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+}
+
+a tt {
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+ color: #CA7900;
+}
+
+a tt:hover {
+ color: #2491CF;
+}
+
+dl {
+ margin-bottom: 15px;
+}
+
+dd p {
+ margin-top: 0px;
+}
+
+dd ul, dd table {
+ margin-bottom: 10px;
+}
+
+dd {
+ margin-top: 3px;
+ margin-bottom: 10px;
+ margin-left: 30px;
+}
+
+.refcount {
+ color: #060;
+}
+
+dt:target,
+.highlight {
+ background-color: #fbe54e;
+}
+
+dl.class, dl.function {
+ border-top: 2px solid #888;
+}
+
+dl.method, dl.attribute {
+ border-top: 1px solid #aaa;
+}
+
+dl.glossary dt {
+ font-weight: bold;
+ font-size: 1.1em;
+}
+
+pre {
+ line-height: 120%;
+}
+
+pre a {
+ color: inherit;
+ text-decoration: underline;
+}
+
+.first {
+ margin-top: 0 !important;
+}
+
+div.document {
+ background-color: white;
+ text-align: left;
+ background-image: url(contents.png);
+ background-repeat: repeat-x;
+}
+
+/*
+div.documentwrapper {
+ width: 100%;
+}
+*/
+
+div.clearer {
+ clear: both;
+}
+
+div.related h3 {
+ display: none;
+}
+
+div.related ul {
+ background-image: url(navigation.png);
+ height: 2em;
+ list-style: none;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ margin: 0;
+ padding-left: 10px;
+}
+
+div.related ul li {
+ margin: 0;
+ padding: 0;
+ height: 2em;
+ float: left;
+}
+
+div.related ul li.right {
+ float: right;
+ margin-right: 5px;
+}
+
+div.related ul li a {
+ margin: 0;
+ padding: 0 5px 0 5px;
+ line-height: 1.75em;
+ color: #EE9816;
+}
+
+div.related ul li a:hover {
+ color: #3CA8E7;
+}
+
+div.body {
+ margin: 0;
+ padding: 0.5em 20px 20px 20px;
+}
+
+div.bodywrapper {
+ margin: 0 240px 0 0;
+ border-right: 1px solid #ccc;
+}
+
+div.body a {
+ text-decoration: underline;
+}
+
+div.sphinxsidebar {
+ margin: 0;
+ padding: 0.5em 15px 15px 0;
+ width: 210px;
+ float: right;
+ text-align: left;
+/* margin-left: -100%; */
+}
+
+div.sphinxsidebar h4, div.sphinxsidebar h3 {
+ margin: 1em 0 0.5em 0;
+ font-size: 0.9em;
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border: 1px solid #86989B;
+ background-color: #AFC1C4;
+}
+
+div.sphinxsidebar ul {
+ padding-left: 1.5em;
+ margin-top: 7px;
+ list-style: none;
+ padding: 0;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul ul {
+ list-style: square;
+ margin-left: 20px;
+}
+
+p {
+ margin: 0.8em 0 0.5em 0;
+}
+
+p.rubric {
+ font-weight: bold;
+}
+
+h1 {
+ margin: 0;
+ padding: 0.7em 0 0.3em 0;
+ font-size: 1.5em;
+ color: #11557C;
+}
+
+h2 {
+ margin: 1.3em 0 0.2em 0;
+ font-size: 1.35em;
+ padding: 0;
+}
+
+h3 {
+ margin: 1em 0 -0.3em 0;
+ font-size: 1.2em;
+}
+
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+ color: black!important;
+}
+
+h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
+ display: none;
+ margin: 0 0 0 0.3em;
+ padding: 0 0.2em 0 0.2em;
+ color: #aaa!important;
+}
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
+h5:hover a.anchor, h6:hover a.anchor {
+ display: inline;
+}
+
+h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
+h5 a.anchor:hover, h6 a.anchor:hover {
+ color: #777;
+ background-color: #eee;
+}
+
+table {
+ border-collapse: collapse;
+ margin: 0 -0.5em 0 -0.5em;
+}
+
+table td, table th {
+ padding: 0.2em 0.5em 0.2em 0.5em;
+}
+
+div.footer {
+ background-color: #E3EFF1;
+ color: #86989B;
+ padding: 3px 8px 3px 0;
+ clear: both;
+ font-size: 0.8em;
+ text-align: right;
+}
+
+div.footer a {
+ color: #86989B;
+ text-decoration: underline;
+}
+
+div.pagination {
+ margin-top: 2em;
+ padding-top: 0.5em;
+ border-top: 1px solid black;
+ text-align: center;
+}
+
+div.sphinxsidebar ul.toc {
+ margin: 1em 0 1em 0;
+ padding: 0 0 0 0.5em;
+ list-style: none;
+}
+
+div.sphinxsidebar ul.toc li {
+ margin: 0.5em 0 0.5em 0;
+ font-size: 0.9em;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul.toc li p {
+ margin: 0;
+ padding: 0;
+}
+
+div.sphinxsidebar ul.toc ul {
+ margin: 0.2em 0 0.2em 0;
+ padding: 0 0 0 1.8em;
+}
+
+div.sphinxsidebar ul.toc ul li {
+ padding: 0;
+}
+
+div.admonition, div.warning {
+ font-size: 0.9em;
+ margin: 1em 0 0 0;
+ border: 1px solid #86989B;
+ background-color: #f7f7f7;
+}
+
+div.admonition p, div.warning p {
+ margin: 0.5em 1em 0.5em 1em;
+ padding: 0;
+}
+
+div.admonition pre, div.warning pre {
+ margin: 0.4em 1em 0.4em 1em;
+}
+
+div.admonition p.admonition-title,
+div.warning p.admonition-title {
+ margin: 0;
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border-bottom: 1px solid #86989B;
+ font-weight: bold;
+ background-color: #AFC1C4;
+}
+
+div.warning {
+ border: 1px solid #940000;
+}
+
+div.warning p.admonition-title {
+ background-color: #CF0000;
+ border-bottom-color: #940000;
+}
+
+div.admonition ul, div.admonition ol,
+div.warning ul, div.warning ol {
+ margin: 0.1em 0.5em 0.5em 3em;
+ padding: 0;
+}
+
+div.versioninfo {
+ margin: 1em 0 0 0;
+ border: 1px solid #ccc;
+ background-color: #DDEAF0;
+ padding: 8px;
+ line-height: 1.3em;
+ font-size: 0.9em;
+}
+
+
+a.headerlink {
+ color: #c60f0f!important;
+ font-size: 1em;
+ margin-left: 6px;
+ padding: 0 4px 0 4px;
+ text-decoration: none!important;
+ visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+ visibility: visible;
+}
+
+a.headerlink:hover {
+ background-color: #ccc;
+ color: white!important;
+}
+
+table.indextable td {
+ text-align: left;
+ vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+ height: 10px;
+}
+
+table.indextable tr.cap {
+ margin-top: 10px;
+ background-color: #f2f2f2;
+}
+
+img.toggler {
+ margin-right: 3px;
+ margin-top: 3px;
+ cursor: pointer;
+}
+
+img.inheritance {
+ border: 0px
+}
+
+form.pfform {
+ margin: 10px 0 20px 0;
+}
+
+table.contentstable {
+ width: 90%;
+}
+
+table.contentstable p.biglink {
+ line-height: 150%;
+}
+
+a.biglink {
+ font-size: 1.3em;
+}
+
+span.linkdescr {
+ font-style: italic;
+ padding-top: 5px;
+ font-size: 90%;
+}
+
+ul.search {
+ margin: 10px 0 0 20px;
+ padding: 0;
+}
+
+ul.search li {
+ padding: 5px 0 5px 20px;
+ background-image: url(file.png);
+ background-repeat: no-repeat;
+ background-position: 0 7px;
+}
+
+ul.search li a {
+ font-weight: bold;
+}
+
+ul.search li div.context {
+ color: #888;
+ margin: 2px 0 0 30px;
+ text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+ font-weight: bold;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2008-10-14 23:25:38
|
Revision: 6192
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6192&view=rev
Author: efiring
Date: 2008-10-14 23:25:29 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Improve docstrings in nxutils
Modified Paths:
--------------
trunk/matplotlib/src/nxutils.c
Modified: trunk/matplotlib/src/nxutils.c
===================================================================
--- trunk/matplotlib/src/nxutils.c 2008-10-14 22:45:31 UTC (rev 6191)
+++ trunk/matplotlib/src/nxutils.c 2008-10-14 23:25:29 UTC (rev 6192)
@@ -219,9 +219,19 @@
static PyMethodDef module_methods[] = {
{"pnpoly", pnpoly, METH_VARARGS,
- "inside = pnpoly(x, y, xyverts)\nreturn 1 if x,y is inside the polygon defined by the sequence of x,y vertices in xyverts"},
+ "inside = pnpoly(x, y, xyverts)\n\n"
+ "Return 1 if x,y is inside the polygon, 0 otherwise.\n\n"
+ "xyverts is a sequence of x,y vertices.\n\n"
+ "A point on the boundary may be treated as inside or outside.\n"
+ "See http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html"},
{"points_inside_poly", points_inside_poly, METH_VARARGS,
- "mask = points_inside_poly(xypoints, xyverts)\nreturn a mask of length xypoints indicating whether each x,y point is inside the polygon defined by the sequence of x,y vertices in xyverts"},
+ "mask = points_inside_poly(xypoints, xyverts)\n\n"
+ "Return a boolean ndarray, True for points inside the polygon.\n\n"
+ "xypoints is a sequence of N x,y pairs.\n"
+ "xyverts is a sequence of x,y vertices of the polygon.\n"
+ "mask is an ndarray of length N.\n\n"
+ "A point on the boundary may be treated as inside or outside.\n"
+ "See http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html"},
{NULL} /* Sentinel */
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2008-10-14 22:45:52
|
Revision: 6191
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6191&view=rev
Author: efiring
Date: 2008-10-14 22:45:31 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Change nxutils.points_inside_poly to return an array of bool, not int.
Modified Paths:
--------------
trunk/matplotlib/src/nxutils.c
Modified: trunk/matplotlib/src/nxutils.c
===================================================================
--- trunk/matplotlib/src/nxutils.c 2008-10-14 21:20:16 UTC (rev 6190)
+++ trunk/matplotlib/src/nxutils.c 2008-10-14 22:45:31 UTC (rev 6191)
@@ -45,7 +45,7 @@
if (! PyArg_ParseTuple(args, "ddO", &x, &y, &vertsarg))
return NULL;
- verts = (PyArrayObject *) PyArray_FromObject(vertsarg,PyArray_DOUBLE, 2, 2);
+ verts = (PyArrayObject *) PyArray_FromObject(vertsarg,NPY_DOUBLE, 2, 2);
if (verts == NULL)
{
@@ -113,7 +113,7 @@
if (! PyArg_ParseTuple(args, "OO", &xypointsarg, &vertsarg))
return NULL;
- verts = (PyArrayObject *) PyArray_FromObject(vertsarg,PyArray_DOUBLE, 2, 2);
+ verts = (PyArrayObject *) PyArray_FromObject(vertsarg, NPY_DOUBLE, 2, 2);
if (verts == NULL)
{
@@ -158,7 +158,7 @@
//printf("adding vert: %1.3f, %1.3f\n", xv[i], yv[i]);
}
- xypoints = (PyArrayObject *) PyArray_FromObject(xypointsarg,PyArray_DOUBLE, 2, 2);
+ xypoints = (PyArrayObject *) PyArray_FromObject(xypointsarg, NPY_DOUBLE, 2, 2);
if (xypoints == NULL)
{
@@ -187,7 +187,7 @@
npoints = xypoints->dimensions[0];
dimensions[0] = npoints;
- mask = (PyArrayObject *)PyArray_SimpleNew(1,dimensions,PyArray_INT);
+ mask = (PyArrayObject *)PyArray_SimpleNew(1,dimensions, NPY_BOOL);
if (mask==NULL) {
Py_XDECREF(verts);
Py_XDECREF(xypoints);
@@ -200,7 +200,7 @@
y = *(double *)(xypoints->data + i*xypoints->strides[0] + xypoints->strides[1]);
b = pnpoly_api(npol, xv, yv, x, y);
//printf("checking %d, %d, %1.3f, %1.3f, %d\n", npol, npoints, x, y, b);
- *(int *)(mask->data+i*mask->strides[0]) = b;
+ *(char *)(mask->data + i*mask->strides[0]) = b;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-14 21:20:22
|
Revision: 6190
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6190&view=rev
Author: jdh2358
Date: 2008-10-14 21:20:16 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
replaced index with contents for main page
Added Paths:
-----------
trunk/matplotlib/doc/contents.rst
Removed Paths:
-------------
trunk/matplotlib/doc/index.rst
Added: trunk/matplotlib/doc/contents.rst
===================================================================
--- trunk/matplotlib/doc/contents.rst (rev 0)
+++ trunk/matplotlib/doc/contents.rst 2008-10-14 21:20:16 UTC (rev 6190)
@@ -0,0 +1,26 @@
+
+
+Overview
+========
+
+.. htmlonly::
+
+ :Release: |version|
+ :Date: |today|
+
+ Download `PDF <http://matplotlib.sf.net/doc/Matplotlib.pdf>`_
+
+.. toctree::
+ :maxdepth: 2
+
+ users/index.rst
+ faq/index.rst
+ devel/index.rst
+ api/index.rst
+ glossary/index.rst
+
+.. htmlonly::
+
+ * :ref:`genindex`
+ * :ref:`modindex`
+ * :ref:`search`
Deleted: trunk/matplotlib/doc/index.rst
===================================================================
--- trunk/matplotlib/doc/index.rst 2008-10-14 21:17:52 UTC (rev 6189)
+++ trunk/matplotlib/doc/index.rst 2008-10-14 21:20:16 UTC (rev 6190)
@@ -1,26 +0,0 @@
-
-
-Welcome to matplotlib's documentation!
-======================================
-
-.. htmlonly::
-
- :Release: |version|
- :Date: |today|
-
- Download `PDF <http://matplotlib.sf.net/doc/Matplotlib.pdf>`_
-
-.. toctree::
- :maxdepth: 2
-
- users/index.rst
- faq/index.rst
- devel/index.rst
- api/index.rst
- glossary/index.rst
-
-.. htmlonly::
-
- * :ref:`genindex`
- * :ref:`modindex`
- * :ref:`search`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-10-14 21:18:05
|
Revision: 6189
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6189&view=rev
Author: jdh2358
Date: 2008-10-14 21:17:52 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
removed defunct colours mod
Removed Paths:
-------------
trunk/matplotlib/doc/pyplots/colours.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|