fixed some text rotation bugs

jdh2358 · jdh2358 · commit 89a248d1b786 · 2004-12-23T18:10:44.000Z
svn path=/trunk/matplotlib/; revision=813
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2004-12-23 Fixed an agg text rotation alignment bug, fixed some text
+           kwarg processing bugs, and added examples/text_rotation.py
+           to explain and demonstrate how text rotations and alignment
+           work in matplotlib. - JDH
+
 ======================================================================
 
 2004-12-22 0.65.1 released - JDH
diff --git a/TODO b/TODO
@@ -614,4 +614,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- fix linestyle for collections
 
--- update ticklabels and range for colorbar when clim changes
+-- update ticklabels and range for colorbar when clim changes
+
+-- agg rotation bug for angles > 180
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -60,6 +60,7 @@
 #    'set_and_get.py',    
     'table_demo.py',
     'text_handles.py',
+    'text_rotation.py',
     'text_themes.py',
     'two_scales.py',
     'vline_demo.py',
diff --git a/examples/text_rotation.py b/examples/text_rotation.py
@@ -0,0 +1,40 @@
+"""
+The way matplotlib does text layout is counter-intuituve to some, so
+this example is designed to make it a little clearer.  The text is
+aligned by it's bounding box (the rectangular box that surrounds the
+ink rectangle).  The order of opertations is basically rotation then
+alignment, rather than alignment then rotation.  Basically, the text
+is centered at your x,y location, rotated around this point, and then
+aligned according to the bounding box of the rotated text.
+
+So if you specify left, bottom alignment, the bottom left of the
+bounding box of the rotated text will be at the x,y coordinate of the
+text.
+
+But a picture is worth a thousand words!
+"""
+from pylab import *
+
+def addtext(props):
+    text(0.5, 0.5, 'text 0', props, rotation=0)
+    text(1.5, 0.5, 'text 45', props, rotation=45)
+    text(2.5, 0.5, 'text 135', props, rotation=135)
+    text(3.5, 0.5, 'text 225', props, rotation=225)
+    text(4.5, 0.5, 'text -45', props, rotation=-45)
+    yticks([0,.5,1])
+    grid(True)
+
+# the text bounding box
+bbox = {'fc':0.8, 'pad':0} 
+
+subplot(211)
+addtext({'ha':'center', 'va':'center', 'bbox':bbox})
+xlim(0,5)
+xticks(arange(0, 5.1, 0.5), [])
+ylabel('center / center')
+subplot(212)
+addtext({'ha':'left', 'va':'bottom', 'bbox':bbox})
+xlim(0,5)
+xticks(arange(0, 5.1, 0.5))
+ylabel('left / bottom')
+show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -2600,7 +2600,7 @@ def set_ylabel(self, ylabel, fontdict=None, **kwargs):
         label = self.yaxis.get_label()
         label.set_text(ylabel)
     
-        if fontdict is not None: self.title.update(label)
+        if fontdict is not None: self.title.update(fontdict)
         label.update(kwargs)
         return label
 
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -286,7 +286,8 @@ def show(self):
         if not self._shown:
             self.window.deiconify()
             # anim.py requires this
-            if sys.platform=='win32' : self.window.update()            
+            if not sys.platform.startswith('linux') :
+                self.window.update()            
         else: self.canvas.draw()
         self._shown = True
         def destroy(*args):
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -320,15 +320,15 @@ def get_window_extent(self, renderer):
 
     def get_rotation_matrix(self, x0, y0):
 
-        theta = -pi/180.0*self.get_rotation()
+        theta = pi/180.0*self.get_rotation()
         # translate x0,y0 to origin
         Torigin = Matrix([ [1, 0, -x0],
                            [0, 1, -y0],
                            [0, 0, 1  ]]) 
         
         # rotate by theta
-        R = Matrix([ [cos(theta),  sin(theta), 0],
-                     [-sin(theta), cos(theta), 0],
+        R = Matrix([ [cos(theta),  -sin(theta), 0],
+                     [sin(theta), cos(theta), 0],
                      [0,           0,          1]]) 
 
         # translate origin back to x0,y0
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -416,7 +416,7 @@ FT2Font::set_text(const Py::Tuple & args) {
   _VERBOSE("FT2Font::set_text");
   args.verify_length(2);
   text = Py::String(args[0]);
-  double angle = Py::Float(args[1]);
+  angle = Py::Float(args[1]);
   
   angle = angle/360.0*2*3.14159;
   //this computes width and height in subpixels so we have to divide by 64
@@ -669,9 +669,9 @@ FT2Font::draw_glyphs_to_bitmap(const Py::Tuple & args) {
   image.offsetx = (int)(string_bbox.xMin/64.0);
   if (angle==0)  
     image.offsety = -image.height;
-  else
+  else {
     image.offsety = (int)(-string_bbox.yMax/64.0);
-
+  }
 
   size_t numBytes = image.width*image.height;
   delete [] image.buffer;
