added colormap for contour - set region=1

jdh2358 · jdh2358 · commit ab36d6784f6d · 2005-01-20T22:28:34.000Z
svn path=/trunk/matplotlib/; revision=878
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,15 +1,20 @@
 New entries should be added at the top
 
+2005-01-20 Made some changes to the contour routine - particularly
+           region=1 seems t fix a lot of the zigzag strangeness.
+           Added colormaps as default for contour - JDH
+
 2005-01-19 Restored builtin names which were overridden (min, max,
-  abs, round, and sum) in pylab.  This is a potentially significant
-  change for those who were relying on an array version of those
-  functions that previously overrode builtin function names. - ADS
+           abs, round, and sum) in pylab.  This is a potentially
+           significant change for those who were relying on an array
+           version of those functions that previously overrode builtin
+           function names. - ADS
 
 2005-01-18 Added accents to mathtext: \hat, \breve, \grave, \bar,
-  \acute, \tilde, \vec, \dot, \ddot.  All of them have the same
-  syntax, eg to make an overbar you do \bar{o} or to make an o umlaut
-  you do \ddot{o}. The shortcuts are also provided, eg: \"o \'e \`e
-  \~n \.x \^y - JDH
+           \acute, \tilde, \vec, \dot, \ddot.  All of them have the
+           same syntax, eg to make an overbar you do \bar{o} or to
+           make an o umlaut you do \ddot{o}. The shortcuts are also
+           provided, eg: \"o \'e \`e \~n \.x \^y - JDH
 
 2005-01-18 Plugged image resize memory leaks - JDH
 
@@ -25,7 +30,7 @@ New entries should be added at the top
 
 2005-01-15 Support arbitrary colorbar axes and horizontal colorbars - JDH
 
-2005-01-15 Fixed colormar number of colors bug so that the colorbar
+2005-01-15 Fixed colormap number of colors bug so that the colorbar
            has the same discretization as the image - JDH
 
 2005-01-15 Added Nadia's x,y contour fix - JDH
diff --git a/TODO b/TODO
@@ -630,11 +630,14 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- more flexible tick placement.
 
--- fix horizontal colorbar axes resize if cax is None
+-- DONE fix horizontal colorbar axes resize if cax is None
 
 -- mathtext layout bug
 
     from pylab import *
     plot(range(10))
     title(r'$This\ is\ a\ test$')
     show()
+
+
+-- fix contour mappable to work under changes in clim, cmap
diff --git a/boilerplate.py b/boilerplate.py
@@ -51,7 +51,7 @@ def %(func)s(*args, **kwargs):
     'bar',
     'barh',
     'cohere',
-    'contour',
+    'contour', 
     'csd',
     'errorbar',
     'fill',
@@ -85,11 +85,13 @@ def %(func)s(*args, **kwargs):
     )
 
 cmappable = {
+    'contour' : 'if ret[1].mappable is not None: gci._current = ret[1].mappable',
     'scatter' : 'gci._current = ret',
     'pcolor'  : 'gci._current = ret',
     'imshow'  : 'gci._current = ret',
     'spy2'  : 'gci._current = ret',    
     'specgram'  : 'gci._current = ret[-1]',
+
 }
 
 
diff --git a/examples/accented_text.py b/examples/accented_text.py
@@ -13,8 +13,8 @@
 plot(range(10))
 
 title(r'$\ddot{o}\acute{e}\grave{e}\hat{O}\breve{i}\bar{A}\tilde{n}\vec{q}$', fontsize=20)
-# shorthad is also supported
-xlabel(r"""$\"o\'e\`e\~n\.x\^y$""", fontsize=20)
+# shorthand is also supported and curly's are optional
+xlabel(r"""$\"o\ddot o \'e\`e\~n\.x\^y$""", fontsize=20)
 
 
 show()
diff --git a/examples/contour_demo.py b/examples/contour_demo.py
@@ -8,14 +8,14 @@
 Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
 
 # difference of Gaussians
-#im = imshow(Z2-Z1, interpolation='bilinear', origin='lower')
-axis('off')
+#im = imshow(Z2-Z1, interpolation='bilinear', origin='lower', cmap=cm.bone)
+#axis('off')
+# see contour_demo2.py for a colorbar example
 levels, colls = contour(Z2-Z1, levels=6,
                         linewidths=arange(.5, 4, .5),
                         colors=('r', 'green', 'blue', (1,1,0), '#afeeee', 0.5),
                         origin='lower')
 legend(loc='lower left')
-#colorbar()
 savefig('test')
 show()
 
diff --git a/examples/contour_demo2.py b/examples/contour_demo2.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+from pylab import *
+
+delta = 0.025
+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, interpolation='bilinear', cmap=cm.gray)
+levels, colls = contour(Z2-Z1, linewidths=2)
+colorbar()
+savefig('test')
+show()
+
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -268,8 +268,6 @@ def ge(self, level):
         
 verbose=Verbose('error')  
 
