fixed ticks on horiz cbar

svn path=/trunk/matplotlib/; revision=1079

Author: jdh2358

CHANGELOG

@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-03-16 Fixed tick on horiz colorbar
+
+2005-03-16 Added Japanses winreg patch - JDH
+
 2005-03-15 backend_gtkagg.py: changed to use double buffering, this fixes
            the problem reported Joachim Berdal Haga - "Parts of plot lagging 
 	   from previous frame in animation". Tested with anim.py and it makes

MANIFEST

@@ -1,5 +1,6 @@
 .matplotlibrc
 API_CHANGES
+CHANGELOG
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
@@ -265,7 +266,6 @@ examples/break.py
 examples/color_demo.py
 examples/colours.py
 examples/contour_demo.py
-examples/contour_demo2.py
 examples/contour_image.py
 examples/contourf_demo.py
 examples/coords_demo.py
@@ -509,7 +509,6 @@ lib/dateutil/rrule.py
 lib/dateutil/tz.py
 lib/matplotlib/.cvsignore
 lib/matplotlib/__init__.py
-lib/matplotlib/__init__.py.~1.42.~
 lib/matplotlib/_contour.py
 lib/matplotlib/_image.py
 lib/matplotlib/_mathtext_data.py
@@ -519,15 +518,13 @@ lib/matplotlib/afm.py
 lib/matplotlib/agg.py
 lib/matplotlib/artist.py
 lib/matplotlib/axes.py
-lib/matplotlib/axes.py.~1.81.~
 lib/matplotlib/axis.py
 lib/matplotlib/backend_bases.py
 lib/matplotlib/cbook.py
 lib/matplotlib/cm.py
 lib/matplotlib/collections.py
 lib/matplotlib/colors.py
 lib/matplotlib/contour.py
-lib/matplotlib/contour.py.~1.4.~
 lib/matplotlib/dates.py
 lib/matplotlib/figure.py
 lib/matplotlib/finance.py
@@ -620,6 +617,7 @@ lib/matplotlib/numerix/_nc_imports.py
 lib/matplotlib/numerix/fft/__init__.py
 lib/matplotlib/numerix/linear_algebra/__init__.py
 lib/matplotlib/numerix/ma/__init__.py
+lib/matplotlib/numerix/mlab/.cvsignore
 lib/matplotlib/numerix/mlab/__init__.py
 lib/matplotlib/numerix/random_array/__init__.py
 lib/pytz/__init__.py
@@ -1202,15 +1200,18 @@ license/LICENSE_enthought.txt
 license/PYTZ_LICENSE.txt
 src/_backend_agg.cpp
 src/_backend_agg.h
+src/_backend_gdk.c
 src/_contour.c
 src/_gtkagg.cpp
 src/_image.cpp
 src/_image.h
 src/_na_backend_agg.cpp
+src/_na_backend_gdk.c
 src/_na_contour.c
 src/_na_image.cpp
 src/_na_transforms.cpp
 src/_nc_backend_agg.cpp
+src/_nc_backend_gdk.c
 src/_nc_contour.c
 src/_nc_image.cpp
 src/_nc_transforms.cpp

TODO

@@ -663,4 +663,10 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- add gc warning to oo agg and FAQ
 
 -- DONE check why lowest contour is not labeled in contour_demo2 and why
-   the colormap is still not applying to the contour.
+   the colormap is still not applying to the contour.
+
+-- the problem with attaching a mappable to the silent_list for
+   contours is that it doesn't carry over when the list is sliced, eg
+   when passing every 2nd contour and level to the labeler.
+
+-- colorbar image origin with contour is broken in SVG; test PS

examples/anim.py

@@ -28,5 +28,5 @@
 for i in arange(1,200):
     line.set_ydata(sin(x+i/10.0))  # update the data
     draw()                         # redraw the canvas
-                   
+
 print 'FPS:' , 200/(time.time()-tstart)

examples/backend_driver.py

@@ -14,7 +14,6 @@
     'barchart_demo.py',
     'color_demo.py',
     'contour_demo.py',
-    'contour_demo2.py',
     'contourf_demo.py',
     'csd_demo.py',
     'custom_ticker1.py',

examples/contour_demo.py

@@ -1,24 +1,76 @@
 #!/usr/bin/env python
