Merge pull request #3863 from maxalbert/fix_log_transforms

pelson · tacaswell · commit 9d97a2133461 · 2015-01-12T23:56:33.000-05:00
Fix log transforms (fixes #3809). Conflicts: lib/matplotlib/tests/test_transforms.py cherry-pick diff picked up too many tests in test_transforms.py
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -475,6 +475,15 @@ def assert_bbox_eq(bbox1, bbox2):
     assert_bbox_eq(inter(r1, r5), bbox_from_ext(1, 1, 1, 1))
 
 
+@cleanup
+def test_log_transform():
+    # Tests that the last line runs without exception (previously the
+    # transform would fail if one of the axes was logarithmic).
+    fig, ax = plt.subplots()
+    ax.set_yscale('log')
+    ax.transData.transform((1,1))
+
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1277,8 +1277,33 @@ def transform(self, values):
 
         Accepts a numpy array of shape (N x :attr:`input_dims`) and
         returns a numpy array of shape (N x :attr:`output_dims`).
-        """
-        return self.transform_affine(self.transform_non_affine(values))
+
+        Alternatively, accepts a numpy array of length :attr:`input_dims`
+        and returns a numpy array of length :attr:`output_dims`.
+        """
+        # Ensure that values is a 2d array (but remember whether
+        # we started with a 1d or 2d array).
+        values = np.asanyarray(values)
+        ndim = values.ndim
+        values = values.reshape((-1, self.input_dims))
+
+        # Transform the values
+        res = self.transform_affine(self.transform_non_affine(values))
+
+        # Convert the result back to the shape of the input values.
+        if ndim == 0:
+            assert not np.ma.is_masked(res)  # just to be on the safe side
+            return res[0, 0]
+        if ndim == 1:
+            return res.reshape(-1)
+        elif ndim == 2:
+            return res
+        else:
+            raise ValueError(
+                "Input values must have shape (N x {dims}) "
+                "or ({dims}).".format(dims=self.input_dims))
+
+        return res
 
     def transform_affine(self, values):
         """
@@ -1294,6 +1319,9 @@ def transform_affine(self, values):
 
         Accepts a numpy array of shape (N x :attr:`input_dims`) and
         returns a numpy array of shape (N x :attr:`output_dims`).
+
+        Alternatively, accepts a numpy array of length :attr:`input_dims`
+        and returns a numpy array of length :attr:`output_dims`.
         """
         return self.get_affine().transform(values)
 
@@ -1310,6 +1338,9 @@ def transform_non_affine(self, values):
 
         Accepts a numpy array of shape (N x :attr:`input_dims`) and
         returns a numpy array of shape (N x :attr:`output_dims`).
+
+        Alternatively, accepts a numpy array of length :attr:`input_dims`
+        and returns a numpy array of length :attr:`output_dims`.
         """
         return values
 
@@ -1935,7 +1966,7 @@ def get_matrix(self):
     get_matrix.__doc__ = Affine2DBase.get_matrix.__doc__
 
     def transform(self, points):
-        return points
+        return np.asanyarray(points)
     transform.__doc__ = Affine2DBase.transform.__doc__
 
     transform_affine = transform
