Merge branch 'v1.1.x'

mdboom · mdboom · commit f96b41e0a9a9 · 2011-11-08T09:12:55.000-05:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -102,7 +102,12 @@ def __init__(self, axes, loc, label,
                 size = rcParams['%s.minor.size'%name]
         self._size = size
 
-        self._width = width # can be None for marker default
+        if width is None:
+            if major:
+                width = rcParams['%s.major.width'%name]
+            else:
+                width = rcParams['%s.minor.width'%name]
+        self._width = width
 
         if color is None:
             color = rcParams['%s.color' % name]
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1496,6 +1496,8 @@ def __init__(self, num, fig):
         self.SetSizer(self.sizer)
         self.Fit()
 
+        self.canvas.SetMinSize((2, 2))
+
         self.figmgr = FigureManagerWx(self.canvas, num, self)
 
         bind(self, wx.EVT_CLOSE, self._onClose)
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2321,6 +2321,8 @@ def get_converters(reader):
     for i, row in enumerate(reader):
         if not len(row): continue
         if row[0].startswith(comments): continue
+        # Ensure that the row returned always has the same nr of elements
+        row.extend([''] * (len(converters) - len(row)))
         rows.append([func(name, val) for func, name, val in zip(converters, names, row)])
         rowmasks.append([ismissing(name, val) for name, val in zip(names, row)])
     fh.close()
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -486,6 +486,8 @@ def __call__(self, s):
     # tick properties
     '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
+    'xtick.minor.width': [0.5, validate_float],      # minor xtick width in points
     'xtick.major.pad'  : [4, validate_float],      # distance to label in points
     'xtick.minor.pad'  : [4, validate_float],      # distance to label in points
     'xtick.color'      : ['k', validate_color],    # color of the xtick labels
@@ -494,6 +496,8 @@ def __call__(self, s):
 
     '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
+    'ytick.minor.width': [0.5, validate_float],      # minor ytick width in points
     'ytick.major.pad'  : [4, validate_float],      # distance to label in points
     'ytick.minor.pad'  : [4, validate_float],      # distance to label in points
     'ytick.color'      : ['k', validate_color],    # color of the ytick labels
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -15,6 +15,9 @@ def test_formatter_ticker():
     import matplotlib.testing.jpl_units as units
     units.register()
 
+    # This should affect the tick size.  (Tests issue #543)
+    matplotlib.rcParams['lines.markeredgewidth'] = 30
+
     # This essentially test to see if user specified labels get overwritten
     # by the auto labeler functionality of the axes.
     xdata = [ x*units.sec for x in range(10) ]
@@ -319,7 +322,7 @@ def test_polar_theta_position():
     ax.plot(theta, r)
     ax.set_theta_zero_location("NW")
     ax.set_theta_direction('clockwise')
-    
+
 @image_comparison(baseline_images=['axvspan_epoch'])
 def test_axvspan_epoch():
     from datetime import datetime
@@ -508,7 +511,7 @@ def test_symlog2():
     ax.set_xscale('symlog', linthreshx=0.01)
     ax.grid(True)
     ax.set_ylim(-0.1, 0.1)
-    
+
 @image_comparison(baseline_images=['pcolormesh'], tol=0.02)
 def test_pcolormesh():
     n = 12
@@ -542,7 +545,7 @@ def test_pcolormesh():
     ax.set_title('gouraud')
     ax.set_xticks([])
     ax.set_yticks([])
-    
+
 
 @image_comparison(baseline_images=['canonical'])
 def test_canonical():
@@ -625,7 +628,7 @@ def test_markevery_line():
     ax.plot(x, y, '-+', markevery=(5, 20), label='mark every 5 starting at 10')
     ax.legend()
 
-    
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -231,6 +231,8 @@ backend      : %(backend)s
 # see http://matplotlib.sourceforge.net/api/axis_api.html#matplotlib.axis.Tick
 #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
+#xtick.minor.width    : 0.5    # minor tick width in points
 #xtick.major.pad      : 4      # distance to major tick label in points
 #xtick.minor.pad      : 4      # distance to the minor tick label in points
 #xtick.color          : k      # color of the tick labels
@@ -239,6 +241,8 @@ backend      : %(backend)s
 
 #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
+#ytick.minor.width    : 0.5    # minor tick width in points
 #ytick.major.pad      : 4      # distance to major tick label in points
 #ytick.minor.pad      : 4      # distance to the minor tick label in points
 #ytick.color          : k      # color of the tick labels
