image changes

jdh2358 · jdh2358 · commit 533a357c5d3f · 2004-06-23T15:44:58.000Z
svn path=/trunk/matplotlib/; revision=356
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -143,6 +143,13 @@ figure.dpi       : 80      # figure dots per inch
 figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray
 figure.edgecolor : w       # figure edgecolor; w is white
 
+
+### images
+image.aspect : free        # free | preserve
+image.interpolation  : bilinear  # see help(imshow) for options
+image.cmap   : gray        # gray | jet
+image.lut    : 256         # the size of the colormap lookup table
+ 
 ### SAVING FIGURES
 # the default savefig params can be different for the GUI backends.
 # Eg, you may want a higher resolution, or to make the figure
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,17 @@
+API CHANGES in matplotlib-0.xx
+
+ColormapJet and Grayscale are deprecated.  For backwards
+compatibility, they can be obtained either by doing
+
+  from matplotlib.cm import ColormapJet 
+
+or
+
+  from matplotlib.matlab import *
+
+They are replaced by cm.jet and cm.grey
+
+
 API CHANGES in matplotlib-0.54.3
 
 removed the set_default_font / get_default_font scheme from the
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 New entries should be added at the top
 =======
 
+2004-06-23 ported code to Perry's new colormap and norm scheme.  Added
+           new rc attributes image.aspect, image.interpolation,
+           image.cmap, image.lut
+
 2004-06-20 backend_gtk.py: replace gtk.TRUE/FALSE with True/False.
 	   simplified _make_axis_menu(). - SC
 
diff --git a/TODO b/TODO
@@ -436,4 +436,10 @@
 
 -- DONE Fix stale link on GTK FAQ entry
 
--- DONE flush all traces of gtkgd
+-- DONE flush all traces of gtkgd
+
+-- run backend_driver with numeric and numarray (the latter only with
+   agg)
+
+-- DONE fix vlines raise in matlab.py
+-- fix imshow try/except raise in matlab.py
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -51,6 +51,7 @@
     'text_handles.py',
     'text_themes.py',
     'two_scales.py',
+    'vline_demo.py',
     )
 
 def drive(backend):
diff --git a/examples/layer_images.py b/examples/layer_images.py
@@ -17,14 +17,15 @@ def func3(x,y):
 X,Y = meshgrid(x, y)
 
 Z1 = rand(10,6)
-im1 = imshow(Z1, cmap = Grayscale(256))
+im1 = imshow(Z1, cmap=cm.gray)
 im1.set_interpolation('nearest')
 hold(True)
 
 Z2 = func3(X, Y)
-im2 = imshow(Z2, cmap=ColormapJet(256), alpha=0.75)
+im2 = imshow(Z2, cmap=cm.jet, alpha=0.75)
 im2.set_interpolation('nearest')
 
+
 show()
 
     
diff --git a/examples/pcolor_demo.py b/examples/pcolor_demo.py
@@ -20,7 +20,7 @@ def func3(x,y):
 
 Z = func3(X, Y)
 pcolor(X, Y, Z, shading='flat')
-colorbar()
+#colorbar()
 savefig('pcolor_demo')
 show()
 
diff --git a/examples/pcolor_small.py b/examples/pcolor_small.py
@@ -8,5 +8,6 @@
 
 c = pcolor(Z)
 c.set_linewidth(4)
-savefig('pcolor_small')
+
+#savefig('pcolor_small')
 show()
diff --git a/examples/vline_demo.py b/examples/vline_demo.py
@@ -15,7 +15,7 @@ def f(t):
 nse = multiply(normal(0.0, 0.3, t.shape), s)
 
 plot(t, s+nse, 'b^')
-vlines(t, 0, s, color='k')
+vlines(t, [0], s, color='k')
 xlabel('time (s)')
 title('Comparison of model with data')
 show()
diff --git a/setupext.py b/setupext.py
@@ -324,6 +324,8 @@ def build_image(ext_modules, packages, numerix):
     
     deps = ['src/_image.cpp'] 
     deps.extend(glob.glob('agg2/src/*.cpp'))
+    deps.extend(glob.glob('CXX/*.cxx'))
+    deps.extend(glob.glob('CXX/*.c'))
 
     module = Extension(
         'matplotlib._image',
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -883,7 +883,9 @@ RendererAgg::draw_image(const Py::Tuple& args) {
   
   int x = Py::Int(args[0]);
   int y = Py::Int(args[1]);
-  ImageObject *image = (ImageObject *)args[2].ptr();
+
+  
+  Image *image = static_cast<Image*>(args[2].ptr());
   
   
   //todo: handle x and y
diff --git a/src/_image.cpp b/src/_image.cpp
diff --git a/src/_image.h b/src/_image.h
diff --git a/src/ft2font.cpp b/src/ft2font.cpp

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@`
`51`	`51`	`'text_handles.py',`
`52`	`52`	`'text_themes.py',`
`53`	`53`	`'two_scales.py',`
	`54`	`+ 'vline_demo.py',`
`54`	`55`	`)`
`55`	`56`
`56`	`57`	`def drive(backend):`