make get_***color return plot_color
This commit is contained in:
parent
49f4773e81
commit
a3e8af40b2
@ -624,7 +624,7 @@ function get_linecolor(series, i::Int = 1)
|
|||||||
lc = series[:linecolor]
|
lc = series[:linecolor]
|
||||||
lz = series[:line_z]
|
lz = series[:line_z]
|
||||||
if lz == nothing
|
if lz == nothing
|
||||||
isa(lc, ColorGradient) ? lc : _cycle(lc, i)
|
isa(lc, ColorGradient) ? lc : plot_color(_cycle(lc, i))
|
||||||
else
|
else
|
||||||
cmin, cmax = get_clims(series[:subplot])
|
cmin, cmax = get_clims(series[:subplot])
|
||||||
grad = isa(lc, ColorGradient) ? lc : cgrad()
|
grad = isa(lc, ColorGradient) ? lc : cgrad()
|
||||||
@ -648,7 +648,7 @@ function get_fillcolor(series, i::Int = 1)
|
|||||||
fc = series[:fillcolor]
|
fc = series[:fillcolor]
|
||||||
fz = series[:fill_z]
|
fz = series[:fill_z]
|
||||||
if fz == nothing
|
if fz == nothing
|
||||||
isa(fc, ColorGradient) ? fc : _cycle(fc, i)
|
isa(fc, ColorGradient) ? fc : plot_color(_cycle(fc, i))
|
||||||
else
|
else
|
||||||
cmin, cmax = get_clims(series[:subplot])
|
cmin, cmax = get_clims(series[:subplot])
|
||||||
grad = isa(fc, ColorGradient) ? fc : cgrad()
|
grad = isa(fc, ColorGradient) ? fc : cgrad()
|
||||||
@ -664,7 +664,7 @@ function get_markercolor(series, i::Int = 1)
|
|||||||
mc = series[:markercolor]
|
mc = series[:markercolor]
|
||||||
mz = series[:marker_z]
|
mz = series[:marker_z]
|
||||||
if mz == nothing
|
if mz == nothing
|
||||||
isa(mc, ColorGradient) ? mc : _cycle(mc, i)
|
isa(mc, ColorGradient) ? mc : plot_color(_cycle(mc, i))
|
||||||
else
|
else
|
||||||
cmin, cmax = get_clims(series[:subplot])
|
cmin, cmax = get_clims(series[:subplot])
|
||||||
grad = isa(mc, ColorGradient) ? mc : cgrad()
|
grad = isa(mc, ColorGradient) ? mc : cgrad()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user