Add legend.labelcolor in rcParams

Carloscerq · Carloscerq · commit 2216de0e77c9 · 2021-04-27T19:51:13.000-03:00
diff --git a/doc/users/next_whats_new/rcparams_legend.rst b/doc/users/next_whats_new/rcparams_legend.rst
@@ -0,0 +1,26 @@
+New rcParams for ledend: set legend labelcolor globaly
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The new :rc:`legend.labelcolor` allows toggling valid color string(for example, 'black'),
+versus choosing to match the color of the line of marker using 'linecolor',
+'markerfacecolor'(or 'mfc'), or 'markeredgecolor' (or 'mec').
+
+.. plot::
+
+    import numpy as np
+    import matplotlib.pyplot as plt
+    
+    # Make some fake data.
+    a = np.arange(0, 3, .02)
+    c = np.exp(a)
+    d = c[::-1]
+    plt.rcParams['legend.labelcolor'] = 'linecolor'
+
+
+    fig, ax = plt.subplots()
+    ax.plot(a, c, 'g--', label='Model length')
+    ax.plot(a, d, 'r:', label='Data length')
+
+    legend = ax.legend()
+
+    plt.show()
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -544,8 +544,8 @@ def __init__(self, parent, handles, labels,
             'mec':             ['get_markeredgecolor', 'get_edgecolor'],
         }
         if labelcolor is None:
-            pass
-        elif isinstance(labelcolor, str) and labelcolor in color_getters:
+            labelcolor = mpl.rcParams['legend.labelcolor']
+        if isinstance(labelcolor, str) and labelcolor in color_getters:
             getter_names = color_getters[labelcolor]
             for handle, text in zip(self.legendHandles, self.texts):
                 for getter_name in getter_names:
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -530,6 +530,7 @@
 #legend.scatterpoints: 1        # number of scatter points
 #legend.markerscale:   1.0      # the relative size of legend markers vs. original
 #legend.fontsize:      medium
+#legend.labelcolor:    black
 #legend.title_fontsize: None    # None sets to the same as the default axes.
 
 ## Dimensions as fraction of font size:
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -289,6 +289,17 @@ def validate_color_for_prop_cycle(s):
     return validate_color(s)
 
 
+def validate_color_or_linecolor(s):
+    if cbook._str_equal(s, 'linecolor'):
+        return s
+    elif cbook._str_equal(s, 'mfc') or cbook._str_equal(s, 'markerfacecolor'):
+        return 'markerfacecolor'
+    elif cbook._str_equal(s, 'mec') or cbook._str_equal(s, 'markeredgecolor'):
+        return 'markeredgecolor'
+
+    return validate_color(s)
+
+
 def validate_color(s):
     """Return a valid color arg."""
     if isinstance(s, str):
@@ -1017,6 +1028,7 @@ def _convert_validator_spec(key, conv):
     "legend.scatterpoints":  validate_int,
     "legend.fontsize":       validate_fontsize,
     "legend.title_fontsize": validate_fontsize_None,
+    "legend.labelcolor":     validate_color_or_linecolor, #color of the legend
      # the relative size of legend markers vs. original
     "legend.markerscale":    validate_float,
     "legend.shadow":         validate_bool,
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -643,6 +643,58 @@ def test_legend_labelcolor_markerfacecolor():
         assert mpl.colors.same_color(text.get_color(), color)
 
 
+def test_legend_labelcolor_rcparam_single():
+    # test the rcParams legend.labelcolor for a single color
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3')
+
+    mpl.rcParams['legend.labelcolor'] = 'r'
+    leg = ax.legend()
+    for text in leg.get_texts():
+        assert mpl.colors.same_color(text.get_color(), 'red')
+
+
+def test_legend_labelcolor_rcparam_linecolor():
+    # test the rcParams legend.labelcolor for a linecolor
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', color='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', color='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', color='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'linecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markeredgecolor():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markeredgecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markeredgecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markeredgecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'markeredgecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
+def test_legend_labelcolor_rcparam_markerfacecolor():
+    # test the labelcolor for labelcolor='markeredgecolor'
+    fig, ax = plt.subplots()
+    ax.plot(np.arange(10), np.arange(10)*1, label='#1', markerfacecolor='r')
+    ax.plot(np.arange(10), np.arange(10)*2, label='#2', markerfacecolor='g')
+    ax.plot(np.arange(10), np.arange(10)*3, label='#3', markerfacecolor='b')
+
+    mpl.rcParams['legend.labelcolor'] = 'markerfacecolor'
+    leg = ax.legend()
+    for text, color in zip(leg.get_texts(), ['r', 'g', 'b']):
+        assert mpl.colors.same_color(text.get_color(), color)
+
+
 def test_get_set_draggable():
     legend = plt.legend()
     assert not legend.get_draggable()
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -18,6 +18,7 @@
     validate_bool,
     validate_color,
     validate_colorlist,
+    validate_color_or_linecolor,
     validate_cycler,
     validate_float,
     validate_fontweight,
@@ -330,6 +331,17 @@ def generate_validator_testcases(valid):
                   ('(0, 1, "0.5")', ValueError),  # last one not a float
                   ),
          },
+        {'validator': validate_color_or_linecolor,
+         'success': (('linecolor', 'linecolor'),
+                     ('markerfacecolor', 'markerfacecolor'),
+                     ('mfc', 'markerfacecolor'),
+                     ('markeredgecolor', 'markeredgecolor'),
+                     ('mec', 'markeredgecolor')
+                     ),
+         'fail':(('line', ValueError),
+                 ('marker', ValueError)
+                 )
+         },
         {'validator': validate_hist_bins,
          'success': (('auto', 'auto'),
                      ('fd', 'fd'),
