numerous text fixes

jdh2358 · jdh2358 · commit 9f62c2199ca8 · 2004-06-02T14:58:24.000Z
svn path=/trunk/matplotlib/; revision=328
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,17 @@
 New entries should be added at the top
 
-2004-05-31 Added renderer markteredgewidth attribute of Line2D. - ADS
+2004-06-02 Fixed text clipping to clip to axes - JDH
+
+2004-06-02 Fixed leading newline text and multiple newline text - JDH
+
+2004-06-02 Fixed plot_date to return lines - JDH
+
+2004-06-01 Fixed plot to work with x or y having shape N,1 or 1,N - JDH
+
+2004-05-31 Added renderer markeredgewidth attribute of Line2D. - ADS
+
+
+2004-05-29 Fixed tick label clipping to work with navigation.
 
 2004-05-28 Added renderer grouping commands to support groups in
            SVG/PS. - JDH
diff --git a/TODO b/TODO
@@ -406,4 +406,6 @@
 
 -- add collections to lines
 
--- some strangeness in table when multiple saves are called
+-- some strangeness in table when multiple saves are called
+
+-- use RGBA throughout lib
diff --git a/examples/multiline.py b/examples/multiline.py
@@ -1,4 +1,5 @@
 from matplotlib.matlab import *
+
 plot(arange(10))
 xlabel('this is a xlabel\n(with newlines!)')
 ylabel('this is vertical\ntest', multialignment='center')
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -808,16 +808,31 @@ RendererAgg::draw_text(const Py::Tuple& args) {
   
   int x = Py::Int( args[1] );
   int y = Py::Int( args[2] );
-  Py::SeqBase<Py::Object> rgba = Py::SeqBase<Py::Object>( args[3] );
-  
-  double r = Py::Float( rgba[0] );
-  double g = Py::Float( rgba[1] );
-  double b = Py::Float( rgba[2] );
-  double a = Py::Float( rgba[3] );
-  
-  
+  Py::Object gc = args[3];
+
+  Py::Object o ( gc.getAttr( "_cliprect" ) );
+
+  bool useClip = o.ptr()!=Py_None;
+  double l = 0;
+  double b = 0;
+  double r = width;
+  double t = height;
+  if (useClip) {
+    Py::SeqBase<Py::Object> rect( o );
+  
+    l = Py::Float(rect[0]) ; 
+    b = Py::Float(rect[1]) ; 
+    double w = Py::Float(rect[2]) ; 
+    double h = Py::Float(rect[3]) ; 
+    r = l+w;
+    t = b+h;
+    //std::cout << b << " " << h << " " << " " << t << std::endl;
+  }
+
+  agg::rgba color = get_color(gc);  
   pixfmt::color_type p;
-  p.r = int(255*r); p.b = int(255*b); p.g = int(255*g); p.a = int(255*a);
+  p.r = int(255*color.r); p.b = int(255*color.b); 
+  p.g = int(255*color.g); p.a = int(255*color.a);
    
   //y = y-font->image.height;
   unsigned thisx, thisy;
@@ -826,8 +841,8 @@ RendererAgg::draw_text(const Py::Tuple& args) {
     for (size_t j=0; j<font->image.height; ++j) {
       thisx = i+x+font->image.offsetx; 
       thisy = j+y+font->image.offsety; 
-      if (thisx<0 || thisx>=width)  continue;
-      if (thisy<0 || thisy>=height) continue;
+      if (thisx<l || thisx>=r)  continue;
+      if (thisy<height-t || thisy>=height-b) continue;
       pixFmt->blend_pixel
 	(thisx, thisy, p, font->image.buffer[i + j*font->image.width]);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from matplotlib.matlab import *`
	`2`	`+`
`2`	`3`	`plot(arange(10))`
`3`	`4`	`xlabel('this is a xlabel\n(with newlines!)')`
`4`	`5`	`ylabel('this is vertical\ntest', multialignment='center')`