added vertical mathtext for agg

jdh2358 · jdh2358 · commit 485af836d289 · 2004-07-19T19:19:10.000Z
svn path=/trunk/matplotlib/; revision=406
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2004-07-19 Added vertical mathtext - thanks Jim Benson! - JDH
+
 2004-07-16 Added ps/eps/svg savefig options to wx and gtk JDH
 
 2004-07-15 Fixed python framework tk finder in setupext.py - JDH
diff --git a/TODO b/TODO
@@ -469,3 +469,8 @@
 
 -- font dict in wx is broken w/ respect to new font names
 
+-- update nav section of tutorial
+
+-- track down transforms memleak
+
+-- make sure you handle cacheing of rotated mathtext properly
diff --git a/examples/mathtext_demo.py b/examples/mathtext_demo.py
@@ -16,17 +16,13 @@
 #plot(x, sin(2*pi*x))
 grid(True)
 xlabel(r'$\Delta_i^j$', fontsize=20)
-ylabel(r'$\Delta_{i+1}^j$', fontsize=20,  # no rotation yet for mathtext
-       verticalalignment='center',
-       horizontalalignment='right',
-       rotation='horizontal')
+ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
 tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$'
 #tex = r'$\cal{R}\prod^\infty a_i\rm{sin}(2 \pi f x_i)$'
 
 #tex = r'$\alpha\beta\gamma$'
 text(1, 2.6, tex, fontsize=20)
 title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
-#savefig('mathtext_demo_small', dpi=100)
-savefig('mathtext_demo_large', dpi=300)
+savefig('mathtext_demo')
 
 show()
diff --git a/examples/scatter_demo2.py b/examples/scatter_demo2.py
@@ -13,15 +13,11 @@
 set(p, 'alpha', 0.75)
 set(gca(), 'xticks', arange(-0.06, 0.061, 0.02))
 set(gca(), 'yticks', arange(-0.06, 0.061, 0.02))
-xlabel(r'$\Delta_i$', fontsize='x-large')
-ylabel(r'$\Delta_{i+1}$', fontsize='x-large',
-       verticalalignment='center',
-       horizontalalignment='right',
-       rotation='horizontal'
-       )
+xlabel(r'$\Delta_i$', size='x-large')
+ylabel(r'$\Delta_{i+1}$', size='x-large')
 title(r'Volume and percent change')
 grid(True)
-savefig('scatter_demo2')
+#savefig('scatter_demo2')
 
 show()
 
diff --git a/setupext.py b/setupext.py
@@ -36,7 +36,7 @@
     'linux2' : ['/usr/local', '/usr',],
     'linux'  : ['/usr/local', '/usr',],
     'darwin' : [os.getenv('MPLIB_BASE') or '/usr/local', '/usr', '/sw'],
-    'freebsd4' : [os.getenv('MPLIB_BASE') or '/usr/local', '/usr'],
+    'freebsd4' : [os.getenv('MBLIB_BASE') or '/usr/local', '/usr'],
     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
 }
 
@@ -212,59 +212,15 @@ def add_tk_flags(module):
         module.include_dirs.extend(['win32_static/include/tcl'])
         module.library_dirs.extend(['C:/Python23/dlls'])
         module.libraries.extend(['tk84', 'tcl84'])
-        return
-
-    elif sys.platform == 'darwin' :
-        # this config section lifted directly from Imaging - thanks to
-        # the effbot!
-
-        # First test for a MacOSX/darwin framework install
-        from os.path import join, exists
-        framework_dirs = [
-            '/System/Library/Frameworks/',
-            '/Library/Frameworks',
-            join(os.getenv('HOME'), '/Library/Frameworks')
-        ]
-
-        # Find the directory that contains the Tcl.framwork and Tk.framework
-        # bundles.
-        # XXX distutils should support -F!
-        for F in framework_dirs:
-            # both Tcl.framework and Tk.framework should be present
-            for fw in 'Tcl', 'Tk':
-                if not exists(join(F, fw + '.framework')):
-                    break
-            else:
-                # ok, F is now directory with both frameworks. Continure
-                # building
-                tk_framework_found = 1
-                break
-        if tk_framework_found:
-            # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-            # frameworks. In later release we should hopefully be able to pass
-            # the -F option to gcc, which specifies a framework lookup path.
-            #
-            tk_include_dirs = [
-                join(F, fw + '.framework', H)
-                for fw in 'Tcl', 'Tk'
-                for H in 'Headers', 'Versions/Current/PrivateHeaders'
-            ]
-
-            # For 8.4a2, the X11 headers are not included. Rather than include a
-            # complicated search, this is a hard-coded path. It could bail out
-            # if X11 libs are not found...
-            # tk_include_dirs.append('/usr/X11R6/include')
-            frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-            module.include_dirs.extend(tk_include_dirs)
-            module.extra_link_args.extend(frameworks)
-            module.extra_compile_args.extend(frameworks)
-            return
-
-    # you're still here? ok we'll try it this way
-    o = find_tcltk()
-    module.include_dirs.extend([o.tcl_inc, o.tk_inc])
-    module.library_dirs.extend([o.tcl_lib, o.tk_lib])
-    module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
+    else:
+        o = find_tcltk()
+        if sys.platform == 'darwin' and '/Library/Framework' in o.tk_lib:
+            module.extra_link_args.extend(['-framework','Tcl'])
+            module.extra_link_args.extend(['-framework','Tk'])
+        else:
+            module.include_dirs.extend([o.tcl_inc, o.tk_inc])
+            module.library_dirs.extend([o.tcl_lib, o.tk_lib])
+            module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
 
 
 def add_windowing_flags(module):
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -7,7 +7,7 @@
  
 FT_Library _ft2Library;
 
