Merge branch 'v2.x'

QuLogic · QuLogic · commit 7a354aecb1ff · 2016-12-09T17:41:26.000-05:00
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -40,6 +40,12 @@ CocoaAgg backend removed
 ~~~~~~~~~~~~~~~~~~~~~~~~
 The deprecated and not fully functional CocoaAgg backend has been removed.
 
+`round` removed from TkAgg Backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The TkAgg backend had its own implementation of the `round` function. This
+was unused internally and has been removed. Instead, use either the
+`round` builtin function or `numpy.round`.
+
 'hold' functionality deprecated
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'hold' keyword argument and all functions and methods related
@@ -135,6 +141,16 @@ the kwarg is None which internally sets it to the 'auto' string,
 triggering a new algorithm for adjusting the maximum according
 to the axis length relative to the ticklabel font size.
 
+`matplotlib.ticker.LogFormatter` gains minor_thresholds kwarg
+-------------------------------------------------------------
+
+Previously, minor ticks on log-scaled axes were not labeled by
+default.  An algorithm has been added to the
+`~matplotlib.ticker.LogFormatter` to control the labeling of
+ticks between integer powers of the base.  The algorithm uses
+two parameters supplied in a kwarg tuple named 'minor_thresholds'.
+See the docstring for further explanation.
+
 
 New defaults for 3D quiver function in mpl_toolkits.mplot3d.axes3d.py
 ---------------------------------------------------------------------
diff --git a/doc/users/dflt_style_changes.rst b/doc/users/dflt_style_changes.rst
@@ -976,6 +976,11 @@ or create a new `~matplotlib.ticker.MaxNLocator`::
   import matplotlib.ticker as mticker
   ax.set_major_locator(mticker.MaxNLocator(nbins=9, steps=[1, 2, 5, 10])
 
+The algorithm used by `~matplotlib.ticker.MaxNLocator` has been
+improved, and this may change the choice of tick locations in some
+cases.  This also affects `~matplotlib.ticker.AutoLocator`, which
+uses ``MaxNLocator`` internally.
+
 For a log-scaled axis the default locator is the
 `~matplotlib.ticker.LogLocator`.  Previously the maximum number
 of ticks was set to 15, and could not be changed. Now there is a
@@ -1050,6 +1055,15 @@ Z-order
   ``rcParams['axes.axisbelow'] = False``.
 
 
+``LogFormatter`` labeling of minor ticks
+========================================
+
+Minor ticks on a log axis are now labeled when the axis view limits
+span a range less than or equal to the interval between two major
+ticks.  See `~matplotlib.ticker.LogFormatter` for details. The
+minor tick labeling is turned off when using ``mpl.style.use('classic')``,
+but cannot be controlled independently via ``rcParams``.
+
 
 ``ScalarFormatter`` tick label formatting with offsets
 ======================================================
diff --git a/examples/pylab_examples/date_index_formatter.py b/examples/pylab_examples/date_index_formatter.py
@@ -9,7 +9,7 @@
 """
 
 from __future__ import print_function
-import numpy
+import numpy as np
 from matplotlib.mlab import csv2rec
 import matplotlib.pyplot as plt
 import matplotlib.cbook as cbook
@@ -27,7 +27,7 @@ def __init__(self, dates, fmt='%Y-%m-%d'):
 
     def __call__(self, x, pos=0):
         'Return the label for time x at position pos'
-        ind = int(round(x))
+        ind = int(np.round(x))
         if ind >= len(self.dates) or ind < 0:
             return ''
 
@@ -37,6 +37,6 @@ def __call__(self, x, pos=0):
 
 fig, ax = plt.subplots()
 ax.xaxis.set_major_formatter(formatter)
-ax.plot(numpy.arange(len(r)), r.close, 'o-')
+ax.plot(np.arange(len(r)), r.close, 'o-')
 fig.autofmt_xdate()
 plt.show()
diff --git a/examples/user_interfaces/embedding_in_wx4.py b/examples/user_interfaces/embedding_in_wx4.py
@@ -37,11 +37,11 @@ def __init__(self, canvas, cankill):
         # probably want to add your own.
         if 'phoenix' in wx.PlatformInfo:
             self.AddTool(self.ON_CUSTOM, 'Click me',
-                         _load_bitmap('stock_left.xpm'),
+                         _load_bitmap('back.png'),
                          'Activate custom contol')
             self.Bind(wx.EVT_TOOL, self._on_custom, id=self.ON_CUSTOM)
         else:
-            self.AddSimpleTool(self.ON_CUSTOM, _load_bitmap('stock_left.xpm'),
+            self.AddSimpleTool(self.ON_CUSTOM, _load_bitmap('back.png'),
                                'Click me', 'Activate custom contol')
             self.Bind(wx.EVT_TOOL, self._on_custom, id=self.ON_CUSTOM)
 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -210,7 +210,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
 
         #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(
-            font, round(x - xd + xo), round(y + yd + yo) + 1, angle, gc)
+            font, np.round(x - xd + xo), np.round(y + yd + yo) + 1, angle, gc)
 
     def get_text_width_height_descent(self, s, prop, ismath):
         """
@@ -257,8 +257,8 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         w, h, d = self.get_text_width_height_descent(s, prop, ismath)
         xd = d * sin(radians(angle))
         yd = d * cos(radians(angle))
-        x = round(x + xd)
-        y = round(y + yd)
+        x = np.round(x + xd)
+        y = np.round(y + yd)
 
         self._renderer.draw_text_image(Z, x, y, angle, gc)
 
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -50,9 +50,6 @@
     }
 
 
