add new arrow style (a line + filled triangles)

leejjoon · leejjoon · commit 04e59e0a667f · 2008-12-18T15:38:33.000Z
svn path=/trunk/matplotlib/; revision=6664
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2008-12-18 add new arrow style, a line + filled triangles. -JJL
+
 2008-12-18 Fix bug where a line with NULL data limits prevents
            subsequent data limits from calculating correctly - MGD
 
diff --git a/examples/pylab_examples/fancyarrow_demo.py b/examples/pylab_examples/fancyarrow_demo.py
@@ -3,23 +3,26 @@
 
 styles = mpatches.ArrowStyle.get_styles()
 
-figheight = (len(styles)+.5)
-fig1 = plt.figure(1, (4, figheight))
-fontsize = 0.3 * fig1.dpi
+ncol=2
+nrow = len(styles) // ncol + 1
+figheight = (nrow+0.5)
+fig1 = plt.figure(1, (4.*ncol/1.5, figheight/1.5))
+fontsize = 0.2 * 70
 
 
 ax = fig1.add_axes([0, 0, 1, 1], frameon=False, aspect=1.)
 
-ax.set_xlim(0, 4)
+ax.set_xlim(0, 4*ncol)
 ax.set_ylim(0, figheight)
 
 for i, (stylename, styleclass) in enumerate(sorted(styles.items())):
-    y = (float(len(styles)) -0.25 - i) # /figheight
-    p = mpatches.Circle((3.2, y), 0.2, fc="w")
+    x = 3.2 + (i//nrow)*4
+    y = (figheight - 0.7 - i%nrow) # /figheight
+    p = mpatches.Circle((x, y), 0.2, fc="w")
     ax.add_patch(p)
 
-    ax.annotate(stylename, (3.2, y),
-                (2., y),
+    ax.annotate(stylename, (x, y),
+                (x-1.2, y),
                 #xycoords="figure fraction", textcoords="figure fraction",
                 ha="right", va="center",
                 size=fontsize,
diff --git a/examples/pylab_examples/fancybox_demo2.py b/examples/pylab_examples/fancybox_demo2.py
@@ -4,8 +4,8 @@
 styles = mpatch.BoxStyle.get_styles()
 
 figheight = (len(styles)+.5)
-fig1 = plt.figure(1, (4, figheight))
-fontsize = 0.4 * fig1.dpi
+fig1 = plt.figure(1, (4/1.5, figheight/1.5))
+fontsize = 0.3 * 72
 
 for i, (stylename, styleclass) in enumerate(styles.items()):
     fig1.text(0.5, (float(len(styles)) - 0.5 - i)/figheight, stylename,
@@ -15,3 +15,4 @@
               bbox=dict(boxstyle=stylename, fc="w", ec="k"))
 plt.draw()
 plt.show()
+
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -468,6 +468,38 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
 
 
 
+def make_path_regular(p):
+    """
+    fill in the codes if None.
+    """
+    c = p.codes
+    if c is None:
+        c = np.empty(p.vertices.shape, "i")
+        c.fill(Path.LINETO)
+        c[0] = Path.MOVETO
+
+        return Path(p.vertices, c)
+    else:
+        return p
+    
+def concatenate_paths(paths):
+    """
+    concatenate list of paths into a single path.
+    """
+
+    vertices = []
+    codes = []
+    for p in paths:
+        p = make_path_regular(p)
+        vertices.append(p.vertices)
+        codes.append(p.codes)
+
+    _path = Path(np.concatenate(vertices),
+                 np.concatenate(codes))
+    return _path
+
+
+
 if 0:
     path = Path([(0, 0), (1, 0), (2, 2)],
                 [Path.MOVETO, Path.CURVE3, Path.CURVE3])
@@ -476,3 +508,4 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
     ax = gca()
 
 
+
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2008-12-18 add new arrow style, a line + filled triangles. -JJL`
	`2`	`+`
`1`	`3`	`2008-12-18 Fix bug where a line with NULL data limits prevents`
`2`	`4`	`subsequent data limits from calculating correctly - MGD`
`3`	`5`