Merge pull request #695 from mdboom/pixel_marker

mdboom · mdboom · commit e270359aa2bd · 2012-02-29T10:20:59.000-08:00
Fix single pixel markers
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1187,10 +1187,10 @@ def writeImages(self):
 
             img.flipud_out()
 
-    def markerObject(self, path, trans, fillp, lw):
+    def markerObject(self, path, trans, fillp, lw, joinstyle, capstyle):
         """Return name of a marker XObject representing the given path."""
         pathops = self.pathOperations(path, trans, simplify=False)
-        key = (tuple(pathops), bool(fillp))
+        key = (tuple(pathops), bool(fillp), joinstyle, capstyle)
         result = self.markers.get(key)
         if result is None:
             name = Name('M%d' % len(self.markers))
@@ -1204,12 +1204,14 @@ def markerObject(self, path, trans, fillp, lw):
         return name
 
     def writeMarkers(self):
-        for (pathops, fillp),(name, ob, bbox, lw) in self.markers.iteritems():
+        for (pathops, fillp, 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)
             if fillp:
                 self.output(Op.fill_stroke)
@@ -1402,7 +1404,7 @@ def draw_image(self, gc, x, y, im, dx=None, dy=None, transform=None):
             h = 72.0*h/self.image_dpi
         else:
             h = dy
-        
+
         imob = self.file.imageObject(im)
 
         if transform is None:
@@ -1416,7 +1418,7 @@ def draw_image(self, gc, x, y, im, dx=None, dy=None, transform=None):
                              tr1, tr2, tr3, tr4, tr5, tr6, Op.concat_matrix,
                              w, 0, 0, h, x, y, Op.concat_matrix,
                              imob, Op.use_xobject, Op.grestore)
-        
+
 
     def draw_path(self, gc, path, transform, rgbFace=None):
         self.check_gc(gc, rgbFace)
@@ -1438,7 +1440,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, self.gc._linewidth)
+            marker_path, marker_trans, fillp, self.gc._linewidth,
+            gc.get_joinstyle(), gc.get_capstyle())
 
         output(Op.gsave)
         lastx, lasty = 0, 0
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -72,7 +72,7 @@ def gs_exe(self):
         self._cached["gs_exe"] = gs_exe
         return gs_exe
 
-    
+
     @property
     def gs_version(self):
         """
@@ -97,7 +97,7 @@ def supports_ps2write(self):
         True if the installed ghostscript supports ps2write device.
         """
         return self.gs_version[0] >= 9
-    
+
 ps_backend_helper = PsBackendHelper()
 
 papersize = {'letter': (8.5,11),
@@ -582,13 +582,29 @@ 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
+
+        lw = gc.get_linewidth()
+        stroke = lw != 0.0
+        if stroke:
+            ps_cmd.append('%.1f setlinewidth' % lw)
+            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))
 
         if rgbFace:
-            ps_cmd.extend(['gsave', ps_color, 'fill', 'grestore'])
+            if stroke:
+                ps_cmd.append('gsave')
+            ps_cmd.extend([ps_color, 'fill'])
+            if stroke:
+                ps_cmd.append('grestore')
 
-        ps_cmd.extend(['stroke', 'grestore', '} bind def'])
+        if stroke:
+            ps_cmd.append('stroke')
+        ps_cmd.extend(['grestore', '} bind def'])
 
         for vertices, code in path.iter_segments(trans, simplify=False):
             if len(vertices):
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -370,7 +370,7 @@ def _write_hatches(self):
             writer.end('pattern')
         writer.end('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
@@ -403,7 +403,10 @@ def _get_style(self, gc, rgbFace):
             if gc.get_capstyle() != 'projecting':
                 attrib['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()
@@ -536,12 +539,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('m', dictkey)
             writer.start('defs')
-            writer.element('path', id=oid, d=path_data)
+            writer.element('path', id=oid, d=path_data, style=style)
             writer.end('defs')
             self._markers[dictkey] = oid
 
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -541,11 +541,16 @@ 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)
-                if marker.get_marker() != ',': # Don't scale for pixels
+                if marker.get_marker() != ',':
+                    # Don't scale for pixels, and don't stroke them
                     marker_trans = marker_trans.scale(w)
+                else:
+                    gc.set_linewidth(0)
                 renderer.draw_markers(
                     gc, marker_path, marker_trans, subsampled, affine.frozen(),
                     rgbFace)
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