-def round(x):
-    return int(math.floor(x+0.5))
-
 def raise_msg_to_str(msg):
     """msg is a return arg from a raise.  Join with new lines"""
     if not is_string_like(msg):
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -152,7 +152,7 @@ def flush_images():
                     gc = renderer.new_gc()
                     gc.set_clip_rectangle(parent.bbox)
                     gc.set_clip_path(parent.get_clip_path())
-                    renderer.draw_image(gc, round(l), round(b), data)
+                    renderer.draw_image(gc, np.round(l), np.round(b), data)
                     gc.restore()
             del image_group[:]
 
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -251,7 +251,7 @@ def set_default_locators_and_formatters(self, axis):
         axis.set_minor_locator(LogLocator(self.base, self.subs))
         axis.set_minor_formatter(
             LogFormatterSciNotation(self.base,
-                                    labelOnlyBase=self.subs))
+                                    labelOnlyBase=bool(self.subs)))
 
     def get_transform(self):
         """
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -32,7 +32,7 @@ def test_MaxNLocator_integer():
     test_value = np.array([-1, 0, 1, 2])
     assert_almost_equal(loc.tick_values(-0.1, 1.1), test_value)
 
-    test_value = np.array([-0.25, 0, 0.25, 0.5, 0.75, 1])
+    test_value = np.array([-0.3, 0, 0.3, 0.6, 0.9, 1.2])
     assert_almost_equal(loc.tick_values(-0.1, 0.95), test_value)
 
 
@@ -236,7 +236,7 @@ def _sub_labels(axis, subs=()):
     assert label_test == label_expected
 
 
-@cleanup
+@cleanup(style='default')
 def test_LogFormatter_sublabel():
     # test label locator
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -866,7 +866,12 @@ class LogFormatter(Formatter):
     major and minor ticks; the tick locations might be set manually,
     or by a locator that puts ticks at integer powers of base and
     at intermediate locations.  For this situation, disable the
-    minor_thresholds logic by using ``minor_thresholds=(np.inf, np.inf)``.
+    minor_thresholds logic by using ``minor_thresholds=(np.inf, np.inf)``,
+    so that all ticks will be labeled.
+
+    To disable labeling of minor ticks when 'labelOnlyBase' is False,
+    use ``minor_thresholds=(0, 0)``.  This is the default for the
+    "classic" style.
 
     Examples
     --------
@@ -877,14 +882,18 @@ class LogFormatter(Formatter):
     To label all minor ticks when the view limits span up to 1.5
     decades, use ``minor_thresholds=(1.5, 1.5)``.
 
-
     """
     def __init__(self, base=10.0, labelOnlyBase=False,
-                 minor_thresholds=(1, 0.4),
+                 minor_thresholds=None,
                  linthresh=None):
 
         self._base = float(base)
         self.labelOnlyBase = labelOnlyBase
+        if minor_thresholds is None:
+            if rcParams['_internal.classic_mode']:
+                minor_thresholds = (0, 0)
+            else:
+                minor_thresholds = (1, 0.4)
         self.minor_thresholds = minor_thresholds
         self._sublabels = None
         self._linthresh = linthresh
@@ -925,7 +934,6 @@ def set_locs(self, locs=None):
         b = self._base
 
         vmin, vmax = self.axis.get_view_interval()
-        self.d = abs(vmax - vmin)
 
         # Handle symlog case:
         linthresh = self._linthresh
@@ -957,15 +965,20 @@ def set_locs(self, locs=None):
             # Add labels between bases at log-spaced coefficients;
             # include base powers in case the locations include
             # "major" and "minor" points, as in colorbar.
