LogNorm.autoscale ignores nonpositive values; closes 2953069

efiring · efiring · commit 3101e00ed87b · 2010-05-30T23:58:27.000Z
svn path=/trunk/matplotlib/; revision=8348
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -850,6 +850,8 @@ def __call__(self, value, clip=None):
             vtype = 'scalar'
             val = ma.array([value]).astype(np.float)
 
+        val = ma.masked_less_equal(val, 0, copy=False)
+
         self.autoscale_None(val)
         vmin, vmax = self.vmin, self.vmax
         if vmin > vmax:
@@ -879,6 +881,24 @@ def inverse(self, value):
         else:
             return vmin * pow((vmax/vmin), value)
 
+    def autoscale(self, A):
+        '''
+        Set *vmin*, *vmax* to min, max of *A*.
+        '''
+        A = ma.masked_less_equal(A, 0, copy=False)
+        self.vmin = ma.min(A)
+        self.vmax = ma.max(A)
+
+    def autoscale_None(self, A):
+        ' autoscale only None-valued vmin or vmax'
+        if self.vmin is not None and self.vmax is not None:
+            return
+        A = ma.masked_less_equal(A, 0, copy=False)
+        if self.vmin is None:
+            self.vmin = ma.min(A)
+        if self.vmax is None:
+            self.vmax = ma.max(A)
+
 class BoundaryNorm(Normalize):
     '''
     Generate a colormap index based on discrete intervals.