+'''
+Illustrate simple contour plotting, contours on an image with
+a colorbar for the contours, and labelled contours.
+
+See also contour_image.py.
+'''
 from pylab import *
 
+import sys
+fignum = 0
+if len(sys.argv) == 2:
+    fignum = int(sys.argv[1])
+
 delta = 0.025
 x = arange(-3.0, 3.0, delta)
 y = arange(-2.0, 2.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, interpolation='bilinear', origin='lower', cmap=cm.bone)
-#axis('off')
-# see contour_demo2.py for a colorbar example
-levels, colls = contour(X, Y, Z2-Z1, levels=6,
+Z = 10.0 * (Z2 - Z1)
+
+
+
+# Create a simple contour plot with labels using default colors.  The
+# inline argument to clabel will control whether the labels are draw
+# over the line segments of the contour, removing the lines beneath
+# the label
+figure()
+levels, colls = contour(X, Y, Z)
+clabel(colls, inline=1, fontsize=10)
+title('Simplest default with labels')
+
+
+# You can force all the contours to be the same color
+figure()
+levels, colls = contour(X, Y, Z, 6,
+                        colors=('k',)
+                        )
+clabel(colls, levels, fontsize=9, inline=1)
+title('Single color')
+
+
+# And you can manually specify the colors of the contour
+figure()
+levels, colls = contour(X, Y, Z, 6,
                         linewidths=arange(.5, 4, .5),
-                        colors=('r', 'green', 'blue', (1,1,0), '#afeeee', 0.5),
-                        origin='lower')
-clabel(colls,levels,fontsize=7, inline=1)
-#clabel(colls)
+                        colors=('r', 'green', 'blue', (1,1,0), '#afeeee', 0.5)
+                        )
+clabel(colls, levels, fontsize=9, inline=1)
+title('Crazy lines')
 
-savefig('test')
-show()
 
+# Or you can use a colormap to specify the colors; the default
+# colormap will be used for the contour lines
+figure()
+im = imshow(Z, interpolation='bilinear', origin='lower',
+            cmap=cm.gray, extent=(-3,3,-2,2))
+levels, colls = contour(Z, arange(-1.2,1.6,0.2),
+                        origin='lower',
+                        linewidths=2,
+                        extent=(-3,3,-2,2))
+
+clabel(colls, levels,
+       inline=1,
+       fmt='%1.1f',
+       fontsize=10)
+
+colorbar()  # make a colorbar for the contour lines
+title('Lines with colorbar')
+hot()  # Now change the colormap for the contour lines and colorbar
+
+
+#savefig('contour_demo')
+show()

examples/contour_demo2.py

@@ -3,6 +3,7 @@
 contour_image.py [options]
 
 Test combinations of contouring, filled contouring, and image plotting.
