texmanager changes

svn path=/trunk/matplotlib/; revision=1834

Author: jdh2358

CHANGELOG

@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2005-10-14 Removed aqrt from dvipng 1.6 alpha channel mask.  Where did
+           that come from?
+
+2005-10-14 Added width kwarg to hist function
+
 2005-10-10 Replaced all instances of os.rename with shutil.move
 
 2005-10-05 Added Michael Brady's ydate patch

TODO

@@ -726,4 +726,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- Martin's zoomhist bug
 
--- restore robert leftwich's tutorial link to FAQ
+-- restore robert leftwich's tutorial link to FAQ
+
+-- JPL and NIST screenshots...

examples/contour_image.py

@@ -30,29 +30,29 @@
 
 subplot(2,2,1)
 
-levs1, colls = contourf(X, Y, Z, levels,
+cset1 = contourf(X, Y, Z, levels,
                         cmap=cm.jet,
                         )
 #If we want lines as well as filled regions, we need to call
 # contour separately; don't try to change the edgecolor or edgewidth
 # of the polygons in the collections returned by contourf.
 # Use levels output from previous call to guarantee they are the same.
-levs2, colls2 = contour(X, Y, Z, levs1,
+cset2 = contour(X, Y, Z, cset1.levels,
                         colors = 'k',
                         hold='on')
 # We don't really need dashed contour lines to indicate negative
 # regions, so let's turn them off.
-for c in colls2:
+for c in cset2.collections:
     c.set_linestyle('solid')
 
 # It is easier here to make a separate call to contour than
 # to set up an array of colors and linewidths.
 # We are making a thick green line as a zero contour.
 # Specify the zero level as a tuple with only 0 in it.
-levs3, colls3 = contour(X, Y, Z, (0,),
-                        colors = 'g',
-                        linewidths = 2,
-                        hold='on')
+cset3 = contour(X, Y, Z, (0,),
+                colors = 'g',
+                linewidths = 2,
+                hold='on')
 title('Filled contours')
 #colorbar()
 hot()
@@ -62,15 +62,17 @@
 
 imshow(Z, extent=extent)
 v = axis()
-contour(Z, levels, hold='on', colors = 'k', origin='upper', extent=extent)
+contour(Z, cset3.levels, hold='on', colors = 'k',
+        origin='upper', extent=extent)
 axis(v)
 title("Image, origin 'upper'")
 
 subplot(2,2,3)
 
 imshow(Z, origin='lower', extent=extent)
 v = axis()
-contour(Z, levels, hold='on', colors = 'k', origin='lower', extent=extent)
+contour(Z, cset3.levels, hold='on', colors = 'k',
+        origin='lower', extent=extent)
 axis(v)
 title("Image, origin 'lower'")
 
@@ -84,7 +86,8 @@
 # domain that is contoured does not extend beyond these pixel centers.
 imshow(Z, interpolation='nearest', extent=extent)
 v = axis()
-contour(Z, levels, hold='on', colors = 'k', origin='image', extent=extent)
+contour(Z, cset3.levels, hold='on', colors = 'k',
+        origin='image', extent=extent)
 axis(v)
 ylim = get(gca(), 'ylim')
 setp(gca(), ylim=ylim[::-1])

lib/matplotlib/axes.py

@@ -1697,8 +1697,9 @@ def grid(self, b=None):
         self.xaxis.grid(b)
         self.yaxis.grid(b)
 
+
     def hist(self, x, bins=10, normed=0, bottom=0,
-             orientation='vertical', **kwargs):
+             orientation='vertical', width=None, **kwargs):
         """
         HIST(x, bins=10, normed=0, bottom=0, orientiation='vertical', **kwargs)
 
@@ -1715,12 +1716,15 @@ def hist(self, x, bins=10, normed=0, bottom=0,
         orientation = 'horizontal' | 'vertical'.  If horizontal, barh
         will be used and the "bottom" kwarg will be the left.
 
+        width: the width of the bars.  If None, automatically compute
+        the width.
+
         kwargs are used to update the properties of the
         hist bars
         """
         if not self._hold: self.cla()
         n,bins = matplotlib.mlab.hist(x, bins, normed)
-        width = 0.9*(bins[1]-bins[0])
+        if width is None: width = 0.9*(bins[1]-bins[0])
         if orientation=='horizontal':
             patches = self.barh(n, bins, height=width, left=bottom)
         else:
@@ -1729,6 +1733,9 @@ def hist(self, x, bins=10, normed=0, bottom=0,
             p.update(kwargs)
         return n, bins, silent_list('Patch', patches)
 
+
+
+
     def hold(self, b=None):
         """
         HOLD(b=None)

lib/matplotlib/legend.py

@@ -274,7 +274,7 @@ def _get_handles(self, handles, texts):
                 legline = Line2D(self._xdata, ydata)
                 self._set_artist_props(legline)
                 legline.set_clip_box(None)
-                lw = handle.get_linewidths()[0]
+                lw = handle.get_linewidth()[0]
                 dashes = handle.get_dashes()
                 color = handle.get_colors()[0]
                 legline.set_color(color)

lib/matplotlib/numerix/__init__.py

@@ -1,14 +1,16 @@
-"""numerix  imports either Numeric or numarray based on various selectors.
+"""
+numerix  imports either Numeric or numarray based on various selectors.
 
 0.  If the value "--numarray" or "--Numeric" is specified on the
-command line, then numerix imports the specified array package.
+    command line, then numerix imports the specified
+    array package.
 
-1. The value of numerix in ~/.matplotlibrc: either Numeric or numarray
+1. The value of numerix in matplotlibrc: either Numeric or numarray
 
 2. If none of the above is done, the default array package is Numeric.
-Because the .matplotlibrc always provides *some* value for numerix (it
-has it's own system of default values), this default is most likely
-never used.
+   Because the matplotlibrc always provides *some* value for numerix
+   (it has it's own system of default values), this default is most
+   likely never used.
 
 To summarize: the  commandline is examined first, the  rc file second,
 and the default array package is Numeric.  

lib/matplotlib/texmanager.py

@@ -143,7 +143,8 @@ def make_png(self, tex, dpi, force=0):
 
         self.get_dvipng_version()  # raises if dvipng is not up-to-date
         #print 'makepng', prefix, dvifile, pngfile
-        command = 'dvipng -bg Transparent -fg "rgb 0.0 0.0 0.0" -D %d -T tight -o "%s" "%s"'% (dpi, pngfile, dvifile)
+        #command = 'dvipng -bg Transparent -fg "rgb 0.0 0.0 0.0" -D %d -T tight -o "%s" "%s"'% (dpi, pngfile, dvifile)
+        command = 'dvipng -bg Transparent -D %d -T tight -o "%s" "%s"'% (dpi, pngfile, dvifile)        
 
         #assume white bg
         #command = "dvipng -bg 'rgb 1.0 1.0 1.0' -fg 'rgb 0.0 0.0 0.0' -D %d -T tight -o %s %s"% (dpi, pngfile, dvifile)
@@ -306,14 +307,18 @@ def get_rgba(self, tex, fontsize=10, dpi=80, rgb=(0,0,0)):
             pngfile = self.make_png(tex, dpi, force=False) 
             X = readpng(pngfile)
 
-            vers = self.get_dvipng_version()
+            v
+            ers = self.get_dvipng_version()
+            #print 'dvipng version', vers
             if vers<'1.6':
                 # hack the alpha channel as described in comment above
                 alpha = sqrt(1-X[:,:,0])
             else:
                 # dvipng 1.6 and above handles the alpha channel
-                # properly
-                alpha = sqrt(X[:,:,-1])
+                # properly [JDH: for some reason I had square root in
+                # here which isn't correct
+                #alpha = sqrt(X[:,:,-1])
+                alpha = X[:,:,-1]
 
 
             Z = zeros(X.shape, Float)