[2890979] Close paths correctly in PolyCollection

svn path=/trunk/matplotlib/; revision=7921

Author: mdboom

lib/matplotlib/collections.py

@@ -574,14 +574,19 @@ def set_verts(self, verts, closed=True):
         if closed:
             self._paths = []
             for xy in verts:
-                if np.ma.isMaskedArray(xy):
-                    if len(xy) and (xy[0] != xy[-1]).any():
-                        xy = np.ma.concatenate([xy, [xy[0]]])
+                if len(xy):
+                    if np.ma.isMaskedArray(xy):
+                        xy = np.ma.concatenate([xy, np.zeros((1,2))])
+                    else:
+                        xy = np.asarray(xy)
+                        xy = np.concatenate([xy, np.zeros((1,2))])
+                    codes = np.empty(xy.shape[0], dtype=mpath.Path.code_type)
+                    codes[:] = mpath.Path.LINETO
+                    codes[0] = mpath.Path.MOVETO
+                    codes[-1] = mpath.Path.CLOSEPOLY
+                    self._paths.append(mpath.Path(xy, codes))
                 else:
-                    xy = np.asarray(xy)
-                    if len(xy) and (xy[0] != xy[-1]).any():
-                        xy = np.concatenate([xy, [xy[0]]])
-                self._paths.append(mpath.Path(xy))
+                    self._paths.append(mpath.Path(xy))
         else:
             self._paths = [mpath.Path(xy) for xy in verts]
 

lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf

@@ -407,6 +407,23 @@ def test_imshow_clip():
     ax.imshow(r, clip_path=clip_path)
     fig.savefig('imshow_clip')
 
+@image_comparison(baseline_images=['polycollection_joinstyle'])
+def test_polycollection_joinstyle():
+    # Bug #2890979 reported by Matthew West
+
+    from matplotlib import collections as mcoll
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    verts = np.array([[1,1], [1,2], [2,2], [2,1]])
+    c = mcoll.PolyCollection([verts], linewidths = 40)
+    ax.add_collection(c)
+    ax.set_xbound(0, 3)
+    ax.set_ybound(0, 3)
+    ax.set_xticks([])
+    ax.set_yticks([])
+
+    fig.savefig('polycollection_joinstyle')
 
 if __name__=='__main__':
     import nose

lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf

@@ -147,8 +147,7 @@ Py::Object BufferRegion::to_string_argb(const Py::Tuple &args) {
 }
 
 GCAgg::GCAgg(const Py::Object &gc, double dpi) :
-  dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0),
-  dashOffset(0.0)
+  dpi(dpi), isaa(true), dashOffset(0.0)
 {
   _VERBOSE("GCAgg::GCAgg");
   linewidth = points_to_pixels ( gc.getAttr("_linewidth") ) ;
@@ -164,13 +163,6 @@ GCAgg::GCAgg(const Py::Object &gc, double dpi) :
   _set_hatch_path(gc);
 }
 
