Disable contourf slit line removal until problems are fixed.

efiring · efiring · commit 0e99d22ae6ea · 2009-08-04T18:40:10.000Z
svn path=/trunk/matplotlib/; revision=7352
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -652,7 +652,8 @@ def _make_paths(segs, kinds):
             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
 
diff --git a/src/cntr.c b/src/cntr.c
@@ -326,12 +326,14 @@ zone_crosser (Csite * site, int level, int pass2)
     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 @@ zone_crosser (Csite * site, int level, int pass2)
             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 @@ zone_crosser (Csite * site, int level, int pass2)
     {
         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);
 }

Original file line number	Diff line number	Diff line change
`@@ -326,12 +326,14 @@ zone_crosser (Csite * site, int level, int pass2)`
`326`	`326`	`int z0, z1, z2, z3;`
`327`	`327`	`int keep_left = 0; /* flag to try to minimize curvature in saddles */`
`328`	`328`	`int done = 0;`
	`329`	`+ int n_kind;`
`329`	`330`
`330`	`331`	`if (level)`
`331`	`332`	`level = 2;`
`332`	`333`
`333`	`334`	`for (;;)`
`334`	`335`	`{`
	`336`	`+ n_kind = 0;`
`335`	`337`	`/* set edge endpoints */`
`336`	`338`	`p0 = POINT0 (edge, fwd);`
`337`	`339`	`p1 = POINT1 (edge, fwd);`
`@@ -344,6 +346,7 @@ zone_crosser (Csite * site, int level, int pass2)`
`344`	`346`	`xcp[n] = zcp * (x[p1] - x[p0]) + x[p0];`
`345`	`347`	`ycp[n] = zcp * (y[p1] - y[p0]) + y[p0];`
`346`	`348`	`kcp[n] = kind_zone;`
	`349`	`+ n_kind = n;`
`347`	`350`	`}`
`348`	`351`	`if (!done && !jedge)`
`349`	`352`	`{`
`@@ -497,9 +500,9 @@ zone_crosser (Csite * site, int level, int pass2)`
`497`	`500`	`{`
`498`	`501`	`return done;`
`499`	`502`	`}`
`500`		`- if (pass2 && n > 0)`
	`503`	`+ if (pass2 && n_kind)`
`501`	`504`	`{`
`502`		`- kcp[n-1] += kind_start_slit;`
	`505`	`+ kcp[n_kind] += kind_start_slit;`
`503`	`506`	`}`
`504`	`507`	`return slit_cutter (site, done - 5, pass2);`
`505`	`508`	`}`