added newline sep text

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

Author: jdh2358

CHANGELOG

@@ -1,5 +1,9 @@
 New entries should be added at the top
 ------------------------------------------------------------
+
+2004-05-18 Added newline seperated text with rotations to text.Text
+           layout - JDH
+
 2004-05-16 Added fast pcolor using PolyCollections.  - JDH
 
 2004-05-14 Added fast polygon collections - changed scatter to use

TODO

@@ -290,9 +290,9 @@
 
 -- DONE support fontdicts, with deprecation as necessary
 
--- move text layout to front end and support newlines with rotation.
+-- DONE move text layout to front end and support newlines with rotation.
 
--- aligment test of backend_ps and table_demo on all backends
+-- DONE aligment test of backend_ps and table_demo on all backends
 
 -- fix the sqrt mathtext bug revealed by Flavio's example
 
@@ -345,7 +345,7 @@
 
 -- DONE expose line set dashes
 
--- fix vertical layout in PS
+-- DONE fix vertical layout in PS
 
 -- DONE y clipping broken
 
@@ -355,10 +355,10 @@
 
 -- DONE scatter demos whacked
 
--- fix small artist bboxing problems
+-- DONE fix small artist bboxing problems
 
--- fix backend image area problem for vert text in GTK - related to
-   rect I think
+-- DONE fix backend image area problem for vert text in GTK - related to
+   ascender I think - same problem as above
 
 -- Tim's log y on hist.
 
@@ -378,9 +378,12 @@
 
 -- DONE - pcolor edge color
 
--- fix log bar - worked on OSX?
+-- DONE fix log bar - worked on OSX?
 
 -- convert rank 1 arrays as per Flaviu's post
 
 -- email tim log bar code after release
 
+-- fix + 2 hack in width, height of ft2font and backend_agg and GTK
+
+-- check mathtext in GTK

examples/histogram_demo.py

@@ -5,7 +5,7 @@
 x = mu + sigma*randn(10000)
 
 # the histogram of the data
-n, bins, patches = hist(x, 50, normed=1)
+n, bins, patches = hist(x, 50, normed=1, bottom=0.001)
 
 # add a 'best fit' line
 y = normpdf( bins, mu, sigma)
@@ -17,6 +17,7 @@
 title(r'$\rm{Histogram of IQ: }\mu=100, \sigma=15$')
 axis([40, 160, 0, 0.03])
 grid(True)
+set(gca(), 'yscale', 'log')
 #set(gca(), 'xlim', [40, 160])
 #savefig('histogram_demo',dpi=72)
 show()

examples/simple_plot.py

@@ -9,8 +9,9 @@
 xlabel('time (s)')
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
+#title('AAAAAAAAAAAAAAAAAAAAAAA')
 grid(True)
 #axis([0,1,-1,1])
-savefig('simple_plot', dpi=300)
+#savefig('simple_plot', dpi=300)
 
 show()

src/_backend_agg.cpp

@@ -815,6 +815,29 @@ RendererAgg::draw_text(const Py::Tuple& args) {
 	(i+x, y+j, p, font->image.buffer[i + j*font->image.width]);
     }
   }
+
+  /*  bbox the text for debug purposes
+
+  agg::path_storage path;
+  
+  path.move_to(x, y);
+  path.line_to(x, y+font->image.height);
+  path.line_to(x+font->image.width, y+font->image.height);
+  path.line_to(x+font->image.width, y);
+  path.close_polygon();
+  
+  agg::rgba edgecolor(1,0,0,1);
+  
+  //now fill the edge
+  agg::conv_stroke<agg::path_storage> stroke(path);
+  stroke.width(1.0);
+  theRenderer->color(edgecolor);
+  //self->theRasterizer->gamma(agg::gamma_power(gamma));
+  theRasterizer->add_path(stroke);
+  theRasterizer->render(*slineP8, *theRenderer);  
+  
+  */
+
   return Py::Object();
 
 }

src/ft2font.c

@@ -622,7 +622,7 @@ FT2Font_get_width_height(FT2FontObject *self, PyObject *args)
   return Py_BuildValue("(ll)", 
 		       (bbox.xMax - bbox.xMin), 
 		       (bbox.yMax - bbox.yMin));
-}
+ }
 
 
 void