added image support for raw image

jdh2358 · jdh2358 · commit 9211cb37442e · 2004-06-22T14:02:24.000Z
svn path=/trunk/matplotlib/; revision=353
diff --git a/examples/mri_with_eeg.py b/examples/mri_with_eeg.py
@@ -7,7 +7,9 @@
 from matplotlib.matlab import *
 from matplotlib.lines import Line2D
 from matplotlib.transforms import get_bbox_transform, Point, Value, Bbox,\
-     translation_transform, zero
+     unit_bbox
+
+
 # I use if 1 to break up the different regions of code visually
 
 if 1:   # load the data
@@ -41,15 +43,30 @@
     ticklocs = []
     ax = subplot(212)
 
-    height = 72  # height of one EEG in pixels
-    # transform data to axes coord (0,1)
-    
+    boxin = Bbox(
+        Point(ax.viewLim.ll().x(), Value(-20)),
+        Point(ax.viewLim.ur().x(), Value(20)))
+
+
+    height = ax.bbox.ur().y() - ax.bbox.ll().y()
+    boxout = Bbox(
+        Point(ax.bbox.ll().x(), Value(-1)*height),
+        Point(ax.bbox.ur().x(), Value(1) * height))
+
+
+    transOffset = get_bbox_transform(
+        unit_bbox(),
+        Bbox( Point( Value(0), ax.bbox.ll().y()),
+              Point( Value(1), ax.bbox.ur().y())
+              ))
+
 
     for i in range(numRows):
-        trans = get_bbox_transform(ax.viewLim, ax.bbox)
+        # effectively a copy of transData
+        trans = get_bbox_transform(boxin, boxout) 
         offset = (i+1)/(numRows+1)
-        height = Value(offset) * (ax.bbox.ur().y() - ax.bbox.ll().y())
-        trans.set_offset( (0,0), translation_transform(zero(), height) )
+
+        trans.set_offset( (0, offset), transOffset)
         
         thisLine = Line2D(
             t, data[:,i]-data[0,i],
@@ -61,13 +78,20 @@
         ticklocs.append(offset)
 
     set(gca(), 'xlim', [0,10])
-    set(gca(), 'ylim', [0,200])    
     set(gca(), 'xticks', arange(10))
-    yticks = set(gca(), 'yticks', ticklocs)
+
     set(gca(), 'yticklabels', ['PG3', 'PG5', 'PG7', 'PG9']) 
 
     # set the yticks to use axes coords on the y axis
-    set(yticks, 'transform', ax.transAxes)
+    ax.set_yticks(ticklocs)
+    for tick in ax.yaxis.get_major_ticks():
+        tick.label1.set_transform(ax.transAxes)
+        tick.label2.set_transform(ax.transAxes)        
+        tick.tick1line.set_transform(ax.transAxes)
+        tick.tick2line.set_transform(ax.transAxes)        
+        tick.gridline.set_transform(ax.transAxes)                
+
+
     xlabel('time (s)')
 
 
diff --git a/examples/psd_demo.py b/examples/psd_demo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+1#!/usr/bin/env python
 # python
 
 from matplotlib.matlab import *
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -1,4 +1,4 @@
-
+#include <iostream>
 #include <fstream>
 #include <cmath>
 #include <cstdio>
@@ -184,6 +184,7 @@ Image_resize(ImageObject *image, PyObject* args) {
   image->colsOut = numcols;
   image->rowsOut = numrows;
   
+
   size_t NUMBYTES(numrows * numcols * image->BPP);
   agg::int8u *buffer = new agg::int8u[NUMBYTES];  
   image->rbufOut = new agg::rendering_buffer;
@@ -378,10 +379,12 @@ Image_dealloc(ImageObject *self)
 {
   PyObject_Del(self);
   
-  delete [] self->bufferIn;
-  delete self->rbufOut;
-  delete [] self->bufferOut;
-  delete self->rbufIn;
+  delete [] self->bufferIn; self->bufferIn = NULL;
+  delete self->rbufIn; self->rbufIn=NULL;
+
+  delete self->rbufOut; self->rbufOut = NULL;
+  delete [] self->bufferOut; self->bufferOut=NULL;
+
   
 }
 
@@ -544,18 +547,33 @@ _image_fromfile(PyObject *self, PyObject *args) {
 }
 
 char _image_fromarray__doc__[] = 
-"fromarray(A)\n"
+"fromarray(A, isoutput)\n"
 "\n"
 "Load the image from a Numeric or numarray array\n"
+"By default this function fills the input buffer, which can subsequently\n"
+"be resampled using resize.  If isoutput=1, fill the output buffer.\n"
+"This is used to support raw pixel images w/o resampling"
 ;
 static PyObject *
-_image_fromarray(PyObject *self, PyObject *args) {
+_image_fromarray(PyObject *self, PyObject *args, PyObject *kwargs) {
   
   PyObject *x; 
   PyArrayObject *A;
+
+  int isoutput=0;
+
+  /* // my kwargs is segfaulting
+  static char *kwlist[] = {"A", "isoutput", NULL};
+
+  
+  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i", kwlist,
+				   &x, &isoutput))
+    return NULL;
   
-  if (!PyArg_ParseTuple(args, "O", &x))
+  */
+  if (!PyArg_ParseTuple(args, "Oi", &x, &isoutput))
     return NULL; 
+
   
   //rank 2 or 3
   A = (PyArrayObject *) PyArray_ContiguousFromObject(x, PyArray_DOUBLE, 2, 3); 
@@ -642,6 +660,20 @@ _image_fromarray(PyObject *self, PyObject *args) {
     return NULL;
   }
   Py_XDECREF(A);  
+
+  if (isoutput) {
+    // make the output buffer point to the input buffer
+
+    imo->rowsOut  = imo->rowsIn;
+    imo->colsOut  = imo->colsIn;
+
+    imo->bufferOut = new agg::int8u[NUMBYTES];  
+    imo->rbufOut = new agg::rendering_buffer;
+    imo->rbufOut->attach(imo->bufferOut, imo->colsOut, imo->rowsOut, imo->colsOut * imo->BPP);
+
+    for (size_t i=0; i<NUMBYTES; i++)
+      *(imo->bufferOut +i) = *(imo->bufferIn +i);
+  }
   return (PyObject *)imo;
 }
 
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -564,15 +564,20 @@ Transformation::set_offset(const Py::Tuple & args) {
   args.verify_length(2);
 
   Py::SeqBase<Py::Object> xy = args[0];
-
+  //std::cout << "checking args" << std::endl;
   if (!check(args[1]))
     throw Py::TypeError("Transformation::set_offset(xy,trans) requires trans to be a Transformation instance");
-  
+
+  //std::cout << "getting x,y" << std::endl;  
+
   _usingOffset = 1;
   _xo = Py::Float(xy[0]);
   _yo = Py::Float(xy[1]);
+  //std::cout << "casting" << std::endl;  
   _transOffset = static_cast<Transformation*>(args[1].ptr());
+  //std::cout << "increffing" << std::endl;  
   Py_INCREF(_transOffset);
+  //std::cout << "returning" << std::endl;  
   return Py::Object();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+1#!/usr/bin/env python`
`2`	`2`	`# python`
`3`	`3`
`4`	`4`	`from matplotlib.matlab import *`