transform implamented

rmorshea · rmorshea · commit 705efd2e9841 · 2015-08-14T15:29:22.000-07:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -99,8 +99,8 @@ def _transform_changed(self):
     stale = Bool(True)
 
     def _stale_changed(self):
-        #if self.stale:
-        self.pchanged()
+        if self.stale:
+            self.pchanged()
 
     transform_set = Bool(False)
 
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -21,6 +21,8 @@
 import numpy as np
 import warnings
 
+from .traitlets import gsTransformInstance
+
 GRIDLINE_INTERPOLATION_STEPS = 180
 
 
@@ -295,7 +297,7 @@ def _apply_params(self, **kw):
             trans = self._get_text1_transform()[0]
             self.label1.transform = trans
             trans = self._get_text2_transform()[0]
-            self.label2 = trans
+            self.label2.transform = trans
             self.tick1line.set_marker(self._tickmarkers[0])
             self.tick2line.set_marker(self._tickmarkers[1])
         tick_kw = dict([kv for kv in six.iteritems(kw)
@@ -616,6 +618,8 @@ class Axis(artist.Artist):
     """
     OFFSETTEXTPAD = 3
 
+    transform = gsTransformInstance(None)
+
     def __str__(self):
         return self.__class__.__name__ \
             + "(%f,%f)" % tuple(self.axes.transAxes.transform_point((0, 0)))
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1082,7 +1082,7 @@ def __call__(self, value, clip=None):
                 result = ma.array(np.clip(result.filled(vmax), vmin, vmax),
                                   mask=mask)
             # in-place equivalent of above can be much faster
-            resdat = self._transform(result.data)
+            resdat = self.transform(result.data)
             resdat -= self._lower
             resdat /= (self._upper - self._lower)
 
@@ -1120,7 +1120,7 @@ def _transform_vmin_vmax(self):
         """
         vmin, vmax = self.vmin, self.vmax
         arr = np.array([vmax, vmin]).astype(np.float)
-        self._upper, self._lower = self._transform(arr)
+        self._upper, self._lower = self.transform(arr)
 
     def inverse(self, value):
         if not self.scaled():
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -285,7 +285,6 @@ def __init__(self, axis, **kwargs):
 
         if nonpos not in ['mask', 'clip']:
             raise ValueError("nonposx, nonposy kwarg must be 'mask' or 'clip'")
-
         if base == 10.0:
             self._transform = self.Log10Transform(nonpos)
         elif base == 2.0:
diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
@@ -55,7 +55,7 @@ def test_patch_transform_of_none():
     ax.add_patch(e)
     assert e.transform != intermediate_transform
     assert e.transform_set) is True
-    assert e._transform == ax.transData
+    assert e.transform == ax.transData
 
 
 @cleanup
diff --git a/lib/matplotlib/traitlets.py b/lib/matplotlib/traitlets.py
@@ -18,7 +18,6 @@
 import numpy as np
 
 from types import MethodType
-
 from .transforms import IdentityTransform, Transform
 
 class GetSetMixin(object):
@@ -80,6 +79,8 @@ class TransformInstance(TraitType):
                  ' `_as_mpl_transform` method')
 
     def validate(self, obj, value):
+        if value is None:
+            return IdentityTransform()
         if isinstance(value, Transform):
             return value
         elif hasattr(value, '_as_mpl_transform'):
diff --git a/tools/refactor.ipynb b/tools/refactor.ipynb
diff --git a/tools/refactor_tool.py b/tools/refactor_tool.py
