sync to 0.60

jdh2358 · jdh2358 · commit 7739023baf97 · 2004-07-07T15:56:19.000Z
svn path=/trunk/matplotlib/; revision=384
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -1,8 +1,8 @@
 #### MATPLOTLIBRC FORMAT 
 #
-# This is a sample matplotlib configuration file It should be placed
+# This is a sample matplotlib configuration file.   It should be placed
 # in your home dir (Linux and friends) or in the matplotlib data path,
-# is, where matplotlib installs it's data files (fonts, etc).  On
+# ie, where matplotlib installs its data files (fonts, etc).  On
 # windows, this would be, for example, C:\Python23\share\matplotlib
 #
 # By default, the installer will overwrite the existing file in the
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 New entries should be added at the top
 =======
 
+2004-07-07 Fixed a bug in dynamic_demo_wx
+
+
 2004-07-07 backend_gtk.py: raise SystemExit immediately if 
 	   'import pygtk' fails - SC
 
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.54.1
+LICENSE AGREEMENT FOR MATPLOTLIB 0.60
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.54.1
+derivative works, distribute, and otherwise use matplotlib 0.60
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2004 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.54.1 alone or in any derivative version prepared by
+matplotlib 0.60 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.54.1 or any part thereof, and wants to
+incorporates matplotlib 0.60 or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.54.1.
+the changes made to matplotlib 0.60.
 
-4. JDH is making matplotlib 0.54.1 available to Licensee on an "AS
+4. JDH is making matplotlib 0.60 available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.54.1
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.60
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.54.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.60 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.54.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.60, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.54.1,
+8. By copying, installing or otherwise using matplotlib 0.60,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
diff --git a/MANIFEST b/MANIFEST
@@ -5,7 +5,6 @@ GOALS
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
-MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -197,18 +196,20 @@ examples/date_demo2.py
 examples/date_demo3.py
 examples/dynamic_demo.py
 examples/dynamic_demo_wx.py
+examples/dynamic_image_gtkagg.py
 examples/embedding_in_gtk.py
 examples/embedding_in_gtk2.py
 examples/embedding_in_tk.py
 examples/embedding_in_wx.py
 examples/embedding_in_wx2.py
 examples/errorbar_demo.py
 examples/figimage_demo.py
+examples/figlegend_demo.py
 examples/figtext.py
 examples/fill_demo.py
 examples/finance_demo.py
-examples/font_properties_demo.py
 examples/fonts_demo.py
+examples/fonts_demo_kw.py
 examples/ftface_props.py
 examples/ganged_plots.py
 examples/gdtest.py
@@ -229,7 +230,6 @@ examples/log_bar.py
 examples/log_demo.py
 examples/log_test.py
 examples/logo.py
-examples/longs_test.py
 examples/major_minor_demo1.py
 examples/major_minor_demo2.py
 examples/mathtext_demo.py
@@ -242,7 +242,6 @@ examples/multiple_figs_demo.py
 examples/object_picker.py
 examples/pcolor_demo.py
 examples/pcolor_demo2.py
-examples/pcolor_demo_with_scale.py
 examples/pcolor_small.py
 examples/poormans_contour.py
 examples/psd_demo.py
@@ -258,7 +257,6 @@ examples/stock_demo.py
 examples/subplot_demo.py
 examples/system_monitor.py
 examples/table_demo.py
-examples/test.py
 examples/text_handles.py
 examples/text_themes.py
 examples/to_numeric.py
diff --git a/examples/axes_demo.py b/examples/axes_demo.py
@@ -1,42 +1,31 @@
-#!/usr/bin/env python
-# Demonstrate arbitrary placement of axes
 from matplotlib.matlab import *
 
+# create some data to use for the plot
 dt = 0.001
 t = arange(0.0, 10.0, dt)
-r = exp(-t[:1000]/0.05)      # impulse response
+r = exp(-t[:1000]/0.05)               # impulse response
 x = randn(len(t))
-s = convolve(x,r,mode=2)*dt  # colored noise
-s = s[:len(x)]               # remove the decay tail which will skew
-                             # the probability distribution
+s = convolve(x,r,mode=2)[:len(x)]*dt  # colored noise
 
