First pass support at contour hatching.

Phil Elson · Phil Elson · commit 6e2061a5529c · 2012-02-17T18:21:30.000Z
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -46,6 +46,7 @@ class Collection(artist.Artist, cm.ScalarMappable):
           :class:`matplotlib.cm.ScalarMappable`)
         * *cmap*: None (optional for
           :class:`matplotlib.cm.ScalarMappable`)
+        * *hatch*: None
 
     *offsets* and *transOffset* are used to translate the patch after
     rendering (default no offsets).
@@ -77,6 +78,7 @@ def __init__(self,
                  norm = None,  # optional for ScalarMappable
                  cmap = None,  # ditto
                  pickradius = 5.0,
+                 hatch=None,
                  urls = None,
                  **kwargs
                  ):
@@ -95,6 +97,7 @@ def __init__(self,
         self.set_antialiased(antialiaseds)
         self.set_pickradius(pickradius)
         self.set_urls(urls)
+        self.set_hatch(hatch)
 
 
         self._uniform_offsets = None
@@ -232,7 +235,10 @@ def draw(self, renderer):
         gc = renderer.new_gc()
         self._set_gc_clip(gc)
         gc.set_snap(self.get_snap())
-
+        
+        if self._hatch:
+            gc.set_hatch(self._hatch)
+        
         renderer.draw_path_collection(
             gc, transform.frozen(), paths, self.get_transforms(),
             offsets, transOffset, self.get_facecolor(), self.get_edgecolor(),
@@ -292,6 +298,38 @@ def set_urls(self, urls):
 
     def get_urls(self): return self._urls
 
+    def set_hatch(self, hatch):
+        """
+        Set the hatching pattern
+
+        *hatch* can be one of::
+
+          /   - diagonal hatching
+          \   - back diagonal
+          |   - vertical
+          -   - horizontal
+          +   - crossed
+          x   - crossed diagonal
+          o   - small circle
+          O   - large circle
+          .   - dots
+          *   - stars
+
+        Letters can be combined, in which case all the specified
+        hatchings are done.  If same letter repeats, it increases the
+        density of hatching of that pattern.
+
+        Hatching is supported in the PostScript, PDF, SVG and Agg
+        backends only.
+
+        ACCEPTS: [ '/' | '\\\\' | '|' | '-' | '+' | 'x' | 'o' | 'O' | '.' | '*' ]
+        """
+        self._hatch = hatch
+
+    def get_hatch(self):
+        'Return the current hatching pattern'
+        return self._hatch
+
     def set_offsets(self, offsets):
         """
         Set the offsets for the collection.  *offsets* can be a scalar
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -731,6 +731,8 @@ def __init__(self, ax, *args, **kwargs):
         self.linewidths = kwargs.get('linewidths', None)
         self.linestyles = kwargs.get('linestyles', None)
 
+        self.hatch = kwargs.get('hatch', [None])
+
         self.alpha = kwargs.get('alpha', None)
         self.origin = kwargs.get('origin', None)
         self.extent = kwargs.get('extent', None)
@@ -909,9 +911,12 @@ def changed(self):
         tcolors = [ (tuple(rgba),) for rgba in
                                 self.to_rgba(self.cvalues, alpha=self.alpha)]
         self.tcolors = tcolors
-        for color, collection in zip(tcolors, self.collections):
+        thatches = self.hatch * len(tcolors)
+        self.thatches = thatches        
+        for color, hatch, collection in zip(tcolors, thatches, self.collections):
             if self.filled:
                 collection.set_facecolor(color)
+                collection.set_hatch(hatch)
             else:
                 collection.set_color(color)
         for label, cv in zip(self.labelTexts, self.labelCValues):
