Merge branch 'v2.0.x'

mdboom · mdboom · commit 2433955979a6 · 2015-11-17T17:32:27.000-05:00
diff --git a/doc/users/whats_new/ticks_rcparams.rst b/doc/users/whats_new/ticks_rcparams.rst
@@ -0,0 +1,6 @@
+New rcParams
+------------
+
+The parameters `xtick.top`, `xtick.bottom`, `ytick.left`
+and `ytick.right` were added to control where the ticks
+are drawn.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -543,6 +543,10 @@ def __init__(self, fig, rect,
         if self.yaxis is not None:
             self._ycid = self.yaxis.callbacks.connect('units finalize',
                                                       self.relim)
+        self.tick_params(top=rcParams['xtick.top'],
+                         bottom=rcParams['xtick.bottom'],
+                         left=rcParams['ytick.left'],
+                         right=rcParams['ytick.right'])
 
     def __setstate__(self, state):
         self.__dict__ = state
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -214,6 +214,9 @@ axes3d.grid         : True    # display grid on 3d axes
 
 ### TICKS
 # see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
+
+xtick.top            : True   # draw ticks on the top side
+xtick.bottom         : True   # draw ticks on the bottom side
 xtick.major.size     : 4      # major tick size in points
 xtick.minor.size     : 2      # minor tick size in points
 xtick.minor.visible  : False
@@ -225,6 +228,8 @@ xtick.color          : k      # color of the tick labels
 xtick.labelsize      : medium # fontsize of the tick labels
 xtick.direction      : in     # direction: in, out, or inout
 
+ytick.left           : True   # draw ticks on the left side
+ytick.right          : True   # draw ticks on the right side
 ytick.major.size     : 4      # major tick size in points
 ytick.minor.size     : 2      # minor tick size in points
 ytick.minor.visible  : False
@@ -418,7 +423,7 @@ pdf.use14corefonts : False
 pgf.debug           : False
 pgf.texsystem       : xelatex
 pgf.rcfonts         : True
-pgf.preamble        : 
+pgf.preamble        :
 
 # svg backend params
 svg.image_inline : True       # write raster image data directly into the svg file
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1017,7 +1017,9 @@ def validate_cycler(s):
     'legend.facecolor': ['inherit', validate_color_or_inherit],
     'legend.edgecolor': ['inherit', validate_color_or_inherit],
 
-    ## tick properties
+    # tick properties
+    'xtick.top':         [True, validate_bool],   # draw ticks on the top side
+    'xtick.bottom':      [True, validate_bool],   # draw ticks on the bottom side
     'xtick.major.size':  [4, validate_float],    # major xtick size in points
     'xtick.minor.size':  [2, validate_float],    # minor xtick size in points
     'xtick.major.width': [0.5, validate_float],  # major xtick width in points
@@ -1031,6 +1033,8 @@ def validate_cycler(s):
     'xtick.labelsize':   ['medium', validate_fontsize],
     'xtick.direction':   ['in', six.text_type],            # direction of xticks
 
+    'ytick.left':        [True, validate_bool],  # draw ticks on the left side
+    'ytick.right':       [True, validate_bool],  # draw ticks on the right side
     'ytick.major.size':  [4, validate_float],     # major ytick size in points
     'ytick.minor.size':  [2, validate_float],     # minor ytick size in points
     'ytick.major.width': [0.5, validate_float],   # major ytick width in points
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4024,6 +4024,23 @@ def test_rc_grid():
             i += 1
 
 
+@cleanup
+def test_rc_tick():
+    d = {'xtick.bottom': False, 'xtick.top': True,
+         'ytick.left': True, 'ytick.right': False}
+    with plt.rc_context(rc=d):
+        fig = plt.figure()
+        ax1 = fig.add_subplot(1, 1, 1)
+        xax = ax1.xaxis
+        yax = ax1.yaxis
+        # tick1On bottom/left
+        assert xax._major_tick_kw['tick1On'] == False
+        assert xax._major_tick_kw['tick2On'] == True
+
+        assert yax._major_tick_kw['tick1On'] == True
+        assert yax._major_tick_kw['tick2On'] == False
+
+
 @cleanup
 def test_bar_negative_width():
     fig, ax = plt.subplots()
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -281,6 +281,9 @@ backend      : %(backend)s
 
 ### TICKS
 # see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
+
+#xtick.top            : True   # draw ticks on the top side
+#xtick.bottom         : True   # draw ticks on the bottom side
 #xtick.major.size     : 4      # major tick size in points
 #xtick.minor.size     : 2      # minor tick size in points
 #xtick.major.width    : 0.5    # major tick width in points
@@ -291,6 +294,9 @@ backend      : %(backend)s
 #xtick.labelsize      : medium # fontsize of the tick labels
 #xtick.direction      : in     # direction: in, out, or inout
 
+
+#ytick.left           : True   # draw ticks on the left side
+#ytick.right          : True   # draw ticks on the right side
 #ytick.major.size     : 4      # major tick size in points
 #ytick.minor.size     : 2      # minor tick size in points
 #ytick.major.width    : 0.5    # major tick width in points
