mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make linecolor default to auto

Browse Source
This commit is contained in:
Daniel Schwabeneder 2017-08-25 14:16:53 +02:00
parent 95a6d24111
commit 6f3301e82f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/args.jl
View File

@ -198,7 +198,7 @@ const _series_defaults = KW(
:seriestype => :path, :seriestype => :path,
:linestyle => :solid, :linestyle => :solid,
:linewidth => :auto, :linewidth => :auto,
:linecolor => :match, :linecolor => :auto,
:linealpha => nothing, :linealpha => nothing,
:fillrange => nothing, # ribbons, areas, etc :fillrange => nothing, # ribbons, areas, etc
:fillcolor => :match, :fillcolor => :match,
@ -1333,12 +1333,14 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
# update other colors # update other colors
for s in (:line, :marker, :fill) for s in (:line, :marker, :fill)
csym, asym = Symbol(s,:color), Symbol(s,:alpha) csym, asym = Symbol(s,:color), Symbol(s,:alpha)
d[csym] = if d[csym] == :match d[csym] = if d[csym] == :auto
plot_color(if has_black_border_for_default(d[:seriestype]) && s == :line plot_color(if has_black_border_for_default(d[:seriestype]) && s == :line
sp[:foreground_color_subplot] sp[:foreground_color_subplot]
else else
d[:seriescolor] d[:seriescolor]
end, d[asym]) end, d[asym])
elseif d[csym] == :match
plot_color(d[:seriescolor], d[asym])
else else
getSeriesRGBColor(d[csym], d[asym], sp, plotIndex) getSeriesRGBColor(d[csym], d[asym], sp, plotIndex)
end end