Fix single pixel markers. The pixel shape is now optimized so it does the right thing in the Agg backend. For raster backends, linejoin and cap styles is now correctly passed to and used in the backend.

Author: mdboom

lib/matplotlib/backends/backend_pdf.py

@@ -1213,7 +1213,7 @@ def writeImages(self):
 
             img.flipud_out()
 
-    def markerObject(self, path, trans, fillp, strokep, lw):
+    def markerObject(self, path, trans, fillp, strokep, lw, joinstyle, capstyle):
         """Return name of a marker XObject representing the given path."""
         # self.markers used by markerObject, writeMarkers, close:
         # mapping from (path operations, fill?, stroke?) to
@@ -1228,7 +1228,7 @@ def markerObject(self, path, trans, fillp, strokep, lw):
         # first two components of each value in self.markers to be the
         # name and object reference.
         pathops = self.pathOperations(path, trans, simplify=False)
-        key = (tuple(pathops), bool(fillp), bool(strokep))
+        key = (tuple(pathops), bool(fillp), bool(strokep), joinstyle, capstyle)
         result = self.markers.get(key)
         if result is None:
             name = Name('M%d' % len(self.markers))
@@ -1242,13 +1242,15 @@ def markerObject(self, path, trans, fillp, strokep, lw):
         return name
 
     def writeMarkers(self):
-        for ((pathops, fillp, strokep),
+        for ((pathops, fillp, strokep, joinstyle, capstyle),
              (name, ob, bbox, lw)) in self.markers.iteritems():
             bbox = bbox.padded(lw * 0.5)
             self.beginStream(
                 ob.id, None,
                 {'Type': Name('XObject'), 'Subtype': Name('Form'),
                  'BBox': list(bbox.extents) })
+            self.output(GraphicsContextPdf.joinstyles[joinstyle], Op.setlinejoin)
+            self.output(GraphicsContextPdf.capstyles[capstyle], Op.setlinecap)
             self.output(*pathops)
             self.output(Op.paint_path(False, fillp, strokep))
             self.endStream()
@@ -1474,7 +1476,8 @@ def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None)
 
         output = self.file.output
         marker = self.file.markerObject(
-            marker_path, marker_trans, fillp, strokep, self.gc._linewidth)
+            marker_path, marker_trans, fillp, strokep, self.gc._linewidth,
+            gc.get_joinstyle(), gc.get_capstyle())
 
         output(Op.gsave)
         lastx, lasty = 0, 0

lib/matplotlib/backends/backend_ps.py

@@ -591,6 +591,11 @@ def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None)
 
         # construct the generic marker command:
         ps_cmd = ['/o {', 'gsave', 'newpath', 'translate'] # dont want the translate to be global
+        jint = gc.get_joinstyle()
+        ps_cmd.append('%d setlinejoin' % jint)
+        cint = gc.get_capstyle()
+        ps_cmd.append('%d setlinecap' % cint)
+
         ps_cmd.append(self._convert_path(marker_path, marker_trans,
                                          simplify=False))
 

lib/matplotlib/backends/backend_svg.py

@@ -374,7 +374,7 @@ def _write_hatches(self):
             writer.end(u'pattern')
         writer.end(u'defs')
 
-    def _get_style(self, gc, rgbFace):
+    def _get_style_dict(self, gc, rgbFace):
         """
         return the style string.  style is generated from the
         GraphicsContext and rgbFace
@@ -407,7 +407,10 @@ def _get_style(self, gc, rgbFace):
             if gc.get_capstyle() != 'projecting':
                 attrib[u'stroke-linecap'] = _capstyle_d[gc.get_capstyle()]
 
-        return generate_css(attrib)
+        return attrib
+
+    def _get_style(self, gc, rgbFace):
+        return generate_css(self._get_style_dict(gc, rgbFace))
 
     def _get_clip(self, gc):
         cliprect = gc.get_clip_rectangle()
@@ -540,12 +543,18 @@ def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None)
             marker_path,
             marker_trans + Affine2D().scale(1.0, -1.0),
             simplify=False)
-        dictkey = (path_data)
+        style = self._get_style_dict(gc, rgbFace)
+        dictkey = (path_data, generate_css(style))
         oid = self._markers.get(dictkey)
+        for key in style.keys():
+            if not key.startswith('stroke'):
+                del style[key]
+        style = generate_css(style)
+
         if oid is None:
             oid = self._make_id(u'm', dictkey)
             writer.start(u'defs')
-            writer.element(u'path', id=oid, d=path_data)
+            writer.element(u'path', id=oid, d=path_data, style=style)
             writer.end(u'defs')
             self._markers[dictkey] = oid
 
@@ -576,15 +585,9 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
             master_transform, paths, all_transforms)):
             transform = Affine2D(transform.get_matrix()).scale(1.0, -1.0)
             d = self._convert_path(path, transform, simplify=False)
-<<<<<<< HEAD
             oid = u'C%x_%x_%s' % (self._path_collection_id, i,
                                   self._make_id(u'', d))
             writer.element(u'path', id=oid, d=d)
-=======
-            oid = 'C%x_%x_%s' % (self._path_collection_id, i,
-                                 self._make_id('', d))
-            writer.element('path', id=oid, d=d)
->>>>>>> Prevent duplicate marker ids
             path_codes.append(oid)
         writer.end(u'defs')
 

lib/matplotlib/lines.py

@@ -542,6 +542,8 @@ def draw(self, renderer):
                 if type(snap) == float:
                     snap = renderer.points_to_pixels(self._markersize) >= snap
                 gc.set_snap(snap)
+                gc.set_joinstyle(marker.get_joinstyle())
+                gc.set_capstyle(marker.get_capstyle())
                 marker_path = marker.get_path()
                 marker_trans = marker.get_transform()
                 w = renderer.points_to_pixels(self._markersize)

lib/matplotlib/markers.py

@@ -118,6 +118,8 @@ def _recache(self):
         self._alt_path = None
         self._alt_transform = None
         self._snap_threshold = None
+        self._joinstyle = 'round'
+        self._capstyle = 'butt'
         self._filled = True
         self._marker_function()
 
@@ -136,6 +138,12 @@ def set_fillstyle(self, fillstyle):
         self._fillstyle = fillstyle
         self._recache()
 
+    def get_joinstyle(self):
+        return self._joinstyle
+
+    def get_capstyle(self):
+        return self._capstyle
+
     def get_marker(self):
         return self._marker
 
@@ -201,11 +209,14 @@ def _set_tuple_marker(self):
             symstyle = marker[1]
             if symstyle == 0:
                 self._path = Path.unit_regular_polygon(numsides)
+                self._joinstyle = 'miter'
             elif symstyle == 1:
                 self._path = Path.unit_regular_star(numsides)
+                self._joinstyle = 'bevel'
             elif symstyle == 2:
                 self._path = Path.unit_regular_asterisk(numsides)
                 self._filled = False
+                self._joinstyle = 'bevel'
             elif symstyle == 3:
                 self._path = Path.unit_circle()
             self._transform = Affine2D().scale(0.5).rotate_deg(rotation)
@@ -269,8 +280,10 @@ def _set_circle(self, reduction = 1.0):
 
     def _set_pixel(self):
         self._path = Path.unit_rectangle()
-        self._transform = Affine2D().translate(-0.5, 0.5)
+        self._transform = Affine2D().translate(-0.5, -0.5) \
+                          .scale(0.5, 0.5).translate(0.5, 0.5)
         self._snap_threshold = False
+        self._joinstyle = 'miter'
 
     def _set_point(self):
         self._set_circle(reduction = self._point_size_reduction)
@@ -319,6 +332,8 @@ def _set_triangle(self, rot, skip):
 
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_triangle_up(self):
         return self._set_triangle(0.0, 0)
 
@@ -351,6 +366,8 @@ def _set_square(self):
             self._transform.rotate_deg(rotate)
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_diamond(self):
         self._transform = Affine2D().translate(-0.5, -0.5).rotate_deg(45)
         self._snap_threshold = 5.0
@@ -369,6 +386,8 @@ def _set_diamond(self):
             self._transform.rotate_deg(rotate)
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_thin_diamond(self):
         self._set_diamond()
         self._transform.scale(0.6, 1.0)
@@ -403,6 +422,8 @@ def _set_pentagon(self):
             self._alt_path = mpath_alt
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_star(self):
         self._transform = Affine2D().scale(0.5)
         self._snap_threshold = 5.0
@@ -432,6 +453,8 @@ def _set_star(self):
             self._alt_path = mpath_alt
             self._alt_transform = self._transform
 
+        self._joinstyle = 'bevel'
+
     def _set_hexagon1(self):
         self._transform = Affine2D().scale(0.5)
         self._snap_threshold = 5.0
@@ -464,6 +487,8 @@ def _set_hexagon1(self):
             self._alt_path = mpath_alt
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_hexagon2(self):
         self._transform = Affine2D().scale(0.5).rotate_deg(30)
         self._snap_threshold = 5.0
@@ -496,6 +521,8 @@ def _set_hexagon2(self):
             self._alt_path = mpath_alt
             self._alt_transform = self._transform
 
+        self._joinstyle = 'miter'
+
     def _set_octagon(self):
         self._transform = Affine2D().scale(0.5)
         self._snap_threshold = 5.0
@@ -520,6 +547,8 @@ def _set_octagon(self):
             self._path = self._alt_path = half
             self._alt_transform = self._transform.frozen().rotate_deg(180.0)
 
+        self._joinstyle = 'miter'
+
     _line_marker_path = Path([[0.0, -1.0], [0.0, 1.0]])
     def _set_vline(self):
         self._transform = Affine2D().scale(0.5)
@@ -605,24 +634,28 @@ def _set_caretdown(self):
         self._snap_threshold = 3.0
         self._filled = False
         self._path = self._caret_path
+        self._joinstyle = 'miter'
 
     def _set_caretup(self):
         self._transform = Affine2D().scale(0.5).rotate_deg(180)
         self._snap_threshold = 3.0
         self._filled = False
         self._path = self._caret_path
+        self._joinstyle = 'miter'
 
     def _set_caretleft(self):
         self._transform = Affine2D().scale(0.5).rotate_deg(270)
         self._snap_threshold = 3.0
         self._filled = False
         self._path = self._caret_path
+        self._joinstyle = 'miter'
 
     def _set_caretright(self):
         self._transform = Affine2D().scale(0.5).rotate_deg(90)
         self._snap_threshold = 3.0
         self._filled = False
         self._path = self._caret_path
+        self._joinstyle = 'miter'
 
     _x_path = Path([[-1.0, -1.0], [1.0, 1.0],
                     [-1.0, 1.0], [1.0, -1.0]],