SF.net SVN: matplotlib:[6649] trunk/matplotlib

[<jd...@us...>]

Revision: 6649
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6649&view=rev
Author:   jdh2358
Date:     2008-12-17 14:58:42 +0000 (Wed, 17 Dec 2008)

Log Message:
-----------
Merged revisions 6647 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6647 | jdh2358 | 2008-12-17 08:55:42 -0600 (Wed, 17 Dec 2008) | 1 line
  
  fix to figimage
........

Modified Paths:
--------------
    trunk/matplotlib/examples/pylab_examples/figimage_demo.py
    trunk/matplotlib/lib/matplotlib/image.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6644
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6648

Modified: trunk/matplotlib/examples/pylab_examples/figimage_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/figimage_demo.py	2008-12-17 14:57:28 UTC (rev 6648)
+++ trunk/matplotlib/examples/pylab_examples/figimage_demo.py	2008-12-17 14:58:42 UTC (rev 6649)
@@ -7,7 +7,7 @@
 import matplotlib.pyplot as plt
 
 
-fig = plt.figure(frameon=False)
+fig = plt.figure()
 Z = np.arange(10000.0)
 Z.shape = 100,100
 Z[:,50:] = 1.
@@ -15,11 +15,13 @@
 im1 = plt.figimage(Z, xo=50, yo=0, cmap=cm.jet, origin='lower')
 im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, cmap=cm.jet, origin='lower')
 
-dpi = 200
-plt.savefig('figimage.png', dpi=dpi)
-plt.savefig('figimage.pdf', dpi=dpi)
-plt.savefig('figimage.svg', dpi=dpi)
-plt.savefig('figimage.eps', dpi=dpi)
+
+if 0:
+    dpi = 72
+    plt.savefig('figimage_%d.png'%dpi, dpi=dpi, facecolor='gray')
+    plt.savefig('figimage_%d.pdf'%dpi, dpi=dpi, facecolor='gray')
+    plt.savefig('figimage_%d.svg'%dpi, dpi=dpi, facecolor='gray')
+    plt.savefig('figimage_%d.eps'%dpi, dpi=dpi, facecolor='gray')
 plt.show()
 
 

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2008-12-17 14:57:28 UTC (rev 6648)
+++ trunk/matplotlib/lib/matplotlib/image.py	2008-12-17 14:58:42 UTC (rev 6649)
@@ -693,7 +693,7 @@
         if not self.get_visible(): return
         # todo: we should be able to do some cacheing here
         im = self.make_image(renderer.get_image_magnification())
-        renderer.draw_image(round(self.ox/self.magnification), round(self.oy/self.magnification), im, self.figure.bbox,
+        renderer.draw_image(round(self.ox), round(self.oy), im, self.figure.bbox,
                             *self.get_transformed_clip_path_and_affine())
 
     def write_png(self, fname):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.