sync to 0.54.1

jdh2358 · jdh2358 · commit c5583f785943 · 2004-05-27T21:11:27.000Z
svn path=/trunk/matplotlib/; revision=319
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -25,7 +25,7 @@
 
 #### CONFIGURATION BEGINS HERE
 backend      : GTKAgg    # the default backend
-numerix      : numarray   # Numeric or numarray
+numerix      : Numeric   # Numeric or numarray
 interactive  : False     # see http://matplotlib.sourceforge.net/interactive.html
 
 ### LINES
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2004-05-27 Lots of small bug fixes: rotated text at negative angles,
+           errorbar autoscaling, right tick label position - JDH
 
 2004-05-26 Added Gary's errorbar stuff and made some fixes for length
            one plots and constant data plots - JDH
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.54
+LICENSE AGREEMENT FOR MATPLOTLIB 0.54.1
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.54
+derivative works, distribute, and otherwise use matplotlib 0.54.1
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2004 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.54 alone or in any derivative version prepared by
+matplotlib 0.54.1 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.54 or any part thereof, and wants to
+incorporates matplotlib 0.54.1 or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.54.
+the changes made to matplotlib 0.54.1.
 
-4. JDH is making matplotlib 0.54 available to Licensee on an "AS
+4. JDH is making matplotlib 0.54.1 available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.54
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.54.1
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.54 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.54.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.54, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.54.1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.54,
+8. By copying, installing or otherwise using matplotlib 0.54.1,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
diff --git a/TODO b/TODO
@@ -396,8 +396,14 @@
 
 -- DONE incorporate gary's errorbar
 
---  bug in -45 newline text
+-- DONE  bug in -45 newline text
 
 -- write to stream in Agg
 
--- gtkagg bug in win98
+-- DONE gtkagg bug in win98
+
+-- DONE fix try in errorbar
+
+-- add collections to lines
+
+-- some strangeness in table when multiple saves are called
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -64,15 +64,15 @@ def drive(backend):
         for line in file(fname):
             if line.strip().startswith('from __future__ import division'): continue
             if line.strip().startswith('matplotlib.use'): continue
-            if line.strip().startswith('#savefig'): continue
+            if line.strip().startswith('savefig'): continue
             if line.strip().startswith('show'): continue
             lines.append(line)
         basename, ext = os.path.splitext(fname)
         outfile = basename + '_%s'%backend
         if backend in ('GTK', 'WX', 'TkAgg'):
             lines.append('show()')
         else:
-            lines.append('#savefig("%s", dpi=150)' % outfile)
+            lines.append('savefig("%s", dpi=150)' % outfile)
         tmpfile = '_tmp_%s.py' % basename
         file(tmpfile, 'w').write(''.join(lines))
         os.system('python %s' % tmpfile)
diff --git a/examples/finance_demo.py b/examples/finance_demo.py
@@ -33,6 +33,7 @@
 
 #plot_day_summary(ax, quotes, ticksize=3, converter=converter)
 candlestick(ax, quotes, width=0.6, converter=converter)
+set( gca().get_xticklabels(), 'rotation', 45, 'horizontalalignment', 'right')
 
 show()
 
diff --git a/examples/histogram_demo.py b/examples/histogram_demo.py
@@ -19,5 +19,5 @@
 grid(True)
 
 #set(gca(), 'xlim', [40, 160])
-#savefig('histogram_demo',dpi=72)
+savefig('histogram_demo',dpi=72)
 show()
diff --git a/examples/log_test.py b/examples/log_test.py
@@ -2,7 +2,7 @@
 from matplotlib.matlab import *
 
 dt = 0.01
-t = arange(dt, 200.0, dt)
+t = arange(dt, 20.0, dt)
 
 semilogx(t, exp(-t/5.0))
 grid(True)
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -11,6 +11,6 @@
 title('About as simple as it gets, folks')
 grid(True)
 #axis([0,1,-1,1])
-#savefig('simple_plot', dpi=300)
+savefig('simple_plot')
 
 show()
diff --git a/examples/table_demo.py b/examples/table_demo.py
@@ -42,5 +42,7 @@
 set(gca(), 'yticklabels', ['%d' % val for val in yticks])
 set(gca(), 'xticks', [])
 title('Loss by Disaster')
