some aspect ratio fixes

jdh2358 · jdh2358 · commit 46906daed63b · 2005-01-17T20:35:46.000Z
svn path=/trunk/matplotlib/; revision=869
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -266,6 +266,7 @@ def show(self):
         def destroy(*args):
             self.window = None
             Gcf.destroy(self._num)
+            
         if not self._shown: self.window.bind("<Destroy>", destroy)
 
         _focus = windowing.FocusManager()
@@ -276,47 +277,13 @@ def destroy(*args):
         else: self.canvas.draw()
         self._shown = True
 
-    def _show(self):
-        """
-        # this function segfaults on an interactive session in pylab
-
-1 >>> plot([1,2,3])
-Out[1]: [<matplotlib.lines.Line2D instance at 0x418ed62c>]
- CLOSE WINDOW
-2 >>> plot([1,2,3])
-Segmentation fault
-
-I now realize that any call to self.window.bind("<Destroy>", destroy)
-causes the PyEval_RestoreThread: NULL state bug if the mainloop is not started.  Due to the placement of
-
-  if not self._shown: self.window.bind("<Destroy>", destroy)
-
-after the setting of
-
-  self._shown = True
-
-it is never called
-
-        """
-        _focus = windowing.FocusManager()
-        if not self._shown:
-            self.window.deiconify()
-            # anim.py requires this
-            if not sys.platform.startswith('linux') :
-                self.window.update()            
-        else: self.canvas.draw()
-        self._shown = True
-        def destroy(*args):
-            self.window = None
-            Gcf.destroy(self._num)
-        if not self._shown: self.window.bind("<Destroy>", destroy)
-
 
     def destroy(self, *args):
         if Gcf.get_num_fig_managers()==0 and not matplotlib.is_interactive():
             if self.window is not None:
                 self.window.quit()
         if self.window is not None:
+            #print 'calling window destroy'
             self.window.destroy()
         self.window = None
 
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -106,7 +106,8 @@ def changed(self):
         self._imcache = None
         cm.ScalarMappable.changed(self)
 
-    def make_image(self, flipy):        
+    def make_image(self, flipy):
+        self._imcache = None
         if self._A is not None:
             if self._imcache is None:
                 x = self.to_rgba(self._A, self._alpha)
@@ -158,10 +159,12 @@ def make_image(self, flipy):
         rx = widthDisplay / numcols
         ry = heightDisplay  / numrows
 
+        
         if im.get_aspect()==_image.ASPECT_PRESERVE:
             if ry < rx: rx = ry
             # todo: center the image in viewport
             im.apply_scaling(rx, rx)
+            
         else:
             im.apply_scaling(rx, ry)
 
@@ -258,21 +261,22 @@ def set_interpolation(self, s):
         if not self._interpd.has_key(s):
             raise ValueError('Illegal interpolation string')
         self._interpolation = s
-
-
-
-
         
     def get_extent(self):
         'get the image extent: xmin, xmax, ymin, ymax'
         if self._extent is not None:
             return self._extent
-        else:
+        else:            
             numrows, numcols = self.get_size()
-            width, height = numcols, numrows
-            return 0, width, 0, height
-
-
+            iwidth, iheight = numcols, numrows
+            #return 0, width, 0, height
+            tmp, tmp, dwidth, dheight = self.axes.bbox.get_bounds()
+            sx = dwidth  / iwidth
+            sy = dheight / iheight
+
+            if self.get_aspect()=='preserve' and sy<sx: sx = sy 
+            return 0, 1.0/sx*dwidth, 0, 1.0/sy*dheight
+        
 class FigureImage(Artist, cm.ScalarMappable):
     def __init__(self, fig,
                  cmap = None,
diff --git a/unit/memleak_hawaii3.py b/unit/memleak_hawaii3.py
@@ -4,7 +4,7 @@
 import matplotlib
 matplotlib.interactive(True)
 #matplotlib.use('Cairo')
-matplotlib.use('WXAgg')
+matplotlib.use('TkAgg')
 from pylab import *
 
 
