Merged revisions 8121,8135 via svnmerge from

leejjoon · leejjoon · commit 068b41693140 · 2010-02-16T23:09:50.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r8121 | jdh2358 | 2010-02-08 12:50:27 -0500 (Mon, 08 Feb 2010) | 1 line added Ariels csd patch for proper scaling at the dc component ........ r8135 | leejjoon | 2010-02-16 17:55:27 -0500 (Tue, 16 Feb 2010) | 1 line fix a bug in Text._get_layout that returns an incorrect information for an empty string ........ svn path=/trunk/matplotlib/; revision=8136
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -146,11 +146,11 @@ generate postscript images from some numerical simulations, and still
 others in web application servers to dynamically serve up graphs.
 
 To support all of these use cases, matplotlib can target different
-outputs, and each of these capabililities is called a backend (the
+outputs, and each of these capabililities is called a backend; the
 "frontend" is the user facing code, ie the plotting code, whereas the
 "backend" does all the dirty work behind the scenes to make the
 figure.  There are two types of backends: user interface backends (for
-use in pygtk, wxpython, tkinter, qt or fltk) and hardcopy backends to
+use in pygtk, wxpython, tkinter, qt, macosx, or fltk) and hardcopy backends to
 make image files (PNG, SVG, PDF, PS).
 
 There are a two primary ways to configure your backend.  One is to set
@@ -183,10 +183,10 @@ from the canvas (the place where the drawing goes).  The canonical
 renderer for user interfaces is ``Agg`` which uses the `antigrain
 <http://antigrain.html>`_ C++ library to make a raster (pixel) image
 of the figure.  All of the user interfaces can be used with agg
-rendering, eg ``WXAgg``, ``GTKAgg``, ``QTAgg``, ``TkAgg``.  In
-addition, some of the user interfaces support other rendering engines.
-For example, with GTK, you can also select GDK rendering (backend
-``GTK``) or Cairo rendering (backend ``GTKCairo``).
+rendering, eg ``WXAgg``, ``GTKAgg``, ``QTAgg``, ``TkAgg``,
+``CocoaAgg``.  In addition, some of the user interfaces support other
+rendering engines.  For example, with GTK, you can also select GDK
+rendering (backend ``GTK``) or Cairo rendering (backend ``GTKCairo``).
 
 For the rendering engines, one can also distinguish between `vector
 <http://en.wikipedia.org/wiki/Vector_graphics>`_ or `raster
@@ -238,6 +238,7 @@ TkAgg          Agg rendering to a :term:`Tk` canvas (requires TkInter_)
 QtAgg          Agg rendering to a :term:`Qt` canvas (requires PyQt_)
 Qt4Agg         Agg rendering to a :term:`Qt4` canvas (requires PyQt4_)
 FLTKAgg        Agg rendering to a :term:`FLTK` canvas (requires pyFLTK_)
+macosx         Cocoa rendering in OSX windows
 ============   ================================================================
 
 .. _`Anti-Grain Geometry`: http://www.antigrain.com/
diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst
@@ -14,6 +14,11 @@ Glossary
   Cairo
       The `Cairo graphics <http://cairographics.org>`_ engine
 
+
+  dateutil
+      The `dateutil <http://labix.org/python-dateutil>`_ library
+      provides extensions to the standard datetime module
+
   EPS
       Encapsulated Postscript (`EPS <http://en.wikipedia.org/wiki/Encapsulated_PostScript>`_)
 
@@ -86,6 +91,14 @@ Glossary
       language widely used for scripting, application development, web
       application servers, scientific computing and more.
 
+
+  pytz
+      `pytz <http://pytz.sourceforge.net/>`_ provides the Olson tz
+      database in Python. it allows accurate and cross platform
+      timezone calculations and solves the issue of ambiguous times at
+      the end of daylight savings
+
+
   Qt
       `Qt <http://trolltech.com/products/qt/>`__ is a cross-platform
       application framework for desktop and embedded development.
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -44,10 +44,29 @@ progress::
 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, in 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::
+shell for python that is matplotlib aware.
+
+Next we need to get matplotlib installed.  We provide prebuilt
+binaries for OS X and Windows on the matplotlib `download
+<http://sourceforge.net/projects/matplotlib/files/>`_ page.  Click on
+the latest release of the "matplotlib" package, choose your python
+version (2.5 or 2.6) 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>`_.  If
+you are on debian/unbuntu linux, it suffices to do::
+
+  > sudo apt-get install python-matplotlib
+
+Instructions for installing our OSX binaries are found in the FAQ
+:ref:`install_osx_binaries`.
+
+
+Once you have ipython, numpy and matplotlib installed, in 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)
@@ -60,20 +79,6 @@ configuration details for you, so you can get up and running quickly::
 
     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/projects/matplotlib/files/>`_ 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>`_.
-
-Instructions for installing our OSX binaries are found in the FAQ
-ref:`install_osx_binaries`.
-
 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
@@ -85,9 +90,9 @@ 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 latest *tar.gz*
-release file from `sourceforge
+development, running the latest greatest code, or just like to
+build everything yourself, it is not difficult to build matplotlib
+from source.  Grab the latest *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`.
@@ -173,17 +178,17 @@ backends and the capabilities they provide
     agg template source statically, so it will not affect anything on
     your system outside of matplotlib.
 
-pytz 2007g or later
+:term:`pytz` 2007g or later
     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
+    system.  To override the default, use :file:`setup.cfg to force or
     prevent installation of pytz.
 
-dateutil 1.1 or later
-    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.
+:term:`dateutil` 1.1 or later
+    provides 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 :file:`setup.cfg` to force
+    or prevent installation of dateutil.
 
 
 
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -277,10 +277,18 @@ def _spectral_helper(x, y, NFFT=256, Fs=2, detrend=detrend_none,
         Pxy[:,i] = np.conjugate(fx[:numFreqs]) * fy[:numFreqs]
 
     # Scale the spectrum by the norm of the window to compensate for
-    # windowing loss; see Bendat & Piersol Sec 11.5.2.  Also include
-    # scaling factors for one-sided densities and dividing by the sampling
-    # frequency, if desired.
-    Pxy *= scaling_factor / (np.abs(windowVals)**2).sum()
+    # windowing loss; see Bendat & Piersol Sec 11.5.2. 
+    Pxy *= 1 / (np.abs(windowVals)**2).sum()
+
+    # Also include scaling factors for one-sided densities and dividing by the
+    # sampling frequency, if desired. Scale everything, except the DC component
+    # and the NFFT/2 component:    
+    Pxy[1:-1] *= scaling_factor
+
+    #But do scale those components by Fs, if required    
+    if scale_by_freq:
+        Pxy[[0,-1]] /= Fs 
+    
     t = 1./Fs * (ind + NFFT / 2.)
     freqs = float(Fs) / pad_to * np.arange(numFreqs)
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -300,9 +300,13 @@ def get_text_width_height_descent(*kl, **kwargs):
         baseline = None
         for i, line in enumerate(lines):
             clean_line, ismath = self.is_math_text(line)
-            w, h, d = get_text_width_height_descent(clean_line,
-                                                    self._fontproperties,
-                                                    ismath=ismath)
+            if clean_line:
+                w, h, d = get_text_width_height_descent(clean_line,
+                                                        self._fontproperties,
+                                                        ismath=ismath)
+            else:
+                w, h, d = 0, 0, 0
+                
             if baseline is None:
                 baseline = h - d
             whs[i] = w, h