+For contour labelling, see contour_demo.py.
 '''
 from pylab import *
 import matplotlib.numerix
@@ -16,6 +17,13 @@
                   help="grid increment in x and y; default is 0.5")
 parser.add_option("-s", "--save", dest="save", default=None, metavar="FILE",
                   help="Save to FILE; default is to not save.")
+parser.add_option("-e", "--extent", dest = "extent", type="int", default=0,
+                  help="""For subplots 2-4, use extent: \
+specify number 1 through 4 for any of 4 possibilities.""")
+parser.add_option("-f", "--figure", dest = "fignum", type="int", default=0,
+                  metavar="FIGNUM",
+                  help="""Plot subplot FIGNUM as a full-size plot; FIGNUM \
+must be in the range 1-4.""")
 
 #Default delta is large because that makes it fast, and it illustrates
 # the correct registration between image and contours.
@@ -28,6 +36,17 @@
 delta = options.delta
 badmask = options.badmask
 
+extents = ((-3,4,-4,3), (-3,4,3,-4), (4,-3,-4,3), (4,-3,3,-4))
+if options.extent == 0:
+    extent = None
+elif options.extent <= 4 and options.extent > 0:
+    extent = extents[options.extent - 1]
+    print "Using extent ", extent, "to change axis mapping on subplots 2-4"
+else:
+    raise ValueError("extent must be integer, 1-4")
+
+fignum = options.fignum
+
 x = y = arange(-3.0, 3.01, delta)
 X, Y = meshgrid(x, y)
 Z1 = bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
@@ -50,51 +69,76 @@
 else:
     raise ValueError("badmask must be 'none', 'edge', or 'interior'")
 
-figure(1)
-subplot(2,2,1)
-levels, colls = contourf(X, Y, Zbm, 10, # [-1, -0.1, 0, 0.1],
-                        cmap=cm.jet,
-                        badmask = Badmask
-                        )
-# Use levels output from previous call to guarantee they are the same.
-levs2, colls2 = contour(X, Y, Zbm, levels,
-                        colors = 'r',
-                        badmask = Badmask,
-                        hold='on')
-
-levs3, colls3 = contour(X, Y, Zbm, (0,),
-                        colors = 'g',
-                        linewidths = 2,
-                        hold='on')
-title('Filled contours')
-#colorbar()
-# Major reworking of the colorbar mechanism is needed for filled contours!
-
-subplot(2,2,2)
-imshow(Z)
-v = axis()
-contour(Z, levels, hold='on', colors = 'r', origin='upper')
-axis(v)
-title("Image, origin 'upper'")
-
-subplot(2,2,3)
-imshow(Z, origin='lower')
-v = axis()
-contour(Z, levels, hold='on', colors = 'r', origin='lower')
-axis(v)
-title("Image, origin 'lower'")
-
-subplot(2,2,4)
-imshow(Z, interpolation='nearest')
-v = axis()
-contour(Z, levels, hold='on', colors = 'r', origin='image')
-axis(v)
-ylim = get(gca(), 'ylim')
-set(gca(), ylim=ylim[::-1])
-title("Image, origin from rc, reversed y-axis")
+levels = arange(-1.2,1.5,0.4)
+
+figure()
+
+
+if fignum == 0:
+    subplot(2,2,1)
+
+if fignum == 0 or fignum == 1:
+    levs1, colls = contourf(X, Y, Zbm, 10,
+                            cmap=cm.jet,
+                            badmask = Badmask
+                            )
+    #If we want lines as well as filled regions, we need to call
+    # contour separately; don't try to change the edgecolor or edgewidth
+    # of the polygons in the collections returned by contourf.
+    # Use levels output from previous call to guarantee they are the same.
+    levs2, colls2 = contour(X, Y, Zbm, levs1,
+                            colors = 'k',
+                            badmask = Badmask,
+                            hold='on')
+    # We don't really need dashed contour lines to indicate negative
+    # regions, so let's turn them off.
+    for c in colls2:
+        c.set_linestyle('solid')
+
+    # It is easier here to make a separate call to contour than
+    # to set up an array of colors and linewidths.
+    levs3, colls3 = contour(X, Y, Zbm, (0,),
+                            colors = 'g',
+                            linewidths = 2,
+                            hold='on')
+    title('Filled contours')
+    colorbar()
+    hot()
+    # Major reworking of the colorbar mechanism is needed for filled contours!
+
+if fignum == 0:
+    subplot(2,2,2)
+
+if fignum == 0 or fignum == 2:
+    imshow(Z, extent=extent)
+    v = axis()
+    contour(Z, levels, hold='on', colors = 'k', origin='upper', extent=extent)
+    axis(v)
+    title("Image, origin 'upper'")
+
+if fignum == 0:
+    subplot(2,2,3)
+
+if fignum == 0 or fignum == 3:
+    imshow(Z, origin='lower', extent=extent)
+    v = axis()
+    contour(Z, levels, hold='on', colors = 'k', origin='lower', extent=extent)
+    axis(v)
+    title("Image, origin 'lower'")
+
+if fignum == 0:
+    subplot(2,2,4)
+
+if fignum == 0 or fignum == 4:
+    imshow(Z, interpolation='nearest', extent=extent)
+    v = axis()
+    contour(Z, levels, hold='on', colors = 'k', origin='image', extent=extent)
+    axis(v)
+    ylim = get(gca(), 'ylim')
+    set(gca(), ylim=ylim[::-1])
+    title("Image, origin from rc, reversed y-axis")
 
 if options.save is not None:
     savefig(options.save)
 
 show()
-

examples/contour_image.py

@@ -141,7 +141,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.73rc2'
+__version__  = '0.73rc3'
 __revision__ = '$Revision$'
 __date__     = '$Date$'