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

pgfplots markercolors

Browse Source
This commit is contained in:
Daniel Schwabeneder 2018-05-05 17:44:13 +02:00
parent ee18a9dd6c
commit ba9a8d52cc
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/pgfplots.jl
View File

@ -173,11 +173,8 @@ end
function pgf_marker(d, i = 1) function pgf_marker(d, i = 1)
shape = _cycle(d[:markershape], i) shape = _cycle(d[:markershape], i)
cstr, a = pgf_color(_cycle(d[:markercolor], i)) cstr, a = pgf_color(plot_color(get_markercolor(d, i), get_markeralpha(d, i)))
if d[:markeralpha] != nothing cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(d, i), get_markerstrokealpha(d, i)))
a = _cycle(d[:markeralpha], i)
end
cstr_stroke, a_stroke = pgf_color(_cycle(d[:markerstrokecolor], i))
if d[:markerstrokealpha] != nothing if d[:markerstrokealpha] != nothing
a_stroke = _cycle(d[:markerstrokealpha], i) a_stroke = _cycle(d[:markerstrokealpha], i)
end end

2
src/utils.jl
View File

@ -691,7 +691,7 @@ function has_attribute_segments(series::Series)
end end
series[:seriestype] == :shape && return false series[:seriestype] == :shape && return false
# ... else we check relevant attributes if they have multiple inputs # ... else we check relevant attributes if they have multiple inputs
return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :fillcolor, :fillalpha]) || any(typeof(series[attr]) <: AbstractArray{<:Real} for attr in (:line_z, :fill_z)) return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :fillcolor, :fillalpha, :markercolor, :markeralpha, :markerstrokecolor, :markerstrokealpha]) || any(typeof(series[attr]) <: AbstractArray{<:Real} for attr in (:line_z, :fill_z, :marker_z))
end end
# --------------------------------------------------------------- # ---------------------------------------------------------------