unified image and patch collections

jdh2358 · jdh2358 · commit 5f27eacdddbf · 2004-07-05T18:10:50.000Z
svn path=/trunk/matplotlib/; revision=380
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -51,7 +51,7 @@ lines.data_clipping : False  # Use data clipping in addition to viewport
 # circles.  See
 # http://matplotlib.sourceforge.net/matplotlib.patches.html for more
 # information on patch properties
-patch.linewidth   	: 0.5     # edge width in points
+patch.linewidth   	: 1.0     # edge width in points
 patch.facecolor  	: b       
 patch.edgecolor  	: k
 patch.antialiased 	: True    # render patches in antialised (no jaggies)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 New entries should be added at the top
 =======
-
+2004-07-05 Unified image and patch collections colormapping and
+           scaling args.  Updated docstrings for all - JDH
 
 2004-07-05 Fixed a figure legend bug and added
            examples/figlegend_demo.py - JDH
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -18,25 +18,31 @@
     'barchart_demo.py',
     'color_demo.py',
     'csd_demo.py',
+    'customize_rc.py',
     'date_demo1.py',
     'date_demo2.py',    
-    'fill_demo.py',
+    'figimage_demo.py',
+    'figlegend_demo.py',
     'figtext.py',
+    'fill_demo.py',
     'finance_demo.py',
+    'fonts_demo_kw.py',
     'histogram_demo.py',
     'image_demo.py',
     'image_demo2.py',
     'image_demo_na.py',
+    'image_origin.py',
     'invert_axes.py',
+    'layer_images.py',
     'legend_demo.py',
     'legend_demo2.py',
     'line_styles.py',
     'log_demo.py',
     'log_test.py',
-    'mathtext_demo.py',
-    'mri_with_eeg.py',
     'major_minor_demo1.py',
     'major_minor_demo2.py',     
+    'mathtext_demo.py',
+    'mri_with_eeg.py',
     'multiple_figs_demo.py',
     'pcolor_demo.py',
     'pcolor_demo2.py',
@@ -45,17 +51,14 @@
     'scatter_demo.py',
     'scatter_demo2.py',
     'simple_plot.py',
-    'stock_demo.py',
     'specgram_demo.py',
+    'stock_demo.py',
     'subplot_demo.py',
     'table_demo.py',
     'text_handles.py',
     'text_themes.py',
     'two_scales.py',
     'vline_demo.py',
-    'image_origin.py',
-    'figimage_demo.py',
-    'layer_images.py',
     )
 
 def drive(backend):
@@ -85,8 +88,8 @@ def drive(backend):
 times = {}
 backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']
 #backends.extend([ 'GTK', 'WX', 'TkAgg'])
-backends = [ 'PS']
-#backends = [ 'Agg', 'PS', 'Template']
+#backends = [ 'PS']
+backends = [ 'Agg', 'PS', 'Template']
 
 for backend in backends:
     print 'testing %s' % backend
diff --git a/examples/font_properties_demo.py b/examples/font_properties_demo.py
diff --git a/examples/fonts_demo.py b/examples/fonts_demo.py
@@ -111,4 +111,5 @@
          **alignment)
 
 axis([-1,1,0,1])
+savefig('fonts_demo')
 show()
diff --git a/examples/fonts_demo_kw.py b/examples/fonts_demo_kw.py
@@ -80,4 +80,5 @@
          **alignment)
 
 axis([-1, 1, 0, 1])
+savefig('fonts_demo_kw')
 show()
diff --git a/examples/image_origin.py b/examples/image_origin.py
@@ -18,5 +18,5 @@
 title('blue should be down')
 imshow(x, origin='lower', interpolation='nearest')
 
-#savefig('image_origin')
+savefig('image_origin')
 show()
diff --git a/examples/pcolor_demo2.py b/examples/pcolor_demo2.py
@@ -22,10 +22,10 @@ def func3(x,y):
 ax = subplot(111)
 im = imshow(Z, cmap=cm.jet)
 #im.set_interpolation('nearest')
-im.set_interpolation('bicubic')
-#im.set_interpolation('bilinear')
+#im.set_interpolation('bicubic')
+im.set_interpolation('bilinear')
 #ax.set_image_extent(-3, 3, -3, 3)
-savefig('pcolor_demo2')
+#savefig('pcolor_demo2')
 show()
 
     
diff --git a/examples/pcolor_small.py b/examples/pcolor_small.py
@@ -8,6 +8,7 @@
 #print Z
 Z = rand(10,6)
 
+#c = pcolor(Z, shading='flat') # default 'faceted'
 c = pcolor(Z)
 c.set_linewidth(4)
 
diff --git a/examples/scatter_demo2.py b/examples/scatter_demo2.py
@@ -21,7 +21,7 @@
        )
 title(r'Volume and percent change')
 grid(True)
-#savefig('scatter_demo2')
+savefig('scatter_demo2')
 show()
 
 
diff --git a/examples/specgram_demo.py b/examples/specgram_demo.py
@@ -15,4 +15,5 @@
 Noverlap = 0
 Pxx, freqs, bins, im = specgram(x, NFFT=NFFT, Fs=Fs, noverlap=900)
 gca().set_xticks(arange(0,21,5))
+colorbar()
 show()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -567,7 +567,7 @@ RendererAgg::draw_regpoly_collection(const Py::Tuple& args) {
   
   double thisx, thisy;
   
-  // dump the x.y vertices into a double array for paster access
+  // dump the x.y vertices into a double array for faster access
   double xverts[Nverts];
   double yverts[Nverts];
   Py::Tuple xy;
@@ -643,7 +643,7 @@ RendererAgg::draw_regpoly_collection(const Py::Tuple& args) {
 	theRenderer->color(edgecolor);    
 	theRasterizer->render(*slineP8, *theRenderer); 
       }
-      else {
+      else {      
 	rendererBin->color(edgecolor);    
 	theRasterizer->render(*slineBin, *rendererBin); 
       }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`)`
`22`	`22`	`title(r'Volume and percent change')`
`23`	`23`	`grid(True)`
`24`		`-#savefig('scatter_demo2')`
	`24`	`+savefig('scatter_demo2')`
`25`	`25`	`show()`
`26`	`26`
`27`	`27`