From e991e2bf377ab36c980415a6caf1f800b4607e6d Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 24 Aug 2018 16:40:49 +0200 Subject: [PATCH 1/4] implement additional get_***color methods --- src/utils.jl | 78 ++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 45 deletions(-) diff --git a/src/utils.jl b/src/utils.jl index f76785fe..e58bc1c6 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -617,20 +617,40 @@ function hascolorbar(sp::Subplot) hascbar end -function get_linecolor(series, i::Int = 1) - lc = series[:linecolor] - lz = series[:line_z] - if lz == nothing - isa(lc, ColorGradient) ? lc : plot_color(_cycle(lc, i)) - else - cmin, cmax = get_clims(series[:subplot]) - grad = isa(lc, ColorGradient) ? lc : cgrad() - grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)] - end -end +for comp in (:line, :fill, :marker) -function get_linealpha(series, i::Int = 1) - _cycle(series[:linealpha], i) + compcolor = Symbol(comp, :color) + get_compcolor = Symbol(:get_, compcolor) + comp_z = Symbol(comp, :_z) + + compalpha = Symbol(comp, :alpha) + get_compalpha = Symbol(:get_, compalpha) + + @eval begin + + function $get_compcolor(series, cmin::Real, cmax::Real, i::Int = 1) + c = series[$Symbol(compcolor)] + z = series[$Symbol(comp_z)] + if z == nothing + isa(c, ColorGradient) ? c : plot_color(_cycle(c, i)) + else + grad = isa(c, ColorGradient) ? c : cgrad() + grad[clamp((_cycle(z, i) - cmin) / (cmax - cmin), 0, 1)] + end + end + + $get_compcolor(series, clims, i::Int = i) = $get_compcolor(series, clims[1], clims[2], i) + + function $get_compcolor(series, i::Int = 1) + if series[$Symbol(comp_z)] == nothing + $get_compcolor(series, 0, 1, i) + else + $get_compcolor(series, get_clims(series[:subplot]), i) + end + end + + $get_compalpha(series, i::Int = 1) = _cycle(series[$compalpha], i) + end end function get_linewidth(series, i::Int = 1) @@ -641,38 +661,6 @@ function get_linestyle(series, i::Int = 1) _cycle(series[:linestyle], i) end -function get_fillcolor(series, i::Int = 1) - fc = series[:fillcolor] - fz = series[:fill_z] - if fz == nothing - isa(fc, ColorGradient) ? fc : plot_color(_cycle(fc, i)) - else - cmin, cmax = get_clims(series[:subplot]) - grad = isa(fc, ColorGradient) ? fc : cgrad() - grad[clamp((_cycle(fz, i) - cmin) / (cmax - cmin), 0, 1)] - end -end - -function get_fillalpha(series, i::Int = 1) - _cycle(series[:fillalpha], i) -end - -function get_markercolor(series, i::Int = 1) - mc = series[:markercolor] - mz = series[:marker_z] - if mz == nothing - isa(mc, ColorGradient) ? mc : plot_color(_cycle(mc, i)) - else - cmin, cmax = get_clims(series[:subplot]) - grad = isa(mc, ColorGradient) ? mc : cgrad() - grad[clamp((_cycle(mz, i) - cmin) / (cmax - cmin), 0, 1)] - end -end - -function get_markeralpha(series, i::Int = 1) - _cycle(series[:markeralpha], i) -end - function get_markerstrokecolor(series, i::Int = 1) msc = series[:markerstrokecolor] isa(msc, ColorGradient) ? msc : _cycle(msc, i) From 84601bacdbb3230964bde091384a28beab9bb4e7 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 24 Aug 2018 17:20:19 +0200 Subject: [PATCH 2/4] gr implementation --- src/backends/gr.jl | 33 +++++++++++++++------------------ src/utils.jl | 16 ++++++++-------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 2215c456..480bb89f 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -338,7 +338,11 @@ end # draw the markers, one at a time -function gr_draw_markers(series::Series, x, y, msize, mz) +function gr_draw_markers(series::Series, x, y, clims, msize = series[:markersize]) + + isempty(x) && return + GR.setfillintstyle(GR.INTSTYLE_SOLID) + shapes = series[:markershape] if shapes != :none for i=1:length(x) @@ -355,7 +359,7 @@ function gr_draw_markers(series::Series, x, y, msize, mz) # draw the shape - don't draw filled area if marker shape is 1D if !(shape in (:hline, :vline, :+, :x)) - cfunc(get_markercolor(series, i)) + cfunc(get_markercolor(series, clims, i)) gr_set_transparency(get_markeralpha(series, i)) gr_draw_marker(x[i], y[i], msi, shape) end @@ -363,13 +367,6 @@ function gr_draw_markers(series::Series, x, y, msize, mz) end end -function gr_draw_markers(series::Series, x, y, clims) - isempty(x) && return - mz = normalize_zvals(series[:marker_z], clims) - GR.setfillintstyle(GR.INTSTYLE_SOLID) - gr_draw_markers(series, x, y, series[:markersize], mz) -end - # --------------------------------------------------------- function gr_set_line(lw, style, c) #, a) @@ -1038,7 +1035,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) GR.setfillintstyle(GR.INTSTYLE_SOLID) fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng)) for (i, rng) in enumerate(segments) - gr_set_fillcolor(get_fillcolor(series, i)) + gr_set_fillcolor(get_fillcolor(series, clims, i)) fx = _cycle(x, vcat(rng, reverse(rng))) fy = vcat(_cycle(fr_from,rng), _cycle(fr_to,reverse(rng))) gr_set_transparency(get_fillalpha(series, i)) @@ -1049,7 +1046,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) # draw the line(s) if st in (:path, :straightline) for (i, rng) in enumerate(segments) - gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i)) #, series[:linealpha]) + gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, clims, i)) #, series[:linealpha]) gr_set_transparency(get_linealpha(series, i)) arrowside = isa(series[:arrow], Arrow) ? series[:arrow].side : :none gr_polyline(x[rng], y[rng]; arrowside = arrowside) @@ -1129,7 +1126,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) lz = series[:line_z] segments = iter_segments(series) for (i, rng) in enumerate(segments) - gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i)) #, series[:linealpha]) + gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, clims, i)) #, series[:linealpha]) gr_set_transparency(get_linealpha(series, i)) GR.polyline3d(x[rng], y[rng], z[rng]) end @@ -1201,12 +1198,12 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) xseg, yseg = x[rng], y[rng] # draw the interior - gr_set_fill(get_fillcolor(series, i)) + gr_set_fill(get_fillcolor(series, clims, i)) gr_set_transparency(get_fillalpha(series, i)) GR.fillarea(xseg, yseg) # draw the shapes - gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i)) + gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, clims, i)) gr_set_transparency(get_linealpha(series, i)) GR.polyline(xseg, yseg) end @@ -1298,10 +1295,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) for series in series_list(sp) should_add_to_legend(series) || continue st = series[:seriestype] - gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series)) #, series[:linealpha]) + gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series, clims)) #, series[:linealpha]) if (st == :shape || series[:fillrange] != nothing) && series[:ribbon] == nothing - gr_set_fill(get_fillcolor(series)) #, series[:fillalpha]) + gr_set_fill(get_fillcolor(series, clims)) #, series[:fillalpha]) l, r = xpos-0.07, xpos-0.01 b, t = ypos-0.4dy, ypos+0.4dy x = [l, r, r, l, l] @@ -1309,7 +1306,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) gr_set_transparency(get_fillalpha(series)) gr_polyline(x, y, GR.fillarea) gr_set_transparency(get_linealpha(series)) - gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series)) + gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series, clims)) st == :shape && gr_polyline(x, y) end @@ -1323,7 +1320,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) end if series[:markershape] != :none - gr_draw_markers(series, xpos - .035, ypos, 6, nothing) + gr_draw_markers(series, xpos - .035, ypos, clims, 6) end if typeof(series[:label]) <: Array diff --git a/src/utils.jl b/src/utils.jl index e58bc1c6..ff15e7a8 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -619,18 +619,18 @@ end for comp in (:line, :fill, :marker) - compcolor = Symbol(comp, :color) + compcolor = string(comp, :color) get_compcolor = Symbol(:get_, compcolor) - comp_z = Symbol(comp, :_z) + comp_z = string(comp, :_z) - compalpha = Symbol(comp, :alpha) + compalpha = string(comp, :alpha) get_compalpha = Symbol(:get_, compalpha) @eval begin function $get_compcolor(series, cmin::Real, cmax::Real, i::Int = 1) - c = series[$Symbol(compcolor)] - z = series[$Symbol(comp_z)] + c = series[$Symbol($compcolor)] + z = series[$Symbol($comp_z)] if z == nothing isa(c, ColorGradient) ? c : plot_color(_cycle(c, i)) else @@ -639,17 +639,17 @@ for comp in (:line, :fill, :marker) end end - $get_compcolor(series, clims, i::Int = i) = $get_compcolor(series, clims[1], clims[2], i) + $get_compcolor(series, clims, i::Int = 1) = $get_compcolor(series, clims[1], clims[2], i) function $get_compcolor(series, i::Int = 1) - if series[$Symbol(comp_z)] == nothing + if series[$Symbol($comp_z)] == nothing $get_compcolor(series, 0, 1, i) else $get_compcolor(series, get_clims(series[:subplot]), i) end end - $get_compalpha(series, i::Int = 1) = _cycle(series[$compalpha], i) + $get_compalpha(series, i::Int = 1) = _cycle(series[$Symbol($compalpha)], i) end end From e1a83aab1df30c9b4cfb29ed29fbb9550ed22bc0 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 24 Aug 2018 18:13:47 +0200 Subject: [PATCH 3/4] implement plotly --- src/backends/plotly.jl | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl index 810a5e88..19788118 100644 --- a/src/backends/plotly.jl +++ b/src/backends/plotly.jl @@ -530,11 +530,14 @@ as_gradient(grad, α) = cgrad(alpha = α) # get a dictionary representing the series params (d is the Plots-dict, d_out is the Plotly-dict) function plotly_series(plt::Plot, series::Series) st = series[:seriestype] - if st == :shape - return plotly_series_shapes(plt, series) - end sp = series[:subplot] + clims = get_clims(sp) + + if st == :shape + return plotly_series_shapes(plt, series, clims) + end + d_out = KW() # these are the axes that the series should be mapped to @@ -564,14 +567,13 @@ function plotly_series(plt::Plot, series::Series) d_out[:colorbar] = KW(:title => sp[:colorbar_title]) - clims = sp[:clims] if is_2tuple(clims) d_out[:zmin], d_out[:zmax] = clims end # set the "type" if st in (:path, :scatter, :scattergl, :straightline, :path3d, :scatter3d) - return plotly_series_segments(series, d_out, x, y, z) + return plotly_series_segments(series, d_out, x, y, z, clims) elseif st == :heatmap x = heatmap_edges(x, sp[:xaxis][:scale]) @@ -643,7 +645,7 @@ function plotly_series(plt::Plot, series::Series) return [d_out] end -function plotly_series_shapes(plt::Plot, series::Series) +function plotly_series_shapes(plt::Plot, series::Series, clims) segments = iter_segments(series) d_outs = Vector{KW}(undef, length(segments)) @@ -673,11 +675,11 @@ function plotly_series_shapes(plt::Plot, series::Series) :x => vcat(x[rng], x[rng[1]]), :y => vcat(y[rng], y[rng[1]]), :fill => "tozeroy", - :fillcolor => rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i))), + :fillcolor => rgba_string(plot_color(get_fillcolor(series, clims, i), get_fillalpha(series, i))), )) if series[:markerstrokewidth] > 0 d_out[:line] = KW( - :color => rgba_string(plot_color(get_linecolor(series, i), get_linealpha(series, i))), + :color => rgba_string(plot_color(get_linecolor(series, clims, i), get_linealpha(series, i))), :width => get_linewidth(series, i), :dash => string(get_linestyle(series, i)), ) @@ -697,7 +699,7 @@ function plotly_series_shapes(plt::Plot, series::Series) d_outs end -function plotly_series_segments(series::Series, d_base::KW, x, y, z) +function plotly_series_segments(series::Series, d_base::KW, x, y, z, clims) st = series[:seriestype] sp = series[:subplot] isscatter = st in (:scatter, :scatter3d, :scattergl) @@ -726,10 +728,10 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z) end if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple) d_out[:fill] = "tozeroy" - d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i))) + d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, clims, i), get_fillalpha(series, i))) elseif typeof(series[:fillrange]) <: Union{AbstractVector{<:Real}, Real} d_out[:fill] = "tonexty" - d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i))) + d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, clims, i), get_fillalpha(series, i))) elseif !(series[:fillrange] in (false, nothing)) @warn("fillrange ignored... plotly only supports filling to zero and to a vector of values. fillrange: $(series[:fillrange])") end @@ -751,7 +753,7 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z) :symbol => get(_plotly_markers, _cycle(series[:markershape], i), string(_cycle(series[:markershape], i))), # :opacity => series[:markeralpha], :size => 2 * _cycle(series[:markersize], i), - :color => rgba_string(plot_color(get_markercolor(series, i), get_markeralpha(series, i))), + :color => rgba_string(plot_color(get_markercolor(series, clims, i), get_markeralpha(series, i))), :line => KW( :color => rgba_string(plot_color(get_markerstrokecolor(series, i), get_markerstrokealpha(series, i))), :width => _cycle(series[:markerstrokewidth], i), @@ -762,7 +764,7 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z) # add "line" if hasline d_out[:line] = KW( - :color => rgba_string(plot_color(get_linecolor(series, i), get_linealpha(series, i))), + :color => rgba_string(plot_color(get_linecolor(series, clims, i), get_linealpha(series, i))), :width => get_linewidth(series, i), :shape => if st == :steppre "vh" From a81178121f3152e5b374bf48e01a172956e041d3 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 24 Aug 2018 22:01:46 +0200 Subject: [PATCH 4/4] implement pyplot --- src/backends/pyplot.jl | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index d31a2b6e..5242e50c 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -436,12 +436,10 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) # handle zcolor and get c/cmap needs_colorbar = hascolorbar(sp) - extrakw = if needs_colorbar || is_2tuple(sp[:clims]) - vmin, vmax = get_clims(sp) - KW(:vmin => vmin, :vmax => vmax) - else - KW() - end + vmin, vmax = clims = get_clims(sp) + + # Dict to store extra kwargs + extrakw = KW(:vmin => vmin, :vmax => vmax) # holds references to any python object representing the matplotlib series handles = [] @@ -502,7 +500,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) handle = ax[:plot]((arg[rng] for arg in xyargs)...; label = i == 1 ? series[:label] : "", zorder = series[:series_plotindex], - color = py_color(get_linecolor(series, i), get_linealpha(series, i)), + color = py_color(get_linecolor(series, clims, i), get_linealpha(series, i)), linewidth = py_thickness_scale(plt, get_linewidth(series, i)), linestyle = py_linestyle(st, get_linestyle(series, i)), solid_capstyle = "round", @@ -544,7 +542,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) :scatter3d, :steppre, :steppost, :bar) markercolor = if any(typeof(series[arg]) <: AVec for arg in (:markercolor, :markeralpha)) || series[:marker_z] != nothing - py_color(plot_color.(get_markercolor.(series, eachindex(x)), get_markeralpha.(series, eachindex(x)))) + # py_color(plot_color.(get_markercolor.(series, clims, eachindex(x)), get_markeralpha.(series, eachindex(x)))) + [py_color(plot_color(get_markercolor(series, clims, i), get_markeralpha(series, i))) for i in eachindex(x)] else py_color(plot_color(series[:markercolor], series[:markeralpha])) end @@ -692,11 +691,6 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) elseif typeof(z) <: AbstractVector # tri-surface plot (http://matplotlib.org/mpl_toolkits/mplot3d/tutorial.html#tri-surface-plots) - clims = sp[:clims] - if is_2tuple(clims) - isfinite(clims[1]) && (extrakw[:vmin] = clims[1]) - isfinite(clims[2]) && (extrakw[:vmax] = clims[2]) - end handle = ax[:plot_trisurf](x, y, z; label = series[:label], zorder = series[:series_plotindex], @@ -767,8 +761,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) path; label = series[:label], zorder = series[:series_plotindex], - edgecolor = py_color(get_linecolor(series, i), get_linealpha(series, i)), - facecolor = py_color(get_fillcolor(series, i), get_fillalpha(series, i)), + edgecolor = py_color(get_linecolor(series, clims, i), get_linealpha(series, i)), + facecolor = py_color(get_fillcolor(series, clims, i), get_fillalpha(series, i)), linewidth = py_thickness_scale(plt, get_linewidth(series, i)), linestyle = py_linestyle(st, get_linestyle(series, i)), fill = true @@ -817,7 +811,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series) handle = ax[f](args..., trues(n), false, py_fillstepstyle(st); zorder = series[:series_plotindex], - facecolor = py_color(get_fillcolor(series, i), get_fillalpha(series, i)), + facecolor = py_color(get_fillcolor(series, clims, i), get_fillalpha(series, i)), linewidths = 0 ) push!(handles, handle) @@ -1227,6 +1221,7 @@ const _pyplot_legend_pos = KW( function py_add_legend(plt::Plot, sp::Subplot, ax) leg = sp[:legend] + clims = get_clims(sp) if leg != :none # gotta do this to ensure both axes are included labels = [] @@ -1236,19 +1231,19 @@ function py_add_legend(plt::Plot, sp::Subplot, ax) # add a line/marker and a label push!(handles, if series[:seriestype] == :shape || series[:fillrange] != nothing pypatches[:Patch]( - edgecolor = py_color(get_linecolor(series), get_linealpha(series)), - facecolor = py_color(get_fillcolor(series), get_fillalpha(series)), + edgecolor = py_color(get_linecolor(series, clims), get_linealpha(series)), + facecolor = py_color(get_fillcolor(series, clims), get_fillalpha(series)), linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)), linestyle = py_linestyle(series[:seriestype], get_linestyle(series)) ) elseif series[:seriestype] in (:path, :straightline) PyPlot.plt[:Line2D]((0,1),(0,0), - color = py_color(get_linecolor(series), get_linealpha(series)), + color = py_color(get_linecolor(series, clims), get_linealpha(series)), linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)), linestyle = py_linestyle(:path, get_linestyle(series)), marker = py_marker(series[:markershape]), markeredgecolor = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)), - markerfacecolor = series[:marker_z] == nothing ? py_color(get_markercolor(series), get_markeralpha(series)) : py_color(series[:markercolor][0.5]) + markerfacecolor = series[:marker_z] == nothing ? py_color(get_markercolor(series, clims), get_markeralpha(series)) : py_color(series[:markercolor][0.5]) ) else series[:serieshandle][1]