-            c = np.logspace(0, 1, b//2 + 1, base=b)
+            c = np.logspace(0, 1, int(b)//2 + 1, base=b)
             self._sublabels = set(np.round(c))
+            # For base 10, this yields (1, 2, 3, 4, 6, 10).
         else:
-            self._sublabels = set(np.linspace(1, b, b))
+            # Label all integer multiples of base**n.
+            self._sublabels = set(np.arange(1, b + 1))
 
     def __call__(self, x, pos=None):
         """
         Return the format for tick val `x`.
         """
+        vmin, vmax = self.axis.get_view_interval()
+        vmin, vmax = mtransforms.nonsingular(vmin, vmax, expander=0.05)
+        d = abs(vmax - vmin)
         b = self._base
         if x == 0.0:
             return '0'
@@ -986,7 +999,7 @@ def __call__(self, x, pos=None):
         elif x < 1:
             s = '%1.0e' % x
         else:
-            s = self.pprint_val(x, self.d)
+            s = self.pprint_val(x, d)
         if sign == -1:
             s = '-%s' % s
 
@@ -1795,6 +1808,33 @@ def __init__(self, *args, **kwargs):
         self.set_params(**self.default_params)
         self.set_params(**kwargs)
 
+    @staticmethod
+    def _validate_steps(steps):
+        if not np.iterable(steps):
+            raise ValueError('steps argument must be a sequence of numbers '
+                             'from 1 to 10')
+        steps = np.asarray(steps)
+        if np.any(np.diff(steps) <= 0):
+            raise ValueError('steps argument must be uniformly increasing')
+        if steps[-1] > 10 or steps[0] < 1:
+            warnings.warn('Steps argument should be a sequence of numbers\n'
+                          'increasing from 1 to 10, inclusive. Behavior with\n'
+                          'values outside this range is undefined, and will\n'
+                          'raise a ValueError in future versions of mpl.')
+        if steps[0] != 1:
+            steps = np.hstack((1, steps))
+        if steps[-1] != 10:
+            steps = np.hstack((steps, 10))
+        return steps
+
+    @staticmethod
+    def _staircase(steps):
+        # Make an extended staircase within which the needed
+        # step will be found.  This is probably much larger
+        # than necessary.
+        flights = (0.1 * steps[:-1], steps, 10 * steps[1])
+        return np.hstack(flights)
+
     def set_params(self, **kwargs):
         """Set parameters within this locator."""
         if 'nbins' in kwargs:
@@ -1816,23 +1856,16 @@ def set_params(self, **kwargs):
         if 'steps' in kwargs:
             steps = kwargs['steps']
             if steps is None:
-                self._steps = [1, 1.5, 2, 2.5, 3, 4, 5, 6, 8, 10]
+                self._steps = np.array([1, 1.5, 2, 2.5, 3, 4, 5, 6, 8, 10])
             else:
-                if int(steps[-1]) != 10:
-                    steps = list(steps)
-                    steps.append(10)
-                self._steps = steps
-            # Make an extended staircase within which the needed
-            # step will be found.  This is probably much larger
-            # than necessary.
-            flights = (0.1 * np.array(self._steps[:-1]),
-                       self._steps,
-                       [10 * self._steps[1]])
-            self._extended_steps = np.hstack(flights)
+                self._steps = self._validate_steps(steps)
+            self._extended_steps = self._staircase(self._steps)
         if 'integer' in kwargs:
             self._integer = kwargs['integer']
         if self._integer:
-            self._steps = [n for n in self._steps if _divmod(n, 1)[1] < 0.001]
+            self._steps = np.array([n for n in self._steps
+                                    if _divmod(n, 1)[1] < 0.001])
+            self._extended_steps = self._staircase(self._steps)
         if 'min_n_ticks' in kwargs:
             self._min_n_ticks = max(1, kwargs['min_n_ticks'])
 
@@ -1870,8 +1903,8 @@ def _raw_ticks(self, vmin, vmax):
                 step = max(1, step)
             best_vmin = (_vmin // step) * step
 
-            low = round(Base(step).le(_vmin - best_vmin) / step)
-            high = round(Base(step).ge(_vmax - best_vmin) / step)
+            low = np.round(Base(step).le(_vmin - best_vmin) / step)
+            high = np.round(Base(step).ge(_vmax - best_vmin) / step)
             ticks = np.arange(low, high + 1) * step + best_vmin + offset
             nticks = ((ticks <= vmax) & (ticks >= vmin)).sum()
             if nticks >= self._min_n_ticks:

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,6 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
`53`		`-def round(x):`
`54`		`- return int(math.floor(x+0.5))`
`55`		`-`
`56`	`53`	`def raise_msg_to_str(msg):`
`57`	`54`	`"""msg is a return arg from a raise. Join with new lines"""`
`58`	`55`	`if not is_string_like(msg):`