Speed up quadmesh drawing.

mdboom · mdboom · commit c7837e423093 · 2008-10-29T18:27:05.000Z
svn path=/trunk/matplotlib/; revision=6350
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -551,12 +551,6 @@ def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
         else:
             c = coordinates
 
-        # We could let the Path constructor generate the codes for us,
-        # but this is faster, since we know they'll always be the same
-        codes = np.array(
-            [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY],
-            Path.code_type)
-
         points = np.concatenate((
                     c[0:-1, 0:-1],
                     c[0:-1, 1:  ],
@@ -565,7 +559,7 @@ def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
                     c[0:-1, 0:-1]
                     ), axis=2)
         points = points.reshape((meshWidth * meshHeight, 5, 2))
-        return [Path(x, codes) for x in points]
+        return [Path(x) for x in points]
     convert_mesh_to_paths = staticmethod(convert_mesh_to_paths)
 
     def get_datalim(self, transData):
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -111,6 +111,7 @@ def __init__(self, vertices, codes=None):
 
         self.should_simplify = (len(vertices) >= 128 and
                                 (codes is None or np.all(codes <= Path.LINETO)))
+        self.has_nonfinite = not np.isfinite(vertices).all()
         self.codes = codes
         self.vertices = vertices
 
@@ -183,13 +184,18 @@ def iter_segments(self, simplify=None):
                 for v in vertices[1:]:
                     yield v, LINETO
         elif codes is None:
-            next_code = MOVETO
-            for v in vertices:
-                if (~isfinite(v)).any():
-                    next_code = MOVETO
-                else:
-                    yield v, next_code
-                    next_code = LINETO
+            if self.has_nonfinite:
+                next_code = MOVETO
+                for v in vertices:
+                    if np.isfinite(v).all():
+                        yield v, next_code
+                        next_code = LINETO
+                    else:
+                        next_code = MOVETO
+            else:
+                yield vertices[0], MOVETO
+                for v in vertices[1:]:
+                    yield v, LINETO
         else:
             i = 0
             was_nan = False
@@ -203,7 +209,7 @@ def iter_segments(self, simplify=None):
                 else:
                     num_vertices = NUM_VERTICES[int(code)]
                     curr_vertices = vertices[i:i+num_vertices].flatten()
-                    if (~isfinite(curr_vertices)).any():
+                    if not isfinite(curr_vertices).all():
                         was_nan = True
                     elif was_nan:
                         yield curr_vertices[-2:], MOVETO
