edin1 · edin1 · commit bed200ac350f · 2006-08-30T05:32:05.000Z
svn path=/trunk/matplotlib/; revision=2729
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-08-30 ft2font.cpp: Added draw_rect_filled method (now used by mathtext2
+           to draw the fraction bar) to FT2Font - ES
+
 2006-08-29 setupext.py: wrap calls to tk.getvar() with str(). On some 
            systems, getvar returns a Tcl_Obj instead of a string - DSD
 
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
@@ -615,7 +615,7 @@ def render(self, x, y):
                                                         y + self.ymax)
         #print coords
         #print "\n".join(repr(self.__dict__).split(","))
-        font.draw_rect(*coords)
+        font.draw_rect_filled(*coords)
 
 
 # Main parser functions
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -926,7 +926,7 @@ FT2Font::write_bitmap(const Py::Tuple & args) {
 }
 
 char FT2Font::draw_rect__doc__[] =
-"draw_bbox(x0, y0, x1, y1)\n"
+"draw_rect(x0, y0, x1, y1)\n"
 "\n"
 "Draw a rect to the image.  It is your responsibility to set the dimensions\n"
 "of the image, eg, with set_bitmap_size\n"
@@ -951,18 +951,52 @@ FT2Font::draw_rect(const Py::Tuple & args) {
        y0>iheight || y1>iheight )
     throw Py::ValueError("Rect coords outside image bounds");
 
-  for (long i=x0; i<x1; ++i) {
+  for (long i=x0; i<x1+1; ++i) {
     image.buffer[i + y0*iwidth] = 255;
     image.buffer[i + y1*iwidth] = 255;
   }
 
-  for (long j=y0; j<y1; ++j) {
+  for (long j=y0+1; j<y1; ++j) {
     image.buffer[x0 + j*iwidth] = 255;
     image.buffer[x1 + j*iwidth] = 255;
   }
   return Py::Object();
 }
 
+char FT2Font::draw_rect_filled__doc__[] =
+"draw_rect_filled(x0, y0, x1, y1)\n"
+"\n"
+"Draw a filled rect to the image.  It is your responsibility to set the\n"
+"dimensions of the image, eg, with set_bitmap_size\n"
+"\n"
+;
+Py::Object
+FT2Font::draw_rect_filled(const Py::Tuple & args) {
+  _VERBOSE("FT2Font::draw_rect_filled");
+
+  args.verify_length(4);
+
+  long x0 = Py::Int(args[0]);
+  long y0 = Py::Int(args[1]);
+  long x1 = Py::Int(args[2]);
+  long y1 = Py::Int(args[3]);
+
+  FT_Int iwidth = (FT_Int)image.width;
+  FT_Int iheight = (FT_Int)image.height;
+
+  if ( x0<0 || y0<0 || x1<0 || y1<0 ||
+       x0>iwidth || x1>iwidth ||
+       y0>iheight || y1>iheight )
+    throw Py::ValueError("Rect coords outside image bounds");
+
+  for (long j=y0; j<y1; ++j) {
+      for (long i=x0; i<x1+1; ++i) {
+        image.buffer[i + j*iwidth] = 255;
+      }
+  }
+  return Py::Object();
+}
+
 char FT2Font::image_as_str__doc__[] =
 "width, height, s = image_as_str()\n"
 "\n"
@@ -1562,6 +1596,8 @@ FT2Font::init_type() {
 		     FT2Font::load_char__doc__);
   add_varargs_method("draw_rect",&FT2Font::draw_rect,
 		     FT2Font::draw_rect__doc__);
+    add_varargs_method("draw_rect_filled",&FT2Font::draw_rect_filled,
+		     FT2Font::draw_rect_filled__doc__);
   add_varargs_method("draw_glyph_to_bitmap", &FT2Font::draw_glyph_to_bitmap,
 		     FT2Font::draw_glyph_to_bitmap__doc__);
   add_varargs_method("draw_glyphs_to_bitmap", &FT2Font::draw_glyphs_to_bitmap,
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -65,6 +65,7 @@ class FT2Font : public Py::PythonExtension<FT2Font> {
   Py::Object get_descent(const Py::Tuple & args);
   Py::Object write_bitmap(const Py::Tuple & args);
   Py::Object draw_rect(const Py::Tuple & args);
+  Py::Object draw_rect_filled(const Py::Tuple & args);
   Py::Object image_as_str(const Py::Tuple & args);
   Py::Object get_xys(const Py::Tuple & args);
   Py::Object draw_glyphs_to_bitmap(const Py::Tuple & args);
@@ -110,6 +111,7 @@ class FT2Font : public Py::PythonExtension<FT2Font> {
   static char get_kerning__doc__ [];
   static char write_bitmap__doc__ [];
   static char draw_rect__doc__ [];
+  static char draw_rect_filled__doc__ [];
   static char image_as_str__doc__ [];
   static char draw_glyphs_to_bitmap__doc__ [];
   static char get_xys__doc__ [];