-
-
 def get_home():
     """
     return the users HOME dir across platforms or None.
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -6,7 +6,7 @@
 
 from numerix import absolute, arange, array, asarray, ones, divide,\
      transpose, log, log10, Float, Float32, ravel, zeros,\
-     Int32, Float64, ceil, indices, \
+     Int16, Int32, Int, Float64, ceil, indices, \
      shape, which, where, sqrt
 
 from numerix import max as nxmax
@@ -20,7 +20,7 @@
 from collections import RegularPolyCollection, PolyCollection, LineCollection
 from colors import colorConverter, normalize, Colormap, LinearSegmentedColormap
 import cm
-from cm import ColormapJet, Grayscale
+from cm import ColormapJet, Grayscale, ScalarMappable
 import _image
 from ticker import AutoLocator, LogLocator
 from ticker import ScalarFormatter, LogFormatter, LogFormatterExponent, LogFormatterMathtext
@@ -918,7 +918,8 @@ def contour(self, z,
                 linewidths = None,
                 alpha = 1.0,
                 fmt='%1.3f',
-                origin=None):
+                origin=None,
+                cmap = None):
         """\
 CONTOUR(z, x = None, y = None, levels = None, colors = None)
 
@@ -942,8 +943,7 @@ def contour(self, z,
   - one string color, e.g. colors = 'r' or colors = 'red', all levels
     will be plotted in this color
 
-  - if colors == None, the default color for lines.color in
-    .matplotlibrc is used.
+  - if colors == None, the default colormap will be used
 
 linewidths is one of:
 
@@ -979,8 +979,15 @@ def contour(self, z,
 Return value is levels, collections where levels is a list of contour
 levels used and collections is a list of
 matplotlib.collections.LineCollection instances
+
+If cmap is not None, the collections list instance will have the
+mappable attribute attached, where mappable is a cm.ScalarMappable
+which contains the normalize instance and cmap instance and can be
+used for colorbar functionality
 """
 
+        if colors is not None and cmap is not None:
+            raise RuntimeError('Either colors or cmap must be None')
         if origin is None: origin = rcParams['image.origin']
         
         if origin == 'upper':
@@ -996,10 +1003,9 @@ def contour(self, z,
         else:
             jmax, imax = shape(z)
 
-        region = 0
         reg = ones((jmax,imax), Int32)
         reg[:,0]=0
-        triangle = zeros((jmax,imax), Int32)
+        triangle = zeros((jmax,imax), Int16)
 
         if x == None and y == None:
             y, x = indices((jmax,imax), 'd')
@@ -1018,24 +1024,30 @@ def autolev(N):
                 lev = list(levels)            
             else: lev = autolev(Nlev)
 
+        
+        
         Nlev = len(lev)
-        if colors == None:
-            colors = rcParams['lines.color']
 
-        if is_string_like(colors):
-            colors = [colors] * Nlev
-        elif iterable(colors) and len(colors) < Nlev:
-            colors = list(colors) * Nlev
-        else:
-            try: gray = float(colors)
-            except TypeError: pass
-            else:  colors = [gray] * Nlev
+        if colors is not None:
 
+            if is_string_like(colors):
+                colors = [colors] * Nlev
+            elif iterable(colors) and len(colors) < Nlev:
+                colors = list(colors) * Nlev
+            else:
+                try: gray = float(colors)
+                except TypeError: pass
+                else:  colors = [gray] * Nlev
 
-        tcolors = []
-        for c in colors:
-            tcolors.append((colorConverter.to_rgba(c, alpha),))
+            tcolors = [(colorConverter.to_rgba(c, alpha),) for c in colors]
+            mappable = None
+        else:
+            mappable = ScalarMappable(cmap=cmap)
+            mappable.set_array(z)
+            mappable.autoscale()
+            tcolors = [ (tuple(rgba),) for rgba in mappable.to_rgba(lev)]
 
+            
         if linewidths == None:
             tlinewidths = [linewidths] *Nlev
         else:
@@ -1051,24 +1063,23 @@ def autolev(N):
         levels = []
         collections = []
 
-
-        
+        region = 1  # FIXME: what should this be?
         for level, color, width  in args:
             ntotal, nparts  = _contour.GcInit1(x, y, reg, triangle, region, z, level)
-            np = zeros((nparts,), Int32)
+            np = zeros((nparts,), Int)
             xp = zeros((ntotal, ), Float64)
             yp = zeros((ntotal,), Float64)
             nlist = _contour.GcTrace(np, xp, yp)
+
             col = LineCollection(nlist, colors=color, linewidths = width)
             col.set_label(fmt%level)
             self.add_collection(col)
             levels.append(level)
-            #col.set_linestyle('dashdot') # dashed|dotted|solid|dashdot
+            #col.set_linestyle('dashed') # dashed|dotted|solid|dashdot
             #dashes = 0, (4,2,8,1)
             #col.set_linestyle( (dashes,) ) # offset, onoffseq
             collections.append(col)
 
-
         if x is not None:
             rx = ravel(x)
             self.set_xlim((min(rx), max(rx)))
@@ -1081,6 +1092,8 @@ def autolev(N):
         else:
             self.set_ylim([0,jmax])
 
+        collections = silent_list('LineCollection', collections)
+        collections.mappable = mappable
         return levels, collections
 
 
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -5,6 +5,7 @@
 import colors
 from matplotlib import verbose
 from matplotlib import rcParams
+from matplotlib.numerix import asarray
 from numerix import nx
 LUTSIZE = rcParams['image.lut']
 
@@ -418,8 +419,10 @@ def __init__(self, norm=None, cmap=None):
     def set_colorbar(self, im, ax):
         'set the colorbar image and axes associated with mappable'
         self.colorbar = im, ax
+
     def to_rgba(self, x, alpha=1.0):
         # assume normalized rgb, rgba
+        x = asarray(x)
         if len(x.shape)>2: return x
         x = self.norm(x)
         return self.cmap(x, alpha)
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -278,6 +278,7 @@ def _get_info (self, font, sym, fontsize, dpi):
             num = 0
             verbose.report_error('unrecognized symbol "%s"' % sym)
 
+        #print sym, basename, num
         cmfont = self.fonts[basename]
         cmfont.set_size(fontsize, dpi)
         head  = cmfont.get_sfnt_table('head')
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -611,9 +611,15 @@ def colorbar(tickfmt='%1.1f', cax=None, orientation='vertical'):
 
     if cax is None:
         l,b,w,h = ax.get_position()
-        neww = 0.8*w
-        ax.set_position((l,b,neww,h))
-        cax = axes([l + 0.9*w, b, 0.1*w, h])
+        if orientation=='vertical':
+            neww = 0.8*w
+            ax.set_position((l,b,neww,h))
+            cax = axes([l + 0.9*w, b, 0.1*w, h])
+        else:
+            newh = 0.8*h
+            ax.set_position((l,b+0.2*h,w,newh))
+            cax = axes([l, b, w, 0.1*h])
+
     else:
         if not isinstance(cax, Axes):
             raise TypeError('Expected an Axes instance for cax')
@@ -1672,7 +1678,7 @@ def contour(*args, **kwargs):
         hold(b)
     else:
         draw_if_interactive()
-        
+        if ret[1].mappable is not None: gci._current = ret[1].mappable
         hold(b)
         return ret
 contour.__doc__ = Axes.contour.__doc__ + """
diff --git a/src/_contour.c b/src/_contour.c
@@ -15,8 +15,8 @@ static PyObject * GcInit1_wrap(PyObject *self, PyObject *args)
 {
   PyObject *ox, *oy, *oreg, *otriangle, *ozz;
   long imax, jmax, nparts=0, ntotal=0;
-  int region;
-  double lev;
+  int region=0;
+  double lev=0.0;
   PyArrayObject *xdata, *ydata, *regdata, *tridata, *zzdata;
   int *zzsize;
 
@@ -54,8 +54,8 @@ static PyObject * GcInit1_wrap(PyObject *self, PyObject *args)
   
   xdata = (PyArrayObject *) PyArray_ContiguousFromObject(ox, 'd', 2, 2);
   ydata = (PyArrayObject *) PyArray_ContiguousFromObject(oy, 'd', 2, 2);
-  regdata = (PyArrayObject *) PyArray_ContiguousFromObject(oreg, 'l', 2, 2);
-  tridata = (PyArrayObject *) PyArray_ContiguousFromObject(otriangle, 'l' , 2, 2);
+  regdata = (PyArrayObject *) PyArray_ContiguousFromObject(oreg, 'i', 2, 2);
+  tridata = (PyArrayObject *) PyArray_ContiguousFromObject(otriangle, 's' , 2, 2);
   zzdata = (PyArrayObject *) PyArray_ContiguousFromObject(ozz, 'd', 2, 2);
 
   if (xdata->nd != 2 || ydata->nd != 2 || regdata->nd != 2 || tridata->nd != 2 || zzdata->nd !=2)
@@ -131,6 +131,13 @@ static PyObject * GcTrace_wrap(PyObject *self, PyObject *args)
 
 
   ntotal = GcTrace( (long *) npdata->data, (double *) xcpdata->data, (double *) ycpdata->data);
+
+  if (ntotal<0)
+    {
+     PyErr_SetString(PyExc_ValueError, "Illegal return value ntotal in GcTrace");
+     return NULL;
+  }
+
   npsize = PyArray_Size((PyObject *) npdata);
 
   all_contours = PyList_New(0);
@@ -140,8 +147,10 @@ static PyObject * GcTrace_wrap(PyObject *self, PyObject *args)
 	start = end;
 	end = start + ((long *) npdata->data)[n];
 	contourList = PyList_New(0);	
+	//printf("_c %d, %d\n", start, end);
 	for (p = start; p<end; p++)
 	{
+	  //printf("\t%d, %f, %f\n", p, ((double *) xcpdata->data)[p], ((double *) ycpdata->data)[p]);
 	   point = Py_BuildValue("(d,d)", ((double *) xcpdata->data)[p],((double *) ycpdata->data)[p]);
 	   if (PyList_Append(contourList, point))     	
 	   {
diff --git a/src/gcntr.c b/src/gcntr.c
