updated image to work with data coords; moved image extendsion to _image

jdh2358 · jdh2358 · commit 3d9c781742ae · 2004-03-15T14:49:47.000Z
svn path=/trunk/matplotlib/; revision=179
diff --git a/MANIFEST b/MANIFEST
@@ -269,6 +269,7 @@ examples/figtext.py
 examples/ftface_props.py
 examples/gdtest.py
 examples/histogram_demo.py
+examples/image_demo.py
 examples/interactive.py
 examples/interactive2.py
 examples/legend_demo.py
@@ -300,6 +301,7 @@ examples/vertical_ticklabels.py
 examples/vline_demo.py
 examples/data/AAPL.dat
 examples/data/INTC.dat
+examples/data/ct.raw
 examples/data/eeg.dat
 examples/data/intc.csv
 examples/data/membrane.dat
@@ -395,6 +397,7 @@ matplotlib/backend_bases.py
 matplotlib/cbook.py
 matplotlib/colors.py
 matplotlib/figure.py
+matplotlib/image.py
 matplotlib/legend.py
 matplotlib/lines.py
 matplotlib/mathtext.py
@@ -423,6 +426,8 @@ src/_backend_agg.cpp
 src/_backend_agg.h
 src/_gtkagg.cpp
 src/_gtkgd.c
+src/_image.cpp
+src/_image.h
 src/_tkagg.cpp
 src/ft2font.c
 src/ft2font.h
diff --git a/Makefile b/Makefile
@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.25  2004/03/15 14:49:46  jdh2358
+# updated image to work with data coords; moved image extendsion to _image
+#
 # Revision 1.24  2004/03/08 14:56:44  jdh2358
 # fixed subplot bug
 #
@@ -101,6 +104,7 @@ MODULES =					\
 	matplotlib.cbook			\
 	matplotlib.colors			\
 	matplotlib.figure			\
+	matplotlib.image			\
 	matplotlib.legend			\
 	matplotlib.lines			\
 	matplotlib.matlab			\
diff --git a/NUMARRAY_ISSUES b/NUMARRAY_ISSUES
@@ -13,7 +13,8 @@ Below is a status report of known issues
 
     TypeError: unsupported operand type(s) for /: 'NumArray' and 'float'"
 
-  Solution: use divide(-t, 2.0)
+  Solution: use numarray 0.9 or later; for older versions, use
+  divide(-t, 2.0)
 
 * stock demo does not run with "TypeError: unsubscriptable object"
 
diff --git a/examples/image_demo.py b/examples/image_demo.py
@@ -1,5 +1,3 @@
-from matplotlib.image import ASPECT_FREE, ASPECT_PRESERVE
-from matplotlib.image import NEAREST, BILINEAR, BICUBIC, SPLINE16
 from matplotlib.matlab import *
 
 w, h = 512, 512
@@ -8,23 +6,33 @@
 A *= 1.0/max(A)
 A.shape = w, h
 
-
-figure(1, figsize=(2,7))
-subplot(211)
+markers = [(15.9, 14.5), (16.8, 15)]
+x,y = zip(*markers)
+#figure(1, figsize=(2,7))
+#pyt 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')
+im.set_datalimx(0,25)
+im.set_datalimy(0,25)
+#im.set_interpolation('bicubic')
+#im.set_interpolation('nearest')
+im.set_interpolation('bilinear')
+#im.set_aspect('free')
+im.set_aspect('preserve')
+print x, y
+plot(x, y, 'o')
+axis([0,25,0,25])
+
+
+
+#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', [])
+if 0:
+    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/setup.py b/setup.py
@@ -99,7 +99,7 @@
 
 
 setup(name="matplotlib",
-      version= '0.52b',
+      version= '0.52c',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",
diff --git a/setupext.py b/setupext.py
@@ -232,11 +232,11 @@ def build_image(ext_modules, packages):
     global BUILT_IMAGE
     if BUILT_IMAGE: return # only build it if you you haven't already
     
-    deps = ['src/image.cpp'] 
+    deps = ['src/_image.cpp'] 
     deps.extend(glob.glob('agg2/src/*.cpp'))
                        
     module = Extension(
-        'matplotlib.image',
+        'matplotlib._image',
         deps
         ,
         )
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;
 
diff --git a/src/image.cpp b/src/image.cpp
diff --git a/src/image.h b/src/image.h

Original file line number	Diff line number	Diff line change
`@@ -232,11 +232,11 @@ def build_image(ext_modules, packages):`
`232`	`232`	`global BUILT_IMAGE`
`233`	`233`	`if BUILT_IMAGE: return # only build it if you you haven't already`
`234`	`234`
`235`		`- deps = ['src/image.cpp']`
	`235`	`+ deps = ['src/_image.cpp']`
`236`	`236`	`deps.extend(glob.glob('agg2/src/*.cpp'))`
`237`	`237`
`238`	`238`	`module = Extension(`
`239`		`- 'matplotlib.image',`
	`239`	`+ 'matplotlib._image',`
`240`	`240`	`deps`
`241`	`241`	`,`
`242`	`242`	`)`