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

Merge fc569cda55e3f94ba0047d438d8f7b23cd7d3fe8 into 18b11a71e349cd826505fe260e293509bfb10847

Browse Source
This commit is contained in:
Simon Christ 2022-05-11 19:31:34 +02:00 committed by GitHub
commit f81e07f623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.jl
View File

@ -1770,7 +1770,7 @@ function slice_arg!(
idx::Int,
remove_pair::Bool,
)
v = get(plotattributes_in, k, plotattributes_out[k])
v = get(plotattributes_in, k, default(k))
plotattributes_out[k] = if haskey(plotattributes_in, k) && !(k in _plot_args)
if typeof(v) <: AMat && !isempty(v)
slice_arg(v, idx)
@ -2136,9 +2136,11 @@ function _replace_linewidth(plotattributes::AKW)
end
function _slice_series_args!(plotattributes::AKW, plt::Plot, sp::Subplot, commandIndex::Int)
series_kw = merge(_series_defaults, plotattributes)
for k in keys(_series_defaults)
haskey(plotattributes, k) &&
slice_arg!(plotattributes, plotattributes, k, commandIndex, false)
# k == :label && @show series_kw[:label], k, commandIndex
slice_arg!(series_kw, plotattributes, k, commandIndex, false)
# k == :label && @show plotattributes[:label]
end
return plotattributes
end

4
test/test_defaults.jl
View File

@ -17,6 +17,10 @@ Plots.__init__()
@test Plots._series_defaults[:fillrange] == 0
pl = plot(1:5)
@test pl[1][1][:fillrange] == 0
default(label = ["Line a" "Line b"])
pl = plot(1:10, rand(10,2))
@test pl[1][1][:label] == "Line a"
@test pl[1][2][:label] == "Line b"
default()
end