8000 API/ENH: Color cycle handling · matplotlib/matplotlib@8af02b3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8af02b3

Browse files
tacaswelltacaswell
committed
API/ENH: Color cycle handling
API/ENH: Color cycle handling
2 parents 40150b3 + 58e66c8 commit 8af02b3

File tree

11 files changed

+152
-52
lines changed

11 files changed

+152
-52
lines changed

‎examples/pylab_examples/color_demo.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
"""
3-
matplotlib gives you 4 ways to specify colors,
3+
matplotlib gives you 5 ways to specify colors,
44
55
1) as a single letter string, ala MATLAB
66
@@ -11,6 +11,9 @@
1111
4) as a string representing a floating point number
1212
from 0 to 1, corresponding to shades of gray.
1313
14+
5) as a special color "Cn", where n is a number 0-9 specifying the
15+
nth color in the currently active color cycle.
16+
1417
See help(colors) for more info.
1518
"""
1619
import matplotlib.pyplot as plt
@@ -20,8 +23,8 @@
2023
#subplot(111, facecolor='#ababab')
2124
t = np.arange(0.0, 2.0, 0.01)
2225
s = np.sin(2*np.pi*t)
23-
plt.plot(t, s, 'y')
24-
plt.xlabel('time (s)', color='r')
26+
plt.plot(t, s, 'C1')
27+
plt.xlabel('time (s)', color='C1')
2528
plt.ylabel('voltage (mV)', color='0.5') # grayscale color
2629
plt.title('About as silly as it gets, folks', color='#afeeee')
2730
plt.show()

‎lib/matplotlib/axes/_axes.py

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from matplotlib.externals import six
55
from matplotlib.externals.six.moves import reduce, xrange, zip, zip_longest
66

7+
import itertools
78
import math
89
import warnings
910

