fixed subplot bug

jdh2358 · jdh2358 · commit a5d42bf66fda · 2004-03-08T14:56:53.000Z
svn path=/trunk/matplotlib/; revision=173
diff --git a/MANIFEST b/MANIFEST
@@ -8,6 +8,7 @@ INTERACTIVE
 KNOWN_BUGS
 LICENSE
 LICENSE_PAINT
+MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -424,19 +425,14 @@ src/_tkagg.cpp
 src/ft2font.c
 src/ft2font.h
 ttfquery/__init__.py
-ttfquery/__init__.pyc
 ttfquery/_scriptregistry.py
-ttfquery/_scriptregistry.pyc
 ttfquery/describe.py
-ttfquery/describe.pyc
 ttfquery/family_query.py
 ttfquery/findsystem.py
-ttfquery/findsystem.pyc
 ttfquery/font_family_groups.py
 ttfquery/glyph.py
 ttfquery/glyphquery.py
 ttfquery/guessdescription.py
 ttfquery/license.txt
 ttfquery/metadata_query.py
 ttfquery/ttffiles.py
-ttfquery/ttffiles.pyc
diff --git a/Makefile b/Makefile
@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.24  2004/03/08 14:56:44  jdh2358
+# fixed subplot bug
+#
 # Revision 1.23  2004/02/27 14:47:46  jdh2358
 # added matplotlibrc and tk win32 compile fixes
 #
@@ -132,7 +135,7 @@ htmldocs:
 	cd htdocs;\
 	${PYTHON} process_docs.py;\
 	${PYTHON} convert.py;\
-	tar cfz site.tar.gz *.html screenshots tut examples gd API_CHANGES;\
+	tar cfz site.tar.gz *.html screenshots tut examples gd .matplotlibrc NUMARRAY_ISSUES  API_CHANGES;\
 	cd ..;\
 	rm matplotlib/backends/*.so;\
 
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -3,7 +3,7 @@
 figure(1)
 t = arange(0.0, 1.0, 0.01)
 s = sin(2*2*pi*t)
-plot(t, s)
+plot(t, s, linewidth=1.0)
 
 xlabel('time (s)')
 ylabel('voltage (mV)')
diff --git a/setup.py b/setup.py
@@ -5,31 +5,31 @@
 
 # build the freetype2 interface - this is required for mathtext
 # Requires freetype2, and libz
-BUILD_FT2FONT = 0
+BUILD_FT2FONT = 1
 
 # Build the fonttools and TTFQuery packages, required by the Paint,
 # Agg and GD backends.
-BUILD_FONTTOOLS = 0
+BUILD_FONTTOOLS = 1
 
 # Build the antigrain geometry toolkit.  Agg makes heavy use of
 # templates, so it probably requires a fairly recent compiler to build
 # it.  It makes very nice antialiased output and also supports alpha
 # blending
-BUILD_AGG = 0
+BUILD_AGG = 1
 
 # The builds below are alpha.  They use an image backend (eg GD or
 # Agg) to render to the GTK canvas.  The idea is to could use a single
 # high quality image renderer to render to all the GUI windows
 
 # build GTK GUI with Agg renderer ; requires pygtk src distros installed
-BUILD_GTKAGG       = 0
+BUILD_GTKAGG       = 1
 
 # build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
 BUILD_GTKGD        = 0
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
-BUILD_TKAGG        = 0
+BUILD_TKAGG        = 1
 
 ## You shouldn't need to customize below this point
 
@@ -91,7 +91,7 @@
 
 
 setup(name="matplotlib",
-      version= '0.51',
+      version= '0.52a',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -47,8 +47,18 @@ double
 _points_to_pixels(RendererAggObject* renderer, double pt) {
   // convert a value in points to pixels depending on renderer dpi and
   // scrren pixels per inch
+  return (pt*PIXELS_PER_INCH/72.0*renderer->dpi/72.0);
+
+}
+
+double 
+_points_to_pixels_snapto(RendererAggObject* renderer, double pt) {
+  // convert a value in points to pixels depending on renderer dpi and
+  // scrren pixels per inch
+  // snap return pixels to grid
   return (int)(pt*PIXELS_PER_INCH/72.0*renderer->dpi/72.0)+0.5;
 
+
 }
 
 
@@ -618,7 +628,7 @@ RendererAgg_draw_lines(RendererAggObject *renderer, PyObject* args) {
   PyObject *dashSeq = NULL;
   if (useDashes) {
     //TODO: use offset
-    offset = _points_to_pixels(renderer, _seqitem_as_double(dashes, 0));
+    offset = _points_to_pixels_snapto(renderer, _seqitem_as_double(dashes, 0));
     //note, you must decref this later if useDashes
     dashSeq = PySequence_GetItem(dashes, 1); 
   };
@@ -629,14 +639,31 @@ RendererAgg_draw_lines(RendererAggObject *renderer, PyObject* args) {
 
   double thisX, thisY;	
   unsigned winHeight = renderer->rbase->height();
-  thisX = (int)(_seqitem_as_double(x, 0))+0.5;
-  thisY = (int)(winHeight - _seqitem_as_double(y, 0))+0.5;
-  path.move_to(thisX, thisY);
-  for (int i=1; i<Nx; ++i) {
-    thisX = (int)(_seqitem_as_double(x, i))+0.5;
-    thisY = (int)(winHeight - _seqitem_as_double(y, i)) + 0.5;
-    path.line_to(thisX, thisY);
+
+  if (Nx==2) { 
+    // this is a little hack - len(2) lines are probably grid and
+    // ticks so I'm going to snap to pixel
+    thisX = (int)(_seqitem_as_double(x, 0))+0.5;
+    thisY = (int)(winHeight - _seqitem_as_double(y, 0))+0.5;
+    path.move_to(thisX, thisY);
+    for (int i=1; i<Nx; ++i) {
+      thisX = (int)(_seqitem_as_double(x, i))+0.5;
+      thisY = (int)(winHeight - _seqitem_as_double(y, i)) + 0.5;
+      path.line_to(thisX, thisY);
+    }
   }
+  else {
+    thisX = _seqitem_as_double(x, 0);
+    thisY = (winHeight - _seqitem_as_double(y, 0));
+    path.move_to(thisX, thisY);
+    for (int i=1; i<Nx; ++i) {
+      thisX = (_seqitem_as_double(x, i));
+      thisY = (winHeight - _seqitem_as_double(y, i)) ;
+      path.line_to(thisX, thisY);
+    }
+  }  
+
+  
 
 
 
@@ -671,8 +698,8 @@ RendererAgg_draw_lines(RendererAggObject *renderer, PyObject* args) {
     agg::conv_stroke<dash_t> stroke(dash);
     double on, off;
     for (int i=0; i<N/2; i+=2) {
-      on = _points_to_pixels(renderer,  _seqitem_as_double(dashSeq, 2*i));
-      off = _points_to_pixels(renderer, _seqitem_as_double(dashSeq, 2*i+1));
+      on = _points_to_pixels_snapto(renderer,  _seqitem_as_double(dashSeq, 2*i));
+      off = _points_to_pixels_snapto(renderer, _seqitem_as_double(dashSeq, 2*i+1));
       dash.add_dash(on, off);
     }
     stroke.line_cap(cap);
