major overhaul of text

jdh2358 · jdh2358 · commit 9fa4e26a578a · 2004-05-04T18:37:44.000Z
svn path=/trunk/matplotlib/; revision=278
diff --git a/TODO b/TODO
@@ -341,4 +341,6 @@
 
 -- savefig to file handle.
 
--- add agg and and image generic tostring methods
+-- add agg and and image generic tostring methods
+
+-- expose line set dashes
diff --git a/examples/alignment_test.py b/examples/alignment_test.py
@@ -82,6 +82,13 @@
         transx=ax.xaxis.transAxis,
         transy=ax.yaxis.transAxis)
 
+ax.text(left, top, 'rotated',
+        horizontalalignment='center',
+        verticalalignment='center',
+        rotation=45,
+        transx=ax.xaxis.transAxis,
+        transy=ax.yaxis.transAxis)
+
 axis('off')
-#savefig('alignment_test', dpi=300)
+savefig('alignment_test', dpi=300)
 show()
diff --git a/examples/dash_control.py b/examples/dash_control.py
@@ -0,0 +1,12 @@
+"""
+You can precisely specify dashes with an on/off ink rect sequence in
+points.
+"""
+from matplotlib.matlab import *
+
+dashes = [5,2,10,5] # 5 points on, 2 off, 3 on, 1 off
+
+l, = plot(arange(20), '--')
+l.set_dashes(dashes)
+#savefig('dash_control')
+show()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -316,9 +316,11 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
     dash_t dash(path);
     agg::conv_stroke<dash_t> stroke(dash);
     double on, off;
-    for (size_t i=0; i<N/2; i+=2) {
+    for (size_t i=0; i<N/2; i+=1) {
+      
       on = points_to_pixels_snapto(dashSeq[2*i]);
       off = points_to_pixels_snapto(dashSeq[2*i+1]);
+      //std::cout << "agg setting" << on << " " << off << std::endl;
       dash.add_dash(on, off);
     }
     stroke.line_cap(cap);
@@ -371,7 +373,7 @@ RendererAgg::draw_text(const Py::Tuple& args) {
       if (j+y>=height) continue;
       
       pixFmt->blend_pixel
-	(i+x, j+y, p, font->image.buffer[i + j*font->image.width]);
+	(i+x, y+j, p, font->image.buffer[i + j*font->image.width]);
     }
   }
   return Py::Object();
