diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 2ab89c5d..648e55be 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -1031,7 +1031,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_iterator) - gr_set_fillcolor(get_fillcolor(sp, series, i)) + gr_set_fillcolor(get_fillcolor(series, i)) fx = _cycle(x, vcat(rng, reverse(rng))) fy = vcat(_cycle(fr_from,rng), _cycle(fr_to,reverse(rng))) series[:fillalpha] != nothing && GR.settransparency(series[:fillalpha]) @@ -1042,7 +1042,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_iterator) - gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha]) + gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(series, i)) #, series[:linealpha]) arrowside = isa(series[:arrow], Arrow) ? series[:arrow].side : :none gr_polyline(x[rng], y[rng]; arrowside = arrowside) end @@ -1125,7 +1125,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) iter_segments(x, y, z) end for (i, rng) in enumerate(segments_iterator) - gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha]) + gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(series, i)) #, series[:linealpha]) GR.polyline3d(x[rng], y[rng], z[rng]) end end @@ -1196,11 +1196,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) xseg, yseg = x[rng], y[rng] # draw the interior - gr_set_fill(get_fillcolor(sp, series, i)) + gr_set_fill(get_fillcolor(series, i)) GR.fillarea(xseg, yseg) # draw the shapes - gr_set_line(series[:linewidth], :solid, get_linecolor(sp, series, i)) + gr_set_line(series[:linewidth], :solid, get_linecolor(series, i)) GR.polyline(xseg, yseg) end end @@ -1286,10 +1286,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(series[:linewidth], series[:linestyle], get_linecolor(sp, series)) #, series[:linealpha]) + gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(series)) #, series[:linealpha]) if (st == :shape || series[:fillrange] != nothing) && series[:ribbon] == nothing - gr_set_fill(get_fillcolor(sp, series)) #, series[:fillalpha]) + gr_set_fill(get_fillcolor(series)) #, series[:fillalpha]) l, r = xpos-0.07, xpos-0.01 b, t = ypos-0.4dy, ypos+0.4dy x = [l, r, r, l, l] diff --git a/src/utils.jl b/src/utils.jl index e8ded4ec..5ec52c4a 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -602,26 +602,26 @@ function hascolorbar(sp::Subplot) hascbar end -function get_linecolor(sp::Subplot, series::Series, i::Int = 1) +function get_linecolor(series::Series, i::Int = 1) lc = series[:linecolor] lz = series[:line_z] if lz == nothing isa(lc, ColorGradient) ? lc : _cycle(lc, i) else - cmin, cmax = get_clims(sp) + cmin, cmax = get_clims(series[:subplot]) grad = isa(lc, ColorGradient) ? lc : cgrad() grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)] end end -function get_fillcolor(sp::Subplot, series::Series, i::Int = 1) +function get_fillcolor(series::Series, i::Int = 1) fc = series[:fillcolor] fz = series[:fill_z] lz = series[:line_z] if fz == nothing && lz == nothing isa(fc, ColorGradient) ? fc : _cycle(fc, i) else - cmin, cmax = get_clims(sp) + cmin, cmax = get_clims(series[:subplot]) grad = isa(fc, ColorGradient) ? fc : cgrad() if fz != nothing grad[clamp((_cycle(fz, i) - cmin) / (cmax - cmin), 0, 1)]