-# I'm just using the if 1 thing to break up the different regions of
-# the code visually.
+# the main axes is subplot(111) by default
+plot(t, s)
+axis([0, 1, 1.1*min(s), 2*max(s) ])
+xlabel('time (s)')
+ylabel('current (nA)')
+title('Gaussian colored noise')
 
-# plot the noise
-if 1:
-    plot(t, s)
-    axis([0, 1, 1.1*min(s), 2*max(s) ])
-    xlabel('time (s)')
-    ylabel('current (nA)')
-    title('Gaussian colored noise')
+# this is an inset axes over the main axes
+a = axes([.65, .6, .2, .2], axisbg='y')
+n, bins, patches = hist(s, 400, normed=1)
+title('Probability')
+set(a, xticks=[], yticks=[])
 
-# Make a histogram probability density inset
-if 1:
-    a = axes([.65, .6, .2, .2], axisbg='y')
-    n, bins, patches = hist(s, 400, normed=1)
-    title('Probability')
-    set(a, 'xticks', [])
-    set(a, 'yticks', [])
-
-# Plot the impulse response function
-if 1:
-    a = axes([0.2, 0.6, .2, .2], axisbg='y')
-    plot(t[:len(r)], r)
-    title('Impulse response')
-    set(a, 'xlim', [0,.2])
-    set(a, 'xticks', [])
-    set(a, 'yticks', [])
-
-#savefig('axes_demo', dpi=600)
+# this is another inset axes over the main axes
+a = axes([0.2, 0.6, .2, .2], axisbg='y')
+plot(t[:len(r)], r)
+title('Impulse response')
+set(a, xlim=(0,.2), xticks=[], yticks=[])
+    
+#savefig('../figures/axes_demo.eps')
+#savefig('../figures/axes_demo.png')
 show()
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -90,7 +90,7 @@ def drive(backend):
 backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']
 #backends.extend([ 'GTK', 'WX', 'TkAgg'])
 #backends = [ 'PS']
-backends = [ 'Agg', 'PS', 'Template']
+#backends = [ 'Agg', 'PS', 'Template']
 
 for backend in backends:
     print 'testing %s' % backend
diff --git a/examples/customize_rc.py b/examples/customize_rc.py
@@ -12,7 +12,7 @@ def set_pub():
     rc('tick', labelsize=15)     # tick labels bigger
     rc('lines', lw=1, color='k') # thicker black lines (no budget for color!)
     rc('grid', c=0.5, ls='-', lw=0.5)  # solid gray grid lines
-    rc('savefig', dpi=300)       # higher res outputs
+    rc('#savefig', dpi=300)       # higher res outputs
 
 
     
@@ -21,7 +21,7 @@ def set_pub():
 >>> set_pub()
 >>> subplot(111)
 >>> plot([1,2,3])