-FT2Image::FT2Image() : buffer(NULL) {}
+FT2Image::FT2Image() : bRotated(false), buffer(NULL)  {}
 FT2Image::~FT2Image() {delete [] buffer; buffer=NULL;}
 
 Glyph::Glyph( const FT_Face& face, const FT_Glyph& glyph, size_t ind) :
@@ -147,6 +147,62 @@ FT2Font::~FT2Font()
   }
 }
 
+
+char  FT2Font::horiz_image_to_vert_image__doc__[] =
+"horiz_image_to_vert_image()\n"
+"\n"
+"Copies the horizontal image (w, h) into a\n"
+"new image of size (h,w)\n"
+"This is equivalent to rotating the original image\n"
+"by 90 degrees ccw\n" 
+;
+
+Py::Object
+FT2Font::horiz_image_to_vert_image(const Py::Tuple & args) {
+
+   // If we have already rotated, just return.
+   
+  if (image.bRotated) 
+    return Py::Object(); 
+
+
+   long width = image.width, height = image.height;
+   
+   long newWidth  = image.height;
+   long newHeight = image.width;
+
+   long numBytes = image.width * image.height;
+   
+   unsigned char * buffer = new unsigned char [numBytes];
+
+   long  i, j, k, offset, nhMinusOne;   
+
+   nhMinusOne = newHeight-1;
+
+   for (i=0; i<height; i++) {
+
+      offset = i*width;
+
+      for (j=0; j<width; j++) {
+
+         k = nhMinusOne - j; 
+         
+         buffer[i + k*newWidth] = image.buffer[j + offset];
+         
+      }
+
+   }
+
+   delete [] image.buffer;
+   image.buffer = buffer;
+   image.width = newWidth;
+   image.height = newHeight;
+   image.bRotated = true;
+       
+   return Py::Object();
+
+}
+
 int 
 FT2Font::setattr( const char *name, const Py::Object &value ) {
   _VERBOSE("FT2Font::setattr");
@@ -1104,6 +1160,9 @@ FT2Font::init_type() {
 		     FT2Font::get_ps_font_info__doc__);
   add_varargs_method("get_sfnt_table", &FT2Font::get_sfnt_table,
 		     FT2Font::get_sfnt_table__doc__);
+  add_varargs_method("horiz_image_to_vert_image", 
+		     &FT2Font::horiz_image_to_vert_image,
+		     FT2Font::horiz_image_to_vert_image__doc__);
   
   behaviors().supportGetattr();
   behaviors().supportSetattr();
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -23,6 +23,7 @@ class FT2Image {
 public:
   FT2Image();
   ~FT2Image();
+  bool bRotated;
   unsigned char *buffer;
   unsigned long width;
   unsigned long height;
@@ -67,6 +68,7 @@ class FT2Font : public Py::PythonExtension<FT2Font> {
   Py::Object get_name_index(const Py::Tuple & args);
   Py::Object get_ps_font_info(const Py::Tuple & args);
   Py::Object get_sfnt_table(const Py::Tuple & args);
+  Py::Object horiz_image_to_vert_image(const Py::Tuple & args);
   int setattr( const char *_name, const Py::Object &value );
   Py::Object getattr( const char *_name );
   FT2Image image;
@@ -108,7 +110,7 @@ class FT2Font : public Py::PythonExtension<FT2Font> {
   static char get_name_index__doc__[];
   static char get_ps_font_info__doc__[];
   static char get_sfnt_table__doc__[];
-
+  static char horiz_image_to_vert_image__doc__[];
 };
 
 // the extension module
