Fix log transforms a little.

mdboom · mdboom · commit 7a348142b7d1 · 2007-09-26T14:08:12.000Z
svn path=/branches/transforms/; revision=3897
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -73,6 +73,36 @@ def transform(self, a):
         def inverted(self):
             return LogScale.Log2Transform()
 
+    class NaturalLogTransform(Transform):
+        input_dims = 1
+        output_dims = 1
+        def __init__(self):
+            Transform.__init__(self)
+
+        def is_separable(self):
+            return True
+            
+        def transform(self, a):
+            return ma.log(ma.masked_where(a <= 0.0, a * npy.e))
+            
+        def inverted(self):
+            return LogScale.InvertedNaturalLogTransform()
+
+    class InvertedNaturalLogTransform(Transform):
+        input_dims = 1
+        output_dims = 1
+        def __init__(self):
+            Transform.__init__(self)
+
+        def is_separable(self):
+            return True
+            
+        def transform(self, a):
+            return ma.power(npy.e, a) / npy.e
+
+        def inverted(self):
+            return LogScale.Log2Transform()
+        
     class LogTransform(Transform):
         input_dims = 1
         output_dims = 1
@@ -84,14 +114,12 @@ def is_separable(self):
             return True
             
         def transform(self, a):
-            if len(a) > 10:
-                print "Log Transforming..."
             return ma.log(ma.masked_where(a <= 0.0, a * self._base)) / npy.log(self._base)
             
         def inverted(self):
             return LogScale.InvertedLogTransform(self._base)
 
-    class InvertedLog2Transform(Transform):
+    class InvertedLogTransform(Transform):
         input_dims = 1
         output_dims = 1
         def __init__(self, base):
@@ -113,7 +141,8 @@ def __init__(self, base=10):
             self._transform = self.Log10Transform()
         elif base == 2.0:
             self._transform = self.Log2Transform()
-        # MGDTODO: Natural log etc.
+        elif base == npy.e:
+            self._transform = self.NaturalLogTransform()
         else:
             self._transform = self.LogTransform(base)
             
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1069,15 +1069,6 @@ def composite_transform_factory(a, b):
     return CompositeGenericTransform(a, b)
 
 
-class LogTransform(Transform):
-    input_dims = 1
-    output_dims = 1
-    
-    def transform(self, a):
-        m = ma.masked_where(a < 0, a)
-        return npy.log10(m)
-
-
 class TestPolarTransform(Transform):
     input_dims = 2
     output_dims = 2