->>> savefig('myfig')
+>>> #savefig('myfig')
 >>> rcdefaults()  # restore the defaults
 
 """
diff --git a/examples/figimage_demo.py b/examples/figimage_demo.py
@@ -13,7 +13,7 @@
 im1 = figimage(Z, xo=50,  yo=0)  
 im2 = figimage(Z, xo=100, yo=100, alpha=.8)
 #gray()  # overrides current and sets default
-savefig('figimage_demo')
+#savefig('figimage_demo')
 
 show()
 
diff --git a/examples/fonts_demo.py b/examples/fonts_demo.py
@@ -111,5 +111,5 @@
          **alignment)
 
 axis([-1,1,0,1])
-savefig('fonts_demo')
+#savefig('fonts_demo')
 show()
diff --git a/examples/fonts_demo_kw.py b/examples/fonts_demo_kw.py
@@ -80,5 +80,5 @@
          **alignment)
 
 axis([-1, 1, 0, 1])
-savefig('fonts_demo_kw')
+#savefig('fonts_demo_kw')
 show()
diff --git a/examples/histogram_demo.py b/examples/histogram_demo.py
@@ -20,5 +20,5 @@
 grid(True)
 
 #set(gca(), 'xlim', [40, 160])
-savefig('histogram_demo',dpi=72)
+#savefig('histogram_demo',dpi=72)
 show()
diff --git a/examples/image_demo.py b/examples/image_demo.py
@@ -1,36 +1,15 @@
 #!/usr/bin/env python
 from matplotlib.matlab import *
 
-
-def bivariate_normal(X, Y, sigmax=1.0, sigmay=1.0,
-                     mux=0.0, muy=0.0, sigmaxy=0.0):
-    """
-    Bivariate gaussan distribution for equal shape X, Y
-
-    http://mathworld.wolfram.com/BivariateNormalDistribution.html
-    """
-    Xmu = X-mux
-    Ymu = Y-muy
-
-    rho = sigmaxy/(sigmax*sigmay)
-    z = Xmu**2/sigmax**2 + Ymu**2/sigmay - 2*rho*Xmu*Ymu/(sigmax*sigmay)
-    return 1.0/(2*pi*sigmax*sigmay*(1-rho**2)) * exp( -z/(2*(1-rho**2)))
-
-
 delta = 0.025
-x = arange(-3.0, 3.0, delta)
-y = arange(-3.0, 3.0, delta)
-X,Y = meshgrid(x, y)
+x = y = arange(-3.0, 3.0, delta)
+X, Y = meshgrid(x, y)
 Z1 = bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
 Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
 
 # difference of Gaussians
-im = imshow(Z2-Z1)
-
-# set the interpolation method: 'nearest', 'bilinear', 'bicubic' and much more
-im.set_interpolation('bilinear')
-
+im = imshow(Z2-Z1, interpolation='bilinear')
 axis('off')
-savefig('image_demo')
+#savefig('image_demo')
 show()
 
diff --git a/examples/image_demo2.py b/examples/image_demo2.py
@@ -30,6 +30,6 @@
     ylabel('density')
     set(gca(), 'xticklabels', [])
 
-savefig('image_demo2')
+#savefig('image_demo2')
 show()
 
diff --git a/examples/image_origin.py b/examples/image_origin.py
@@ -18,5 +18,5 @@
 title('blue should be down')
 imshow(x, origin='lower', interpolation='nearest')
 
-savefig('image_origin')
+#savefig('image_origin')
 show()
diff --git a/examples/layer_images.py b/examples/layer_images.py
@@ -26,7 +26,7 @@ def func3(x,y):
 im2 = imshow(Z2, cmap=cm.jet, alpha=.9)
 #im2.set_interpolation('nearest')
 
-savefig('layer_images')
+#savefig('layer_images')
 
 show()
 
diff --git a/examples/mri_with_eeg.py b/examples/mri_with_eeg.py
@@ -95,5 +95,5 @@
     xlabel('time (s)')
 
 
-savefig('mri_with_eeg')
+#savefig('mri_with_eeg')
 show()
diff --git a/examples/scatter_demo2.py b/examples/scatter_demo2.py
@@ -21,7 +21,7 @@
        )
 title(r'Volume and percent change')
 grid(True)
-savefig('scatter_demo2')
+#savefig('scatter_demo2')
 show()
 
 
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -12,6 +12,6 @@
 title('About as simple as it gets, folks')
 grid(True)
 #axis([0,1,-1,1])
-savefig('simple_plot')
+#savefig('simple_plot')
 
 show()
diff --git a/examples/table_demo.py b/examples/table_demo.py
@@ -42,7 +42,7 @@
 set(gca(), 'yticklabels', ['%d' % val for val in yticks])
 set(gca(), 'xticks', [])
 title('Loss by Disaster')
-savefig('table_demo_small', dpi=75)
-savefig('table_demo_large', dpi=300)
+#savefig('table_demo_small', dpi=75)
+#savefig('table_demo_large', dpi=300)
 
 show()

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#### MATPLOTLIBRC FORMAT`
`2`	`2`	`#`
`3`		`-# This is a sample matplotlib configuration file It should be placed`
	`3`	`+# This is a sample matplotlib configuration file. It should be placed`
`4`	`4`	`# in your home dir (Linux and friends) or in the matplotlib data path,`
`5`		`-# is, where matplotlib installs it's data files (fonts, etc). On`
	`5`	`+# ie, where matplotlib installs its data files (fonts, etc). On`
`6`	`6`	`# windows, this would be, for example, C:\Python23\share\matplotlib`
`7`	`7`	`#`
`8`	`8`	`# By default, the installer will overwrite the existing file in the`