support LogNorm as arg to hexbin

jdh2358 · jdh2358 · commit 5f8a88af6c60 · 2010-02-22T23:23:05.000Z
svn path=/trunk/matplotlib/; revision=8149
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -5769,9 +5769,22 @@ def hexbin(self, x, y, C = None, gridsize = 100, bins = None,
             transOffset = self.transData,
             )
 
+        if isinstance(norm, mcolors.LogNorm):
+            if (accum==0).any():
+                # make sure we have not zeros
+                accum += 1
+            
+
         # Transform accum if needed
         if bins=='log':
             accum = np.log10(accum+1)
+
+        # autoscale the norm with curren accum values if it hasn't
+        # been set
+        if norm is not None:
+            if norm.vmin is None and norm.vmax is None:
+                norm.autoscale(accum)
+  
         elif bins!=None:
             if not iterable(bins):
                 minimum, maximum = min(accum), max(accum)
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -455,6 +455,10 @@ def _ticker(self):
         locator.set_data_interval(*intv)
         formatter.set_view_interval(*intv)
         formatter.set_data_interval(*intv)
+
+        # the dummy axis is expecting a minpos
+        locator.axis.get_minpos = lambda : intv[0]
+        formatter.axis.get_minpos = lambda : intv[0]
         b = np.array(locator())
         b, ticks = self._locate(b)
         formatter.set_locs(b)
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -147,6 +147,7 @@ def get_data_interval(self):
         def set_data_interval(self, vmin, vmax):
             self.dataLim.intervalx = vmin, vmax
 
+
     def set_axis(self, axis):
         self.axis = axis
 
diff --git a/make.osx b/make.osx
@@ -25,7 +25,7 @@ clean:
 
 fetch:
 	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")'  &&\
-	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.sourceforge.net/libpng/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.bz2")' &&\
 	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
 
 
@@ -46,7 +46,7 @@ zlib:
 png: zlib
 	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	rm -rf libpng-${PNGVERSION} &&\
-	tar xvfj libpng-${PNGVERSION}.tar.bz2
+	tar xvfz libpng-${PNGVERSION}.tar.gz
 	cd libpng-${PNGVERSION} &&\
 	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
 	export CFLAGS=${CFLAGS} &&\
