SF.net SVN: matplotlib:[7352] trunk/matplotlib

[<ef...@us...>]

Revision: 7352
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7352&view=rev
Author:   efiring
Date:     2009-08-04 18:40:10 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Disable contourf slit line removal until problems are fixed.

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 18:21:59 UTC (rev 7351)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2009-08-04 18:40:10 UTC (rev 7352)
@@ -652,7 +652,8 @@
             codes = np.zeros(kind.shape, dtype=mpath.Path.code_type)
             codes.fill(mpath.Path.LINETO)
             codes[0] = mpath.Path.MOVETO
-            codes[kind >= _cntr._slitkind] = mpath.Path.MOVETO
+            # Attempted slit removal is disabled until we get it right.
+            #codes[kind >= _cntr._slitkind] = mpath.Path.MOVETO
             paths.append(mpath.Path(seg, codes))
         return paths
 

Modified: trunk/matplotlib/src/cntr.c
===================================================================
--- trunk/matplotlib/src/cntr.c	2009-08-04 18:21:59 UTC (rev 7351)
+++ trunk/matplotlib/src/cntr.c	2009-08-04 18:40:10 UTC (rev 7352)
@@ -326,12 +326,14 @@
     int z0, z1, z2, z3;
     int keep_left = 0;          /* flag to try to minimize curvature in saddles */
     int done = 0;
+    int n_kind;
 
     if (level)
         level = 2;
 
     for (;;)
     {
+        n_kind = 0;
         /* set edge endpoints */
         p0 = POINT0 (edge, fwd);
         p1 = POINT1 (edge, fwd);
@@ -344,6 +346,7 @@
             xcp[n] = zcp * (x[p1] - x[p0]) + x[p0];
             ycp[n] = zcp * (y[p1] - y[p0]) + y[p0];
             kcp[n] = kind_zone;
+            n_kind = n;
         }
         if (!done && !jedge)
         {
@@ -497,9 +500,9 @@
     {
         return done;
     }
-    if (pass2 && n > 0)
+    if (pass2 && n_kind)
     {
-        kcp[n-1] += kind_start_slit;
+        kcp[n_kind] += kind_start_slit;
     }
     return slit_cutter (site, done - 5, pass2);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.