-#savefig('table_demo')
+savefig('table_demo_small', dpi=75)
+savefig('table_demo_large', dpi=300)
+
 show()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -818,15 +818,18 @@ RendererAgg::draw_text(const Py::Tuple& args) {
   
   pixfmt::color_type p;
   p.r = int(255*r); p.b = int(255*b); p.g = int(255*g); p.a = int(255*a);
+   
+  //y = y-font->image.height;
+  unsigned thisx, thisy;
   
-  y = y-font->image.height;
   for (size_t i=0; i<font->image.width; ++i) {
     for (size_t j=0; j<font->image.height; ++j) {
-      if (i+x>=width)  continue;
-      if (j+y>=height) continue;
-      
+      thisx = i+x+font->image.offsetx; 
+      thisy = j+y+font->image.offsety; 
+      if (thisx<0 || thisx>=width)  continue;
+      if (thisy<0 || thisy>=height) continue;
       pixFmt->blend_pixel
-	(i+x, y+j, p, font->image.buffer[i + j*font->image.width]);
+	(thisx, thisy, p, font->image.buffer[i + j*font->image.width]);
     }
   }
 
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -1,7 +1,7 @@
 #include <functional>
 #include <numeric>
 #include "_transforms.h"
-
+ 
 #ifdef NUMARRAY
 #include "numarray/arrayobject.h" 
 #else
@@ -588,6 +588,7 @@ Transformation::numerix_x_y(const Py::Tuple & args) {
 
     double thisx = *(double *)(x->data + i*x->strides[0]);
     double thisy = *(double *)(y->data + i*y->strides[0]);
+    //std::cout << "calling operator " << thisx << " " << thisy << " " << std::endl;
     this->operator()(thisx, thisy);
     *(double *)(retx->data + i*retx->strides[0]) = xy.first;
     *(double *)(rety->data + i*rety->strides[0]) = xy.second;
diff --git a/src/_transforms.h b/src/_transforms.h
@@ -345,8 +345,10 @@ class Log : public Func {
   static void init_type(void);
 
   double operator()(const double& x) { 
-    if (x<=0) 
+    if (x<=0) {
       throw Py::ValueError("Cannot take log of nonpositive value");
+      
+    }
     return log10(x);
   };
 
diff --git a/src/ft2font.c b/src/ft2font.c
@@ -328,6 +328,9 @@ FT2Font_clear(FT2FontObject *self)
   self->image.buffer = NULL;
   self->image.width = 0;
   self->image.height = 0;
+  self->image.offsetx = 0.0;
+  self->image.offsety = 0.0;
+
   self->text = NULL;
   self->angle = 0.0;
 
@@ -763,12 +766,19 @@ FT2Font_draw_glyphs_to_bitmap(FT2FontObject *self, PyObject *args)
   self->image.width   = (string_bbox.xMax-string_bbox.xMin) / 64+2;
   self->image.height  = (string_bbox.yMax-string_bbox.yMin) / 64+2;
 
+  self->image.offsetx = string_bbox.xMin/64.0;
+  if (self->angle==0)  
+    self->image.offsety =    -self->image.height;
+  else 
+    self->image.offsety =   -string_bbox.yMax/64.0;
+  
+  //printf("offset %d, %1.2f, %1.2f\n", self->image.height, string_bbox.yMin/64.0, string_bbox.yMax/64.0);
   numBytes = self->image.width*self->image.height;
   free(self->image.buffer);
   self->image.buffer = (unsigned char *)malloc(numBytes);
   for (n=0; n<numBytes; n++) 
     self->image.buffer[n] = 0;
-  
+
   for ( n = 0; n < self->num_glyphs; n++ )
     {
       FT_BBox bbox;
@@ -792,7 +802,7 @@ FT2Font_draw_glyphs_to_bitmap(FT2FontObject *self, PyObject *args)
       /* now, draw to our target surface (convert position) */
       
       
-      //bitmap left and top in pixel, string bbok in subpixel
+      //bitmap left and top in pixel, string bbox in subpixel
       draw_bitmap( &bitmap->bitmap, 
 		   &self->image, 		   	       
 		   bitmap->left-string_bbox.xMin/64,
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -14,6 +14,7 @@ typedef struct {
   unsigned char *buffer;
   unsigned long width;
   unsigned long height;
+  int offsetx, offsety;
 } FT2_Image;
 
 typedef struct {
@@ -39,6 +40,7 @@ typedef struct {
   double angle;
   int num_chars;
   int num_glyphs;
+
   FT2_Image image;
 } FT2FontObject;
 
