Merge pull request #2732 from mdboom/fix-patch3dcollection

mdboom · mdboom · commit 9a164c776447 · 2014-01-29T06:42:54.000-08:00
AttributeError: 'Patch3DCollection' object has no attribute 'set_sizes'
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -76,7 +76,6 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
             master_transform, paths, all_transforms):
             path_ids.append((path, transform))
         master_transform = master_transform.get_matrix()
-        all_transforms = [t.get_matrix() for t in all_transforms]
         offsetTrans = offsetTrans.get_matrix()
         gc.draw_path_collection(master_transform, path_ids, all_transforms,
                              offsets, offsetTrans, facecolors, edgecolors,
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -15,7 +15,7 @@
 
 from matplotlib import lines, text as mtext, path as mpath, colors as mcolors
 from matplotlib.collections import Collection, LineCollection, \
-        PolyCollection, PatchCollection
+        PolyCollection, PatchCollection, PathCollection
 from matplotlib.cm import ScalarMappable
 from matplotlib.patches import Patch
 from matplotlib.colors import Normalize
@@ -294,7 +294,7 @@ def pathpatch_2d_to_3d(pathpatch, z=0, zdir='z'):
     pathpatch.__class__ = PathPatch3D
     pathpatch.set_3d_properties(mpath, z, zdir)
 
-class Patch3DCollection(PatchCollection):
+class Collection3D(object):
     '''
     A collection of 3D patches.
     '''
@@ -343,7 +343,7 @@ def do_3d_projection(self, renderer):
         self._alpha = None
         self.set_facecolors(zalpha(self._facecolor3d, vzs))
         self.set_edgecolors(zalpha(self._edgecolor3d, vzs))
-        PatchCollection.set_offsets(self, list(zip(vxs, vys)))
+        super(self.__class__, self).set_offsets(list(zip(vxs, vys)))
 
         if vzs.size > 0 :
             return min(vzs)
@@ -353,14 +353,26 @@ def do_3d_projection(self, renderer):
     def draw(self, renderer):
         self._old_draw(renderer)
 
+
+class Patch3DCollection(Collection3D, PatchCollection):
+    pass
+
+
+class Path3DCollection(Collection3D, PathCollection):
+    pass
+
+
 def patch_collection_2d_to_3d(col, zs=0, zdir='z'):
     """Convert a PatchCollection to a Patch3DCollection object."""
 
     # The tricky part here is that there are several classes that are
     # derived from PatchCollection. We need to use the right draw method.
     col._old_draw = col.draw
 
-    col.__class__ = Patch3DCollection
+    if isinstance(col, PathCollection):
+        col.__class__ = Path3DCollection
+    elif isinstance(col, PatchCollection):
+        col.__class__ = Patch3DCollection
     col.set_3d_properties(zs, zdir)
 
 class Poly3DCollection(PolyCollection):
