impl snapto for len(2) lines only

jdh2358 · jdh2358 · commit 2f5ba91522b4 · 2005-05-22T17:21:31.000Z
svn path=/trunk/matplotlib/; revision=1359
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -123,7 +123,7 @@ font.monospace      : Andale Mono, Bitstream Vera Sans Mono, Nimbus Mono L, Cour
 # http://matplotlib.sourceforge.net/matplotlib.text.html for more
 # information on text properties
 text.color          : black
-text.usetex         : False  # experimental, broken
+text.usetex         : True  # experimental, broken
 
 ### AXES
 # default face and edge color, default tick sizes,
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -216,7 +216,7 @@ def get_image(self, tex, fontsize=10, dpi=80, rgb=(0,0,0)):
 
         if im is None:
             # skip cacheing while debugging
-            pngfile = self.make_png(tex, dpi, force=True) 
+            pngfile = self.make_png(tex, dpi, force=False) 
             X = readpng(pngfile)
             # To compare my results with the result of using dvipng's,
             # change this to 'if 0:' and uncomment the third "command"
@@ -226,8 +226,8 @@ def get_image(self, tex, fontsize=10, dpi=80, rgb=(0,0,0)):
             # I try and recover the alpha information
             if 1:                
                 alpha = 1-X[:,:,0]
-                visible = alpha>0
-                print 'min/max', min(ravel(alpha)), max(ravel(alpha))
+                #visible = alpha>0
+                #print 'min/max', min(ravel(alpha)), max(ravel(alpha))
                 Z = zeros(X.shape, Float)
                 Z[:,:,0] = r
                 Z[:,:,1] = g
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -324,8 +324,8 @@ def draw(self, renderer):
                 x, y = self._transform.xy_tup((x, y))
                 if renderer.flipy():
                     y = canvash-y
-                renderer.draw_text(gc, x, y, line,
-                                  self._fontproperties, angle, ismath)
+                renderer.draw_tex(gc, x, y, line,
+                                  self._fontproperties, angle)
             return 
             
         for line, wh, x, y in info:
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1001,6 +1001,8 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
   
   double lastx(-2.0), lasty(-2.0);
   
+  bool snapto = Nx==2;
+  
   for (size_t i=0; i<Nx; i++) {
     thisx = *(double *)(xa->data + i*xa->strides[0]);
     thisy = *(double *)(ya->data + i*ya->strides[0]);
@@ -1022,11 +1024,15 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
     //don't render line segments less that on pixel long!
     if (!moveto && (i>0) && fabs(thisx-lastx)<1.0 && fabs(thisy-lasty)<1.0) {
       continue;
-     }
-    thisx = (int)thisx + 0.5;
-    thisy = (int)thisy + 0.5;
+    }
+
     lastx = thisx;
     lasty = thisy;
+    if (snapto) {
+      thisx = (int)thisx + 0.5;
+      thisy = (int)thisy + 0.5;
+    }
+
     if (moveto)
       path.move_to(thisx, thisy);
     else
