Merge branch 'master' of https://github.com/matplotlib/matplotlib

Author: rmorshea

doc/api/api_changes/2015-08-17-JRE.rst

@@ -0,0 +1,11 @@
+ Preserve units with Text position
+ `````````````````````````````````
+
+Previously the 'get_position' method on Text would strip away unit information
+even though the units were still present.  There was no inherent need to do
+this, so it has been changed so that unit data (if present) will be preserved.
+Essentially a call to 'get_position' will return the exact value from a call to
+'set_position'.
+
+If you wish to get the old behaviour, then you can use the new method called
+'get_unitless_position'.

examples/pylab_examples/hist2d_demo.py

@@ -1,7 +1,8 @@
-from pylab import *
-x = randn(1000)
-y = randn(1000) + 5
+import matplotlib.pyplot as plt
+import numpy as np
+x = np.random.randn(1000)
+y = np.random.randn(1000) + 5
 
 # normal distribution center at x=0 and y=5
-hist2d(x, y, bins=40)
-show()
+plt.hist2d(x, y, bins=40)
+plt.show()

examples/pylab_examples/hist2d_log_demo.py

@@ -1,10 +1,11 @@
 from matplotlib.colors import LogNorm
-from pylab import *
+import matplotlib.pyplot as plt
+import numpy as np
 
 # normal distribution center at x=0 and y=5
-x = randn(100000)
-y = randn(100000) + 5
+x = np.random.randn(100000)
+y = np.random.randn(100000) + 5
 
-hist2d(x, y, bins=40, norm=LogNorm())
-colorbar()
-show()
+plt.hist2d(x, y, bins=40, norm=LogNorm())
+plt.colorbar()
+plt.show()

examples/pylab_examples/image_demo2.py

@@ -1,5 +1,4 @@
 from __future__ import print_function
-# from pylab import *
 import matplotlib.pyplot as plt
 import numpy as np
 import matplotlib.cbook as cbook

examples/pylab_examples/image_interp.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 The same (small) array, interpolated with three different
 interpolation methods.
@@ -46,18 +45,20 @@
 suggested.
 
 """
-from pylab import *
-A = rand(5, 5)
-figure(1)
-imshow(A, interpolation='nearest')
-grid(True)
+import matplotlib.pyplot as plt
+import numpy as np
 
-figure(2)
-imshow(A, interpolation='bilinear')
-grid(True)
+A = np.random.rand(5, 5)
+plt.figure(1)
+plt.imshow(A, interpolation='nearest')
+plt.grid(True)
 
-figure(3)
-imshow(A, interpolation='bicubic')
-grid(True)
+plt.figure(2)
+plt.imshow(A, interpolation='bilinear')
+plt.grid(True)
 
-show()
+plt.figure(3)
+plt.imshow(A, interpolation='bicubic')
+plt.grid(True)
+
+plt.show()

lib/matplotlib/animation.py

@@ -1142,7 +1142,7 @@ def new_saved_frame_seq(self):
         if self._save_seq:
             # While iterating we are going to update _save_seq
             # so make a copy to safely iterate over
-            self._old_saved_seq = self._save_seq.copy()
+            self._old_saved_seq = list(self._save_seq)
             return iter(self._old_saved_seq)
         else:
             return itertools.islice(self.new_frame_seq(), self.save_count)

lib/matplotlib/text.py

@@ -240,7 +240,8 @@ def update(self, kwargs):
         """
         bbox = kwargs.pop('bbox', None)
         super(Text, self).update(kwargs)
-        self.set_bbox(bbox)  # depends on font properties
+        if bbox:
+            self.set_bbox(bbox)  # depends on font properties
 
     def __getstate__(self):
         d = super(Text, self).__getstate__()
@@ -280,7 +281,7 @@ def contains(self, mouseevent):
 
     def _get_xy_display(self):
         'get the (possibly unit converted) transformed x, y in display coords'
-        x, y = self.get_position()
+        x, y = self.get_unitless_position()
         return self.get_transform().transform_point((x, y))
 
     def _get_multialignment(self):
@@ -536,8 +537,8 @@ def update_bbox_position_size(self, renderer):
 
             trans = self.get_transform()
 
-            # don't use self.get_position here, which refers to text position
-            # in Text, and dash position in TextWithDash:
+            # don't use self.get_unitless_position here, which refers to text
+            # position in Text, and dash position in TextWithDash:
             posx = float(self.convert_xunits(self._x))
             posy = float(self.convert_yunits(self._y))
 
@@ -877,12 +878,20 @@ def get_horizontalalignment(self):
         """
         return self._horizontalalignment
 
-    def get_position(self):
-        "Return the position of the text as a tuple (*x*, *y*)"
+    def get_unitless_position(self):
+        "Return the unitless position of the text as a tuple (*x*, *y*)"
+        # This will get the position with all unit information stripped away.
+        # This is here for convienience since it is done in several locations.
         x = float(self.convert_xunits(self._x))
         y = float(self.convert_yunits(self._y))
         return x, y
 
+    def get_position(self):
+        "Return the position of the text as a tuple (*x*, *y*)"
+        # This should return the same data (possible unitized) as was
+        # specified with 'set_x' and 'set_y'.
+        return self._x, self._y
+
     def get_prop_tup(self):
         """
         Return a hashable tuple of properties.
@@ -891,7 +900,7 @@ def get_prop_tup(self):
         want to cache derived information about text (e.g., layouts) and
         need to know if the text has changed.
         """
-        x, y = self.get_position()
+        x, y = self.get_unitless_position()
         return (x, y, self.get_text(), self._color,
                 self._verticalalignment, self._horizontalalignment,
                 hash(self._fontproperties),
@@ -950,7 +959,7 @@ def get_window_extent(self, renderer=None, dpi=None):
             raise RuntimeError('Cannot get window extent w/o renderer')
 
         bbox, info, descent = self._get_layout(self._renderer)
-        x, y = self.get_position()
+        x, y = self.get_unitless_position()
         x, y = self.get_transform().transform_point((x, y))
         bbox = bbox.translated(x, y)
         if dpi is not None:
@@ -1365,12 +1374,20 @@ def __init__(self,
 
         #self.set_bbox(dict(pad=0))
 
-    def get_position(self):
-        "Return the position of the text as a tuple (*x*, *y*)"
+    def get_unitless_position(self):
+        "Return the unitless position of the text as a tuple (*x*, *y*)"
+        # This will get the position with all unit information stripped away.
+        # This is here for convienience since it is done in several locations.
         x = float(self.convert_xunits(self._dashx))
         y = float(self.convert_yunits(self._dashy))
         return x, y
 
+    def get_position(self):
+        "Return the position of the text as a tuple (*x*, *y*)"
+        # This should return the same data (possibly unitized) as was
+        # specified with set_x and set_y
+        return self._dashx, self._dashy
+
     def get_prop_tup(self):
         """
         Return a hashable tuple of properties.
@@ -1402,7 +1419,7 @@ def update_coords(self, renderer):
         with respect to the actual canvas's coordinates we need to map
         back and forth.
         """
-        dashx, dashy = self.get_position()
+        dashx, dashy = self.get_unitless_position()
         dashlength = self.get_dashlength()
         # Shortcircuit this process if we don't have a dash
         if dashlength == 0.0: