Revision: 7342
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7342&view=rev
Author: efiring
Date: 2009-08-04 07:13:37 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
Remove unneeded function and argument from contouring internals
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/contour.py
trunk/matplotlib/src/cntr.c
Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py 2009-08-04 07:01:43 UTC (rev
7341)
+++ trunk/matplotlib/lib/matplotlib/contour.py 2009-08-04 07:13:37 UTC (rev
7342)
@@ -601,8 +601,7 @@
lowers = self._levels[:-1]
uppers = self._levels[1:]
for level, level_upper in zip(lowers, uppers):
- nlist = C.trace(level, level_upper, points = 0,
- nchunk = self.nchunk)
+ nlist = C.trace(level, level_upper, nchunk = self.nchunk)
nseg = len(nlist)//2
segs = nlist[:nseg]
kinds = nlist[nseg:]
@@ -624,7 +623,7 @@
tlinestyles = self._process_linestyles()
C = _cntr.Cntr(x, y, z.filled(), _mask)
for level, width, lstyle in zip(self.levels, tlinewidths,
tlinestyles):
- nlist = C.trace(level, points = 0)
+ nlist = C.trace(level)
nseg = len(nlist)//2
segs = nlist[:nseg]
kinds = nlist[nseg:]
Modified: trunk/matplotlib/src/cntr.c
===================================================================
--- trunk/matplotlib/src/cntr.c 2009-08-04 07:01:43 UTC (rev 7341)
+++ trunk/matplotlib/src/cntr.c 2009-08-04 07:13:37 UTC (rev 7342)
@@ -1321,39 +1321,7 @@
site = NULL;
}
-/* Build a list of lists of points, where each point is an (x,y,k)
- tuple.
-*/
-static PyObject *
-build_cntr_list_p(long *np, double *xp, double *yp, short *kp,
- int nparts, long ntotal)
-{
- PyObject *point, *contourList, *all_contours;
- int start = 0, end = 0;
- int i, j, k;
- all_contours = PyList_New(nparts);
-
- for (i = 0; i < nparts; i++)
- {
- start = end;
- end += np[i];
- contourList = PyList_New(np[i]);
- for (k = 0, j = start; j < end; j++, k++)
- {
- point = Py_BuildValue("(ddh)", xp[j], yp[j], kp[j]);
- if (PyList_SetItem(contourList, k, point)) goto error;
- }
- if (PyList_SetItem(all_contours, i, contourList)) goto error;
- }
- return all_contours;
-
- error:
- Py_XDECREF(all_contours);
- return NULL;
-}
-
-
/* Build a list of XY 2-D arrays, shape (N,2), to which a list of K arrays
is concatenated concatenated. */
static PyObject *
@@ -1409,7 +1377,7 @@
*/
PyObject *
-cntr_trace(Csite *site, double levels[], int nlevels, int points, long nchunk)
+cntr_trace(Csite *site, double levels[], int nlevels, long nchunk)
{
PyObject *c_list = NULL;
double *xp0;
@@ -1491,15 +1459,8 @@
}
}
+ c_list = build_cntr_list_v2(nseg0, xp0, yp0, kp0, nparts, ntotal);
- if (points) /* It is False when called; we don't need the point version */
- {
- c_list = build_cntr_list_p(nseg0, xp0, yp0, kp0, nparts, ntotal);
- }
- else
- {
- c_list = build_cntr_list_v2(nseg0, xp0, yp0, kp0, nparts, ntotal);
- }
PyMem_Free(xp0);
PyMem_Free(yp0);
PyMem_Free(kp0);
@@ -1676,18 +1637,17 @@
{
double levels[2] = {0.0, -1e100};
int nlevels = 2;
- int points = 0;
long nchunk = 0L;
- static char *kwlist[] = {"level0", "level1", "points", "nchunk", NULL};
+ static char *kwlist[] = {"level0", "level1", "nchunk", NULL};
- if (! PyArg_ParseTupleAndKeywords(args, kwds, "d|dil", kwlist,
- levels, levels+1, &points, &nchunk))
+ if (! PyArg_ParseTupleAndKeywords(args, kwds, "d|dl", kwlist,
+ levels, levels+1, &nchunk))
{
return NULL;
}
if (levels[1] == -1e100 || levels[1] <= levels[0])
nlevels = 1;
- return cntr_trace(self->site, levels, nlevels, points, nchunk);
+ return cntr_trace(self->site, levels, nlevels, nchunk);
}
static PyMethodDef Cntr_methods[] = {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
