plugged image resize mem leaks

jdh2358 · jdh2358 · commit 43bb86d98081 · 2005-01-18T20:18:07.000Z
svn path=/trunk/matplotlib/; revision=872
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,12 @@
 New entries should be added at the top
 
+2005-01-18 Plugged an image resize memory leaks - JDH
+
+2005-01-18 Fixed some mathtext parser problems relating to superscripts
+
+2005-01-17 Fixed a yticklabel problem for colorbars under change of  
+           clim - JDH
+ 
 2005-01-17 Cleaned up Destroy handling in wx reducing memleak/fig from
            approx 800k to approx 6k- JDH
 
diff --git a/TODO b/TODO
@@ -629,3 +629,12 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- Jim's tick bug in non-interactive mode
 
 -- more flexible tick placement.
+
+-- fix horizontal colorbar axes resize if cax is None
+
+-- mathtext layout bug
+
+    from pylab import *
+    plot(range(10))
+    title(r'$This\ is\ a\ test$')
+    show()
diff --git a/examples/poormans_contour.py b/examples/poormans_contour.py
@@ -31,15 +31,14 @@ def bivariate_normal(X, Y, sigmax=1.0, sigmay=1.0,
 X,Y = meshgrid(x, y)
 Z1 = bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
 Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+Z = Z2 - Z1 # difference of Gaussians
 
+cmap = cm.get_cmap('jet', 10)    # 10 discrete colors
 
-cmap = ColormapJet(10)    # 10 discrete contours
-im = imshow(Z2-Z1, cmap)  # difference of Gaussians
-
-# set the interpolation method: 'nearest', 'bilinear', 'bicubic' and much more
-im.set_interpolation('bilinear')
-
+im = imshow(Z, cmap=cmap, interpolation='bilinear')
 axis('off')
+colorbar(tickfmt='%1.2f')
+clim(-.1, .1)
 #savefig('test')
 show()
 
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -2,6 +2,21 @@
 font data tables for truetype and afm computer modern fonts
 """
 
+# this dict maps symbol names to fontnames, glyphindex.  To get the
+# glyph index from the character code, you have to use a reverse
+# dictionary grom font.get_charmaps, eg,
+"""
+from matplotlib.ft2font import FT2Font
+font = FT2Font('/usr/local/share/matplotlib/cmr10.ttf')
+codes = font.get_charmap().items()
+rd = dict([(charcode, glyphind) for glyphind,charcode in codes])
+items = rd.items()
+items.sort()
+
+for charcode, glyphind in items:
+    print charcode, glyphind
+"""
+
 latex_to_bakoma = {
 
     r'\oint'                : ('cmex10',  45),
@@ -123,6 +138,12 @@
     r'\rightbracket'        : ('cmr10',   72),
     r']'                    : ('cmr10',   72),
 
+
+    r'\circumflexaccent'    : ('cmr10',   124), # for \hat
+    r'\combiningbreve'      : ('cmr10',   81),  # for \breve
+    r'\combiningoverline'      : ('cmr10',   131),  # for \bar    
+
+
     r'\leftarrow'           : ('cmsy10',  12),
     r'\uparrow'             : ('cmsy10',  25),
     r'\downarrow'           : ('cmsy10',  28),
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1140,16 +1140,18 @@ def draw(self, renderer):
             im = self.images[0]
             im.draw(renderer)
         elif len(self.images)>1:
+
             # make a composite image blending alpha
             # list of (_image.Image, ox, oy)
 
             if not allequal([im.origin for im in self.images]):
                 raise ValueError('Composite images with different origins not supported')
             else:
-                origin = self.images[0].origin
+                    origin = self.images[0].origin
+
             ims = [(im.make_image(renderer),0,0) for im in self.images if im.get_visible()]
 
-                
+
             im = _image.from_images(self.bbox.height(), self.bbox.width(), ims)
             im.is_grayscale = False
             l, b, w, h = self.bbox.get_bounds()
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -413,7 +413,11 @@ def __init__(self, norm=None, cmap=None):
         self.norm = norm
         self.cmap = cmap
         self.observers = []
-        
+        self.colorbar = None
+
+    def set_colorbar(self, im, ax):
+        'set the colorbar image and axes associated with mappable'
+        self.colorbar = im, ax
     def to_rgba(self, x, alpha=1.0):
         # assume normalized rgb, rgba
         if len(x.shape)>2: return x
@@ -428,6 +432,9 @@ def set_clim(self, vmin=None, vmax=None):
         'set the norm limits for image scaling'
         self.norm.vmin = vmin
         self.norm.vmax = vmax
+        if self.colorbar is not None:
+            im, ax = self.colorbar
+            ax.set_ylim((vmin, vmax))
         self.changed()
         
     def set_cmap(self, cmap):
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -117,6 +117,7 @@ def make_image(self, flipy):
         else:
             raise RuntimeError('You must first set the image array or the image attribute')
 
+
         bg = colorConverter.to_rgba(self.axes.get_frame().get_facecolor(), 0)
         im.set_bg( *bg)
         im.is_grayscale = (self.cmap.name == "gray" and
@@ -151,6 +152,7 @@ def make_image(self, flipy):
 
         l, b, widthDisplay, heightDisplay = self.axes.bbox.get_bounds()
 
+
         im.apply_translation(tx, ty)
         im.apply_scaling(sx, sy)
 
@@ -172,6 +174,7 @@ def make_image(self, flipy):
         return im
     
     def draw(self, renderer, *args, **kwargs):
+
         if not self.get_visible(): return 
         isUpper = self.origin=='upper'
         flipy = renderer.flipy()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -238,6 +238,9 @@ def __init__(self, useSVG=False):
             [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf'))
               for name in self.fnames])
 
+        self.charmaps = dict(
+            [ (name, self.fonts[name].get_charmap()) for name in self.fnames])
+        
         for font in self.fonts.values():
             font.clear()
         if useSVG:
@@ -261,7 +264,7 @@ def _get_info (self, font, sym, fontsize, dpi):
 
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
-            num = self.fonts[basename].get_charmap()[num]
+            num = self.charmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
@@ -311,7 +314,7 @@ def render(self, ox, oy, font, sym, fontsize, dpi):
             basename = self.fontmap[font]
             if latex_to_bakoma.has_key(sym):
                 basename, num = latex_to_bakoma[sym]
-                num = self.fonts[basename].get_charmap()[num]
+                num = self.charmaps[basename][num]
             elif len(sym) == 1:
                 num = ord(sym)
             else:
@@ -342,6 +345,8 @@ def __init__(self):
             [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf'))
               for name in self.fnames])
 
+        self.charmaps = dict(
+            [ (name, self.fonts[name].get_charmap()) for name in self.fnames])
         for font in self.fonts.values():
             font.clear()
 
@@ -358,7 +363,7 @@ def _get_info (self, font, sym, fontsize, dpi):
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
             sym = self.fonts[basename].get_glyph_name(num)
-            num = self.fonts[basename].get_charmap()[num]
+            num = self.charmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
@@ -480,6 +485,7 @@ def set_origin(self, ox, oy):
             if loc=='above':
                 nx = self.centerx() - element.width()/2.0
                 ny = self.ymax() + self.pady()
+                #print element, self.ymax(), element.height(), element.ymax(), element.ymin(), ny
             elif loc=='below':
                 nx = self.centerx() - element.width()/2.0
                 ny = self.ymin() - self.pady() - element.height()
@@ -529,7 +535,7 @@ def set_scale(self, scale):
         self._scale = scale
         
     def centerx(self):
-        return self.ox + self.advance()/2.0
+        return 0.5 * (self.xmax() + self.xmin() ) 
 
     def centery(self):
         return 0.5 * (self.ymax() + self.ymin() ) 
@@ -539,18 +545,22 @@ def __repr__(self):
                
 class SpaceElement(Element):
     'blank horizontal space'
-    def __init__(self, space):
-        'space is the amount of blank space in fraction of fontsize'
+    def __init__(self, space, height=0):
+        """
+        space is the amount of blank space in fraction of fontsize
+        height is the height of the space in fraction of fontsize
+        """
         Element.__init__(self)
         self.space = space
+        self._height = height
 
     def advance(self):
         'get the horiz advance'
         return self.dpi/72.0*self.space*self.fontsize
 
     def height(self):
         'get the element height: ymax-ymin'
-        return 0
+        return self._height*self.dpi/72.0*self.fontsize
 
     def width(self):
         'get the element width: xmax-xmin'
@@ -570,7 +580,7 @@ def ymin(self):
 
     def ymax(self):
         'get the max ink in y'
-        return self.oy 
+        return self.oy + self.height()
 
     def set_font(self, f):
         # space doesn't care about font, only size
@@ -772,7 +782,23 @@ def composite(self, s, loc, toks):
         self.symbols.append(sym1)        
         
         return loc, [sym0]    
-    
+
+    def accent(self, s, loc, toks):
+
+        assert(len(toks)==1)
+        accent, sym = toks[0]
+
+        d = {
+            r'\hat'   : r'\circumflexaccent',
+            r'\breve' : r'\combiningbreve',
+            r'\bar'   : r'\combiningoverline',                        
+             }
+        above = SymbolElement(d[accent])
+        sym.neighbors['above'] = above
+        sym.set_pady(1)
+        self.symbols.append(above)
+        return loc, [sym]    
+
     def group(self, s, loc, toks):
         assert(len(toks)==1)
         #print 'grp', toks
@@ -790,7 +816,11 @@ def font(self, s, loc, toks):
     def subscript(self, s, loc, toks):
         assert(len(toks)==1)
         #print 'subsup', toks
-        prev, under, next = toks[0]
+        if len(toks[0])==2:
+            under, next = toks[0]
+            prev = SpaceElement(0)
+        else:
+            prev, under, next = toks[0]            
 
         if self.is_overunder(prev):
             prev.neighbors['below'] = next
@@ -805,8 +835,11 @@ def is_overunder(self, prev):
     def superscript(self, s, loc, toks):
         assert(len(toks)==1)
         #print 'subsup', toks
-        prev, under, next = toks[0]
-
+        if len(toks[0])==2:
+            under, next = toks[0]
+            prev = SpaceElement(0,0.6)
+        else:
+            prev, under, next = toks[0]
         if self.is_overunder(prev):
             prev.neighbors['above'] = next
         else:
@@ -866,6 +899,10 @@ def subsuperscript(self, s, loc, toks):
 #~ composite = over | under
 overUnder = over | under
 
+accent = Literal('hat') | Literal('check') | Literal('dot') | \
+         Literal('breve') | Literal('acute') | Literal('ddot') | \
+         Literal('grave') | Literal('tilde') | Literal('bar') | Literal('vec')
+
 
 
 number = Combine(Word(nums) + Optional(Literal('.')) + Optional( Word(nums) ))
@@ -904,20 +941,20 @@ def subsuperscript(self, s, loc, toks):
 #~ composite = Group( Combine(bslash + composite) + group + group).setParseAction(handler.composite).setName("composite")
 composite = Group( Combine(bslash + overUnder) + group + group).setParseAction(handler.composite).setName("composite")
 
-
+accent = Group( Combine(bslash + accent) + group).setParseAction(handler.accent).setName("accent")
 
 #~ symgroup = symbol ^ group
 symgroup = symbol | group
 
-subscript << Group( symgroup + Literal('_') + symgroup  )
-superscript << Group( symgroup + Literal('^') + symgroup  )
+subscript << Group( Optional(symgroup) + Literal('_') + symgroup  )
+superscript << Group( Optional(symgroup) + Literal('^') + symgroup  )
 subsuperscript << Group( symgroup + Literal('_') + symgroup + Literal('^') + symgroup  )
 
 
 font = Group( Combine(bslash + fontname) + group).setParseAction(handler.font).setName("font")
 
 expression = OneOrMore(
-    space ^ font ^ symbol ^ subscript ^ superscript ^ subsuperscript ^ group ^ composite ).setParseAction(handler.expression).setName("expression")
+    space ^ font ^ accent ^ symbol ^ subscript ^ superscript ^ subsuperscript ^ group ^ composite  ).setParseAction(handler.expression).setName("expression")
 #~ expression = OneOrMore(
     #~ group | composite | space | font | subsuperscript | subscript | superscript | symbol ).setParseAction(handler.expression).setName("expression")
 
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -615,13 +615,14 @@ def colorbar(tickfmt='%1.1f', cax=None, orientation='vertical'):
 
     if orientation=='vertical':
         C = transpose(C)
+
     coll = cax.imshow(C,
                       interpolation='nearest', 
                       origin='lower',
                       cmap=cmap, norm=norm,
                       extent=(0, 1, cmin, cmax))
     mappable.add_observer(coll)
-
+    mappable.set_colorbar(coll, cax)
     if orientation=='vertical':
         cax.set_xticks([])
         cax.yaxis.tick_right()
diff --git a/src/_image.cpp b/src/_image.cpp
