Skip to content

Commit

Permalink
Fix scalar number as color in scatterlines
Browse files Browse the repository at this point in the history
  • Loading branch information
jkrumbiegel committed Feb 1, 2024
1 parent 14528a1 commit 45827c8
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions src/basic_recipes/scatterlines.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ $(ATTRIBUTES)
linestyle = l_theme.linestyle,
linewidth = l_theme.linewidth,
markercolor = automatic,
markercolormap = s_theme.colormap,
markercolorrange = get(s_theme.attributes, :colorrange, automatic),
markercolormap = automatic,
markercolorrange = automatic,
markersize = s_theme.markersize,
strokecolor = s_theme.strokecolor,
strokewidth = s_theme.strokewidth,
Expand All @@ -32,8 +32,7 @@ end
function plot!(p::Plot{scatterlines, <:NTuple{N, Any}}) where N

# markercolor is the same as linecolor if left automatic
# RGBColors -> union of all colortypes that `to_color` accepts + returns
real_markercolor = Observable{RGBColors}()
real_markercolor = Observable{Any}()
map!(real_markercolor, p.color, p.markercolor) do col, mcol
if mcol === automatic
return to_color(col)
Expand All @@ -42,6 +41,16 @@ function plot!(p::Plot{scatterlines, <:NTuple{N, Any}}) where N
end
end

real_markercolormap = Observable{Any}()
map!(real_markercolormap, p.colormap, p.markercolormap) do col, mcol
mcol === automatic ? col : mcol
end

real_markercolorrange = Observable{Any}()
map!(real_markercolorrange, p.colorrange, p.markercolorrange) do col, mcol
mcol === automatic ? col : mcol
end

lines!(p, p[1:N]...;
color = p.color,
linestyle = p.linestyle,
Expand All @@ -57,9 +66,9 @@ function plot!(p::Plot{scatterlines, <:NTuple{N, Any}}) where N
strokewidth = p.strokewidth,
marker = p.marker,
markersize = p.markersize,
colormap = p.markercolormap,
colormap = real_markercolormap,
colorscale = p.colorscale,
colorrange = p.markercolorrange,
colorrange = real_markercolorrange,
inspectable = p.inspectable
)
end

0 comments on commit 45827c8

Please sign in to comment.