commited jae joons 2nd patch; figimage still sems broken for origin=up

jdh2358 · jdh2358 · commit 3b3440073e5f · 2008-11-09T00:18:40.000Z
svn path=/trunk/matplotlib/; revision=6379
diff --git a/examples/pylab_examples/figimage_demo.py b/examples/pylab_examples/figimage_demo.py
@@ -12,9 +12,12 @@
 Z.shape = 100,100
 Z[:,50:] = 1.
 
-im1 = plt.figimage(Z, xo=50, yo=0, cmap=cm.jet)
-im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, cmap=cm.jet)
+im1 = plt.figimage(Z, xo=50, yo=0, cmap=cm.jet, origin='upper')
+im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, cmap=cm.jet, origin='upper')
 
+fig.savefig('figimage_demo.png')
+fig.savefig('figimage_demo.svg')
+fig.savefig('figimage_demo.pdf')
 plt.show()
 
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1537,9 +1537,9 @@ def draw(self, renderer=None, inframe=False):
                    for im in self.images if im.get_visible()]
 
             #flip the images if their origin is "upper"
-            [im.flipud_out() for _im, (im,_,_) in zip(self.images, ims) \
-             if _im.origin=="upper"]
-            
+            if self.images[0].origin=='upper':
+                im.flipud_out()
+
             l, b, r, t = self.bbox.extents
             width = mag*((round(r) + 0.5) - (round(l) - 0.5))
             height = mag*((round(t) + 0.5) - (round(b) - 0.5))
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -752,11 +752,15 @@ def draw(self, renderer):
             mag = renderer.get_image_magnification()
             ims = [(im.make_image(mag), im.ox*mag, im.oy*mag)
                    for im in self.images]
+
+            for _im, (im,_,_) in zip(self.images, ims):
+                if _im.origin=="upper":
+                    im.flipud_out()
+
+
             im = _image.from_images(self.bbox.height * mag,
                                     self.bbox.width * mag,
                                     ims)
-            if self.images[0].origin=='upper':
-                im.flipud_out()
 
             im.is_grayscale = False
             l, b, w, h = self.bbox.bounds
