Merge pull request #1634 from tacaswell/scatterpoint_rcParam

add scatterpoints to rcParam
matplotlib · Jan 15, 2013 · 02582f8 · 02582f8
2 parents 06d7f9c + b475c86
commit 02582f8
Show file tree

Hide file tree

Showing 10 changed files with 1,133 additions and 2 deletions.
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -135,7 +135,7 @@ def __init__(self, parent, handles, labels,
                  numpoints=None,    # the number of points in the legend line
                  markerscale=None,  # the relative size of legend markers
                                     # vs. original
-                 scatterpoints=3,    # TODO: may be an rcParam
+                 scatterpoints=None,    # number of scatter points
                  scatteryoffsets=None,
                  prop=None,          # properties for the legend texts
                  fontsize=None,        # keyword to set font size directly

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -514,6 +514,7 @@ def __call__(self, s):
     'legend.loc'         : ['upper right',validate_legend_loc], # at some point, this should be changed to 'best'
     'legend.isaxes'      : [True,validate_bool],  # this option is internally ignored - it never served any useful purpose
     'legend.numpoints'   : [2, validate_int],     # the number of points in the legend line
+    'legend.scatterpoints' : [3, validate_int],     # the number of points in the legend line for scatter
     'legend.fontsize'    : ['large', validate_fontsize],
     'legend.markerscale' : [1.0, validate_float], # the relative size of legend markers vs. original
     'legend.shadow'        : [False, validate_bool],

diff --git a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.pdf b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.png b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.png