@@ -2458,7 +2459,7 @@ def pie(self, x, explode=None, labels=None, colors=None,
24582459
Call signature::
24592460
24602461
pie(x, explode=None, labels=None,
2461-
colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
2462+
colors=None,
24622463
autopct=None, pctdistance=0.6, shadow=False,
24632464
labeldistance=1.1, startangle=None, radius=None,
24642465
counterclock=True, wedgeprops=None, textprops=None,
@@ -2478,7 +2479,8 @@ def pie(self, x, explode=None, labels=None, colors=None,
24782479
24792480
*colors*: [ *None* | color sequence ]
24802481
A sequence of matplotlib color args through which the pie chart
2481-
will cycle.
2482+
will cycle. If `None`, will use the colors in the currently
2483+
active cycle.
24822484
24832485
*labels*: [ *None* | len(x) sequence of strings ]
24842486
A sequence of strings providing the labels for each wedge
@@ -2567,7 +2569,12 @@ def pie(self, x, explode=None, labels=None, colors=None,
25672569
if len(x) != len(explode):
25682570
raise ValueError("'explode' must be of length 'x'")
25692571
if colors is None:
2570-
colors = ('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w')
2572+
get_next_color = self._get_patches_for_fill.get_next_color
2573+
else:
2574+
color_cycle = itertools.cycle(colors)
2575+
2576+
def get_next_color():
2577+
return six.next(color_cycle)
25712578

25722579
if radius is None:
25732580
radius = 1
@@ -2603,7 +2610,7 @@ def pie(self, x, explode=None, labels=None, colors=None,
26032610

26042611
w = mpatches.Wedge((x, y), radius, 360. * min(theta1, theta2),
26052612
360. * max(theta1, theta2),
2606-
facecolor=colors[i % len(colors)],
2613+
facecolor=get_next_color(),
26072614
**wedgeprops)
26082615
slices.append(w)
26092616
self.add_patch(w)
@@ -3023,8 +3030,8 @@ def xywhere(xs, ys, mask):
30233030
l0, = self.plot(x, y, fmt, label='_nolegend_', **kwargs)
30243031

30253032
if ecolor is None:
3026-
if l0 is None and 'color' in self._get_lines._prop_keys:
3027-
ecolor = next(self._get_lines.prop_cycler)['color']
3033+
if l0 is None:
3034+
ecolor = self._get_lines.get_next_color()
30283035
else:
30293036
ecolor = l0.get_color()
30303037

@@ -3846,7 +3853,10 @@ def scatter(self, x, y, s=None, c=None, marker='o', cmap=None, norm=None,
38463853
if facecolors is not None:
38473854
c = facecolors
38483855
else:
3849-
c = 'b' # The original default
3856+
if rcParams['_internal.classic_mode']:
3857+
c = 'b' # The original default
3858+
else:
3859+
c = self._get_patches_for_fill.get_next_color()
38503860

38513861
if edgecolors is None and not rcParams['_internal.classic_mode']:
38523862
edgecolors = 'face'
@@ -6019,9 +6029,8 @@ def _normalize_input(inp, ename='input'):
60196029
raise ValueError(
60206030
'weights should have the same shape as x')
60216031

6022-
if color is None and 'color' in self._get_lines._prop_keys:
6023-
color = [next(self._get_lines.prop_cycler)['color']
6024-
for i in xrange(nx)]
6032+
if color is None:
6033+
color = [self._get_lines.get_next_color() for i in xrange(nx)]
60256034
else:
60266035
color = mcolors.colorConverter.to_rgba_array(color)
60276036
if len(color) != nx:
@@ -7507,6 +7516,12 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
75077516
perp_lines = self.vlines
75087517
par_lines = self.hlines
75097518

7519+
if rcParams['_internal.classic_mode']:
7520+
fillcolor = 'y'
7521+
edgecolor = 'r'
7522+
else:
7523+
fillcolor = edgecolor = self._get_lines.get_next_color()
7524+
75107525
# Render violins
75117526
bodies = []
75127527
for stats, pos, width in zip(vpstats, positions, widths):
@@ -7517,7 +7532,7 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
75177532
bodies += [fill(stats['coords'],
75187533
-vals + pos,
75197534
vals + pos,
7520-
facecolor='y',
7535+
facecolor=fillcolor,
75217536
alpha=0.3)]
75227537
means.append(stats['mean'])
75237538
mins.append(stats['min'])
@@ -7527,20 +7542,24 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
75277542

75287543
# Render means
75297544
if showmeans:
7530-
artists['cmeans'] = perp_lines(means, pmins, pmaxes, colors='r')
7545+
artists['cmeans'] = perp_lines(means, pmins, pmaxes,
7546+
colors=edgecolor)
75317547

75327548
# Render extrema
75337549
if showextrema:
7534-
artists['cmaxes'] = perp_lines(maxes, pmins, pmaxes, colors='r')
7535-
artists['cmins'] = perp_lines(mins, pmins, pmaxes, colors='r')
7536-
artists['cbars'] = par_lines(positions, mins, maxes, colors='r')
7550+
artists['cmaxes'] = perp_lines(maxes, pmins, pmaxes,
7551+
colors=edgecolor)
7552+
artists['cmins'] = perp_lines(mins, pmins, pmaxes,
7553+
colors=edgecolor)
7554+
artists['cbars'] = par_lines(positions, mins, maxes,
7555+
colors=edgecolor)
75377556

75387557
# Render medians
75397558
if showmedians:
75407559
artists['cmedians'] = perp_lines(medians,
75417560
pmins,
75427561
pmaxes,
7543-
colors='r')
7562+
colors=edgecolor)
75447563

75457564
return artists
75467565

‎lib/matplotlib/axes/_base.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def _process_plot_format(fmt):
5252
* 'ko': black circles
5353
* '.b': blue dots
5454
* 'r--': red dashed lines
55+
* 'C2--': the third color in the color cycle, dashed lines
5556
5657
.. seealso::
5758
@@ -97,7 +98,9 @@ def _process_plot_format(fmt):
9798

9899
chars = [c for c in fmt]
99100

100-
for c in chars:
101+
i = 0
102+
while i < len(chars):
103+
c = chars[i]
101104
if c in mlines.lineStyles:
102105
if linestyle is not None:
103106
raise ValueError(
@@ -113,9 +116,14 @@ def _process_plot_format(fmt):
113116
raise ValueError(
114117
'Illegal format string "%s"; two color symbols' % fmt)
115118
color = c
119+
elif c == 'C' and i < len(chars) - 1:
120+
color_cycle_number = int(chars[i + 1])
121+
color = mcolors.colorConverter._get_nth_color(color_cycle_number)
122+
i += 1
116123
else:
117124
raise ValueError(
118125
'Unrecognized character %c in format string' % c)
126+
i += 1
119127

120128
if linestyle is None and marker is None:
121129
linestyle = rcParams['lines.linestyle']
@@ -161,6 +169,10 @@ def set_prop_cycle(self, *args, **kwargs):
161169
else:
162170
prop_cycler = cycler(*args, **kwargs)
163171

172+
# Make sure the cycler always has at least one color
173+
if 'color' not in prop_cycler.keys:
174+
prop_cycler = prop_cycler * cycler('color', ['k'])
175+
164176
self.prop_cycler = itertools.cycle(prop_cycler)
165177
# This should make a copy
166178
self._prop_keys = prop_cycler.keys
@@ -186,6 +198,12 @@ def __call__(self, *args, **kwargs):
186198
ret = self._grab_next_args(*args, **kwargs)
187199
return ret
188200

201+
def get_next_color(self):
202+
"""
203+
Return the next color in the cycle.
204+
"""
205+
return six.next(self.prop_cycler)['color']
206+
189207
def set_lineprops(self, line, **kwargs):
190208
assert self.command == 'plot', 'set_lineprops only works with "plot"'
191209
line.set(**kwargs)

‎lib/matplotlib/colors.py

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
- k: black
3232
- w: white
3333
34+
To use the colors that are part of the active color cycle in the current style,
35+
use `C` followed by a digit. For example:
36+
37+
- `C0`: The first color in the cycle
38+
- `C1`: The second color in the cycle
39+
3440
Gray shades can be given as a string encoding a float in the 0-1 range, e.g.::
3541
3642
color = '0.75'
@@ -67,6 +73,19 @@
6773

6874
def is_color_like(c):
6975
'Return *True* if *c* can be converted to *RGB*'
76+
77+
# Special-case the N-th color cycle syntax, because its parsing
78+
# needs to be deferred. We may be reading a value from rcParams
79+
# here before the color_cycle rcParam has been parsed.
80+
if isinstance(c, bytes):
81+
match = re.match(b'^C[0-9]$', c)
82+
if match is not None:
83+
return True
84+
elif isinstance(c, six.text_type):
85+
match = re.match('^C[0-9]$', c)
86+
if match is not None:
87+
return True
88+
7089
try:
7190
colorConverter.to_rgb(c)
7291
return True
@@ -114,9 +133,36 @@ class ColorConverter(object):
114133
'k': (0, 0, 0),
115134
'w': (1, 1, 1)}
116135

136+
_prop_cycler = None
137+
117138
cache = {}
118139
CN_LOOKUPS = [COLOR_NAMES[k] for k in ['css4', 'xkcd']]
119140

141+
@classmethod
142+
def _get_nth_color(cls, val):
143+
"""
144+
Get the Nth color in the current color cycle. If N is greater
145+
than the number of colors in the cycle, it is wrapped around.
146+
"""
147+
from matplotlib.rcsetup import cycler
148+
from matplotlib import rcParams
149+
150+
prop_cycler = rcParams['axes.prop_cycle']
151+
if prop_cycler is None and 'axes.color_cycle' in rcParams:
152+
clist = rcParams['axes.color_cycle']
153+
prop_cycler = cycler('color', clist)
154+
155+
colors = prop_cycler._transpose()['color']
156+
return colors[val % len(colors)]
157+
158+
@classmethod
159+
def _parse_nth_color(cls, val):
160+
match = re.match('^C[0-9]$', val)
161+
if match is not None:
162+
return cls._get_nth_color(int(val[1]))
163+
164+
raise ValueError("Not a color cycle color")
165+
120166
def to_rgb(self, arg):
121167
"""
122168
Returns an *RGB* tuple of three floats from 0-1.
@@ -154,6 +200,10 @@ def to_rgb(self, arg):
154200
argl = arg.lower()
155201
color = self.colors.get(argl, None)
156202
if color is None:
203+
try:
204+
argl = self._parse_nth_color(arg)
205+
except ValueError:
206+
pass
157207
for cmapping in self.CN_LOOKUPS:
158208
str1 = cmapping.get(argl, argl)
159209
if str1 != argl:

‎lib/matplotlib/rcsetup.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ def validate_animation_writer_path(p):
867867
# line props
868868
'lines.linewidth': [1.5, validate_float], # line width in points
869869
'lines.linestyle': ['-', six.text_type], # solid line
870-
'lines.color': ['b', validate_color], # blue
870+
'lines.color': ['C0', validate_color], # first color in color cycle
871871
'lines.marker': ['None', six.text_type], # black
872872
'lines.markeredgewidth': [1.0, validate_float],
873873
'lines.markersize': [6, validate_float], # markersize, in points
@@ -886,7 +886,7 @@ def validate_animation_writer_path(p):
886886
## patch props
887887
'patch.linewidth': [None, validate_float_or_None], # line width in points
888888
'patch.edgecolor': ['k', validate_color], # black
889-
'patch.facecolor': ['#1f77b4', validate_color], # blue (first color in color cycle)
889+
'patch.facecolor': ['C0', validate_color], # first color in color cycle
890890
'patch.antialiased': [True, validate_bool], # antialiased (no jaggies)
891891

892892
## hatch props
@@ -907,27 +907,27 @@ def validate_animation_writer_path(p):
907907
'boxplot.showfliers': [True, validate_bool],
908908
'boxplot.meanline': [False, validate_bool],
909909

910-
'boxplot.flierprops.color': ['b', validate_color],
910+
'boxplot.flierprops.color': ['C0', validate_color],
911911
'boxplot.flierprops.marker': ['+', six.text_type],
912912
'boxplot.flierprops.markerfacecolor': ['auto', validate_color_or_auto],
913913
'boxplot.flierprops.markeredgecolor': ['k', validate_color],
914914
'boxplot.flierprops.markersize': [6, validate_float],
915915
'boxplot.flierprops.linestyle': ['none', six.text_type],
916916
'boxplot.flierprops.linewidth': [1.0, validate_float],
917917

918-
'boxplot.boxprops.color': ['b', validate_color],
918+
'boxplot.boxprops.color': ['C0', validate_color],
919919
'boxplot.boxprops.linewidth': [1.0, validate_float],
920920
'boxplot.boxprops.linestyle': ['-', six.text_type],
921921

922-
'boxplot.whiskerprops.color': ['b', validate_color],
922+
'boxplot.whiskerprops.color': ['C0', validate_color],
923923
'boxplot.whiskerprops.linewidth': [1.0, validate_float],
924924
'boxplot.whiskerprops.linestyle': ['--', six.text_type],
925925

926926
'boxplot.capprops.color': ['k', validate_color],
927927
'boxplot.capprops.linewidth': [1.0, validate_float],
928928
'boxplot.capprops.linestyle': ['-', six.text_type],
929929

930-
'boxplot.medianprops.color': ['r', validate_color],
930+
'boxplot.medianprops.color': ['C1', validate_color],
931931
'boxplot.medianprops.linewidth': [1.0, validate_float],
932932
'boxplot.medianprops.linestyle': ['-', six.text_type],
933933

@@ -1038,7 +1038,10 @@ def validate_animation_writer_path(p):
10381038
'axes.formatter.use_mathtext': [False, validate_bool],
10391039
'axes.formatter.useoffset': [True, validate_bool],
10401040
'axes.unicode_minus': [True, validate_bool],
1041-
'axes.color_cycle': [['b', 'g', 'r', 'c', 'm', 'y', 'k'],
1041+
'axes.color_cycle': [
1042+
['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728',
1043+
'#9467bd', '#8c564b', '#e377c2', '#7f7f7f',
1044+
'#bcbd22', '#17becf'],
10421045
deprecate_axes_colorcycle], # cycle of plot
10431046
# line colors
10441047
# This entry can be either a cycler object or a

‎lib/matplotlib/sankey.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
from matplotlib.transforms import Affine2D
4646
from matplotlib import verbose
4747
from matplotlib import docstring
48+
from matplotlib import rcParams
4849

4950
__author__ = "Kevin L. Davies"
5051
__credits__ = ["Yannick Copin"]
@@ -770,11 +771,15 @@ def _get_angle(a, r):
770771
print("lrpath\n", self._revert(lrpath))
771772
xs, ys = list(zip(*vertices))
772773
self.ax.plot(xs, ys, 'go-')
773-
patch = PathPatch(Path(vertices, codes),
774-
fc=kwargs.pop('fc', kwargs.pop('facecolor',
775-
'#bfd1d4')), # Custom defaults
776-
lw=kwargs.pop('lw', kwargs.pop('linewidth', 0.5)),
777-
**kwargs)
774+
if rcParams['_internal.classic_mode']:
775+
fc = kwargs.pop('fc', kwargs.pop('facecolor', '#bfd1d4'))
776+
lw = kwargs.pop('lw', kwargs.pop('linewidth', 0.5))
777+
else:
778+
fc = kwargs.pop('fc', kwargs.pop('facecolor', None))
779+
lw = kwargs.pop('lw', kwargs.pop('linewidth', None))
780+
if fc is None:
781+
fc = six.next(self.ax._get_patches_for_fill.prop_cycler)['color']
782+
patch = PathPatch(Path(vertices, codes), fc=fc, lw=lw, **kwargs)
778783
self.ax.add_patch(patch)
779784

780785
# Add the path labels.

0 commit comments

Comments
 (0)
0