Make Axes3D.contourf take arbitrary triangulations

dmcdougall · dmcdougall · commit 528d10c9e682 · 2013-06-21T23:58:04.000-05:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -2067,8 +2067,8 @@ def contourf(self, X, Y, Z, *args, **kwargs):
 
     contourf3D = contourf
 
-    def tricontourf(self, X, Y, Z, offset=None, zdir='z', *args, **kwargs):
-        '''
+    def tricontourf(self, *args, **kwargs):
+        """
         Create a 3D contourf plot.
 
         ==========  ================================================
@@ -2086,15 +2086,27 @@ def tricontourf(self, X, Y, Z, offset=None, zdir='z', *args, **kwargs):
 
         Returns a :class:`~matplotlib.axes.Axes.contour`
 
-        .. versionadded :: 1.1.0
-        '''
+        .. versionchanged :: 1.3.0
+            Added support for custom triangulations
+        """
         zdir = kwargs.pop('zdir', 'z')
         offset = kwargs.pop('offset', None)
 
         had_data = self.has_data()
 
+        tri, args, kwargs = Triangulation.get_from_args_and_kwargs(
+                *args, **kwargs)
+        X = tri.x
+        Y = tri.y
+        Z = args[0]
+
+        # We do this so Z doesn't get passed as an arg to Axes.tricontour
+        args = args[1:]
+
         jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
-        cset = Axes.tricontourf(self, X, Y, Z, *args, **kwargs)
+        tri = Triangulation(jX, jY, tri.triangles, tri.mask)
+
+        cset = Axes.tricontourf(self, tri, jZ, *args, **kwargs)
         self.add_contourf_set(cset, zdir, offset)
 
         self.auto_scale_xyz(X, Y, Z, had_data)
