fixed images to fit in subplots

jdh2358 · jdh2358 · commit 1ec276756428 · 2004-03-12T23:25:09.000Z
svn path=/trunk/matplotlib/; revision=178
diff --git a/TODO b/TODO
@@ -268,4 +268,6 @@
 
 -- DONE add figure legend
 
--- fix newlines across backends
+-- fix newlines across backends
+
+-- support partial window expose redraws in agg
diff --git a/examples/image_demo.py b/examples/image_demo.py
@@ -2,19 +2,29 @@
 from matplotlib.image import NEAREST, BILINEAR, BICUBIC, SPLINE16
 from matplotlib.matlab import *
 
-
+w, h = 512, 512
 s = file('data/ct.raw', 'rb').read()
 A = fromstring(s, typecode=UInt16).astype(Float)
 A *= 1.0/max(A)
-A.shape = 512, 512
+A.shape = w, h
+
 
+figure(1, figsize=(2,7))
+subplot(211)
 im = imshow(A)
 #im.set_interpolation(BICUBIC)
 #im.set_interpolation(NEAREST)
 im.set_interpolation(BILINEAR)
 #im.set_preserve_aspect(ASPECT_PRESERVE)
+set(gca(), 'xlim', [0,h-1])
+axis('off')
+title('CT density')
 
-
-
+x = sum(A,0)
+subplot(212)
+bar(arange(w), x)
+set(gca(), 'xlim', [0,h-1])
+ylabel('density')
+set(gca(), 'xticklabels', [])
 show()
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2,7 +2,7 @@
 #include <png.h>
 #include "ft2font.h"
 #include "_backend_agg.h"
-#include "_image.h"
+#include "image.h"
 
 static PyObject *ErrorObject;
 
@@ -572,12 +572,14 @@ PyObject *
 RendererAgg_draw_image(RendererAggObject *renderer, PyObject* args) {
 
   ImageObject *image;
-  long x, y;
+  int x, y;
   if (!PyArg_ParseTuple(args, "iiO", &x, &y, &image))
     return NULL;
 
   //todo: handle x and y
-  renderer->rbuf->copy_from(*image->rbufOut);
+  agg::rect r(0, 0, image->widthOut, image->heightOut);
+
+  renderer->rbase->copy_from(*image->rbufOut, &r, x, y);
   Py_INCREF(Py_None);
   return Py_None;
 
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -2,6 +2,9 @@
  *
  * $Header$
  * $Log$
+ * Revision 1.5  2004/03/12 23:25:09  jdh2358
+ * fixed images to fit in subplots
+ *
  * Revision 1.4  2004/03/03 19:27:43  jdh2358
  * fixed gtk vert text bug
  *
@@ -24,6 +27,7 @@
 #include <cstdio>
 
 #include "agg_arrowhead.h"
+#include "agg_basics.h"
 #include "agg_conv_concat.h"
 #include "agg_conv_contour.h"
 #include "agg_conv_curve.h"