-GCAgg::GCAgg(double dpi) :
-  dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0),
-  dashOffset(0.0)
-{
-
-}
-
 void
 GCAgg::_set_antialiased(const Py::Object& gc) {
   _VERBOSE("GCAgg::antialiased");
@@ -219,11 +211,11 @@ GCAgg::_set_joinstyle(const Py::Object& gc) {
 
   std::string joinstyle = Py::String( gc.getAttr("_joinstyle") );
 
-  if (joinstyle=="miter")
-    join =  agg::miter_join_revert;
-  else if (joinstyle=="round")
+  if (joinstyle == "miter")
+    join = agg::miter_join_revert;
+  else if (joinstyle == "round")
     join = agg::round_join;
-  else if(joinstyle=="bevel")
+  else if (joinstyle == "bevel")
     join = agg::bevel_join;
   else
     throw Py::ValueError(Printf("GC _joinstyle attribute must be one of butt, round, projecting; found %s", joinstyle.c_str()).str());
@@ -532,7 +524,7 @@ RendererAgg::draw_markers(const Py::Tuple& args) {
   if (args.size() == 6)
     face_obj = args[5];
 
-  GCAgg gc = GCAgg(gc_obj, dpi);
+  GCAgg gc(gc_obj, dpi);
 
   // Deal with the difference in y-axis direction
   marker_trans *= agg::trans_affine_scaling(1.0, -1.0);
@@ -775,7 +767,7 @@ RendererAgg::draw_text_image(const Py::Tuple& args) {
 
   double angle = Py::Float( args[3] );
 
-  GCAgg gc = GCAgg(args[4], dpi);
+  GCAgg gc(args[4], dpi);
 
   theRasterizer.reset_clipping();
   rendererBase.reset_clipping(true);
@@ -1081,7 +1073,8 @@ RendererAgg::draw_path(const Py::Tuple& args) {
 template<class PathGenerator, int check_snap, int has_curves>
 Py::Object
 RendererAgg::_draw_path_collection_generic
-  (agg::trans_affine              master_transform,
+  (GCAgg&                         gc,
+   agg::trans_affine              master_transform,
    const Py::Object&              cliprect,
    const Py::Object&              clippath,
    const agg::trans_affine&       clippath_trans,
@@ -1101,8 +1094,6 @@ RendererAgg::_draw_path_collection_generic
   typedef agg::conv_curve<quantized_t>                               quantized_curve_t;
   typedef agg::conv_curve<clipped_t>                                 curve_t;
 
-  GCAgg gc(dpi);
-
   PyArrayObject* offsets    = NULL;
   PyArrayObject* facecolors = NULL;
   PyArrayObject* edgecolors = NULL;
@@ -1312,7 +1303,8 @@ RendererAgg::draw_path_collection(const Py::Tuple& args) {
 
   try {
     _draw_path_collection_generic<PathListGenerator, 0, 1>
-      (master_transform,
+      (gc,
+       master_transform,
        gc.cliprect,
        gc.clippath,
        gc.clippath_trans,
@@ -1449,7 +1441,8 @@ RendererAgg::draw_quad_mesh(const Py::Tuple& args) {
   try {
     try {
       _draw_path_collection_generic<QuadMeshGenerator, 0, 0>
-        (master_transform,
+        (gc,
+         master_transform,
          gc.cliprect,
          gc.clippath,
          gc.clippath_trans,

lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png

@@ -104,7 +104,6 @@ class BufferRegion : public Py::PythonExtension<BufferRegion> {
 class GCAgg {
 public:
   GCAgg(const Py::Object& gc, double dpi);
-  GCAgg(double dpi);
 
   double dpi;
   bool isaa;
@@ -224,15 +223,16 @@ class RendererAgg: public Py::PythonExtension<RendererAgg> {
   bool render_clippath(const Py::Object& clippath, const agg::trans_affine& clippath_trans);
   template<class PathIteratorType>
   void _draw_path(PathIteratorType& path, bool has_clippath,
-		  const facepair_t& face, const GCAgg& gc);
+                  const facepair_t& face, const GCAgg& gc);
   template<class PathGenerator, int check_snap, int has_curves>
   Py::Object
   _draw_path_collection_generic
-    (agg::trans_affine 	            master_transform,
-     const Py::Object&		    cliprect,
-     const Py::Object&		    clippath,
+    (GCAgg&                         gc,
+     agg::trans_affine              master_transform,
+     const Py::Object&              cliprect,
+     const Py::Object&              clippath,
      const agg::trans_affine&       clippath_trans,
-     const PathGenerator&	    path_generator,
+     const PathGenerator&           path_generator,
      const Py::SeqBase<Py::Object>& transforms_obj,
      const Py::Object&              offsets_obj,
      const agg::trans_affine&       offset_trans,
@@ -262,7 +262,7 @@ class _backend_agg_module : public Py::ExtensionModule<_backend_agg_module>
     BufferRegion::init_type();
 
     add_keyword_method("RendererAgg", &_backend_agg_module::new_renderer,
-		       "RendererAgg(width, height, dpi)");
+                       "RendererAgg(width, height, dpi)");
     initialize( "The agg rendering backend" );
   }