added broken barh

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

Author: jdh2358

CHANGELOG

@@ -1,3 +1,10 @@
+2006-11-05 Added broken_barh function for makring a sequence of
+horizontal bars broken by gaps -- see examples/broken_barh.py
+
+2006-11-05 Removed lineprops and markerprops from the Annotation code
+    and replaced them with an arrow configurable with kwarg
+    arrowprops.  See examples/annotation_demo.py - JDH
+
 2006-11-02 Fixed a pylab subplot bug that was causing axes to be
            deleted with hspace or wspace equals zero in
            subplots_adjust - JDH

boilerplate.py

@@ -54,6 +54,7 @@ def %(func)s(*args, **kwargs):
     'axvspan',
     'bar',
     'barh',
+    'broken_barh',
     'boxplot',
     'cohere',
     'clabel',

examples/broken_barh.py

@@ -0,0 +1,23 @@
+"""
+Make a "broken" horizontal bar plot, ie one with gaps
+"""
+from pylab import figure, show, nx
+
+fig = figure()
+ax = fig.add_subplot(111)
+ax.broken_barh([ (110, 30), (150, 10) ] , (10, 9), facecolors='blue')
+ax.broken_barh([ (10, 50), (100, 20),  (130, 10)] , (20, 9),
+                facecolors=('red', 'yellow', 'green'))
+ax.set_ylim(5,35)
+ax.set_xlim(0,200)
+ax.set_xlabel('seconds since start')
+ax.set_yticks([15,25])
+ax.set_yticklabels(['Bill', 'Jim'])
+ax.grid(True)
+ax.annotate('race interrupted', (61, 25),
+            xytext=(0.8, 0.9), textcoords='axes fraction',
+            arrowprops=dict(facecolor='black', shrink=0.05),
+            fontsize=16,
+            horizontalalignment='right', verticalalignment='top')
+
+show()

lib/matplotlib/axes.py

@@ -15,8 +15,8 @@
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, \
      allequal, dict_delall, popd, popall, silent_list, is_numlike
-from collections import RegularPolyCollection, PolyCollection, LineCollection, QuadMesh, \
-     StarPolygonCollection
+from collections import RegularPolyCollection, PolyCollection, LineCollection, \
+     QuadMesh, StarPolygonCollection, BrokenBarHCollection
 from colors import colorConverter, normalize, Colormap, \
         LinearSegmentedColormap, looks_like_color, is_color_like
 import cm
@@ -432,20 +432,28 @@ def _set_lim_and_transforms(self):
         if self._sharex is not None:
             left=self._sharex.viewLim.ll().x()
             right=self._sharex.viewLim.ur().x()
+            #dleft=self._sharex.dataLim.ll().x()
+            #dright=self._sharex.dataLim.ur().x()
         else:
             left=zero()
             right=one()
+            #dleft=zero()
+            #dright=one()
         if self._sharey is not None:
             bottom=self._sharey.viewLim.ll().y()
             top=self._sharey.viewLim.ur().y()
+            #dbottom=self._sharey.dataLim.ll().y()
+            #dtop=self._sharey.dataLim.ur().y()
         else:
             bottom=zero()
             top=one()
+            #dbottom=zero()
+            #dtop=one()
 
         self.viewLim = Bbox(Point(left, bottom), Point(right, top))
+        #self.dataLim = Bbox(Point(dleft, dbottom), Point(dright, dtop))
         self.dataLim = unit_bbox()
 
-
         self.transData = get_bbox_transform(self.viewLim, self.bbox)
         self.transAxes = get_bbox_transform(unit_bbox(), self.bbox)
 
@@ -2626,7 +2634,32 @@ def barh(self, bottom, width, height=0.8, left=0,
                            )
         return patches
 
+    def broken_barh(self, xranges, yrange, **kwargs):
+        """
+        A colleciton of horizontal bars spanning yrange with a sequence of
+        xranges
+
+        xranges : sequence of (xmin, xwidth)
+        yrange  : (ymin, ywidth)
+        
+        optional kwargs:
+          edgecolors
+          facecolors
+          linewidths
+          antialiaseds
+
+        these can either be a single argument, ie facecolors='black'
+        or a sequence of arguments for the various bars, ie
+        facecolors='black', 'red', 'green'
+
+        """
+        col = BrokenBarHCollection(xranges, yrange, **kwargs)
+        self.add_collection(col, autolim=True)
+        self.autoscale_view()
+
+        return col
 
+                    
     def stem(self, x, y, linefmt='b-', markerfmt='bo', basefmt='r-'):
         """
         STEM(x, y, linefmt='b-', markerfmt='bo', basefmt='r-')

lib/matplotlib/collections.py

@@ -278,8 +278,22 @@ def get_verts(self, dataTrans=None):
             return [tuple(xy) for xy in self._offsets]
         raise NotImplementedError('Vertices in data coordinates are calculated\n'
                 + 'with offsets only if _transOffset == dataTrans.')
-
-
+ 
+class BrokenBarHCollection(PolyCollection):
+    """
+    A colleciton of horizontal bars spanning yrange with a sequence of
+    xranges
+    """
+    def __init__(self, xranges, yrange, **kwargs):
+        """
+        xranges : sequence of (xmin, xwidth)
+        yrange  : ymin, ywidth
+        """
+        ymin, ywidth = yrange
+        ymax = ymin + ywidth
+        verts = [ [(xmin, ymin), (xmin, ymax), (xmin+xwidth, ymax), (xmin+xwidth, ymin)] for xmin, xwidth in xranges]
+        PolyCollection.__init__(self, verts, **kwargs)
+         
 class RegularPolyCollection(PatchCollection):
     def __init__(self,
                  dpi,