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

Merge pull request #2178 from daschw/pgfplots-vline

Browse Source 
Only expand infinite object data for Plotly(JS) backends
This commit is contained in:
Daniel Schwabeneder 2019-09-09 14:37:13 +02:00 committed by GitHub
commit 6c68b6f6fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/plotly.jl
View File

@ -469,7 +469,7 @@ function plotly_series(plt::Plot, series::Series)
plotattributes_out[:showlegend] = should_add_to_legend(series) plotattributes_out[:showlegend] = should_add_to_legend(series)
if st == :straightline if st == :straightline
x, y = straightline_data(series) x, y = straightline_data(series, 100)
z = series[:z] z = series[:z]
else else
x, y, z = series[:x], series[:y], series[:z] x, y, z = series[:x], series[:y], series[:z]
@ -584,7 +584,7 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
) )
x, y = (plotly_data(series, letter, data) x, y = (plotly_data(series, letter, data)
for (letter, data) in zip((:x, :y), shape_data(series)) for (letter, data) in zip((:x, :y), shape_data(series, 100))
) )
for (i,rng) in enumerate(segments) for (i,rng) in enumerate(segments)

23
src/utils.jl
View File

@ -1114,20 +1114,20 @@ function convert_sci_unicode(label::AbstractString)
label label
end end
function straightline_data(series) function straightline_data(series, expansion_factor = 1)
sp = series[:subplot] sp = series[:subplot]
xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp)) xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
x, y = series[:x], series[:y] x, y = series[:x], series[:y]
n = length(x) n = length(x)
if n == 2 if n == 2
return straightline_data(xl, yl, x, y) return straightline_data(xl, yl, x, y, expansion_factor)
else else
k, r = divrem(n, 3) k, r = divrem(n, 3)
if r == 0 if r == 0
xdata, ydata = fill(NaN, n), fill(NaN, n) xdata, ydata = fill(NaN, n), fill(NaN, n)
for i in 1:k for i in 1:k
inds = (3 * i - 2):(3 * i - 1) inds = (3 * i - 2):(3 * i - 1)
xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds]) xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds], expansion_factor)
end end
return xdata, ydata return xdata, ydata
else else
@ -1136,7 +1136,7 @@ function straightline_data(series)
end end
end end
function straightline_data(xl, yl, x, y) function straightline_data(xl, yl, x, y, expansion_factor = 1)
x_vals, y_vals = if y[1] == y[2] x_vals, y_vals = if y[1] == y[2]
if x[1] == x[2] if x[1] == x[2]
error("Two identical points cannot be used to describe a straight line.") error("Two identical points cannot be used to describe a straight line.")
@ -1157,29 +1157,28 @@ function straightline_data(xl, yl, x, y)
end end
# expand the data outside the axis limits, by a certain factor too improve # expand the data outside the axis limits, by a certain factor too improve
# plotly(js) and interactive behaviour # plotly(js) and interactive behaviour
factor = 100 x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* expansion_factor .* [-1, 1]
x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* factor .* [-1, 1] y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* expansion_factor .* [-1, 1]
y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* factor .* [-1, 1]
return x_vals, y_vals return x_vals, y_vals
end end
function shape_data(series) function shape_data(series, expansion_factor = 1)
sp = series[:subplot] sp = series[:subplot]
xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp)) xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
x, y = series[:x], series[:y] x, y = series[:x], series[:y]
factor = 100 factor = 100
for i in eachindex(x) for i in eachindex(x)
if x[i] == -Inf if x[i] == -Inf
x[i] = xl[1] - factor * (xl[2] - xl[1]) x[i] = xl[1] - expansion_factor * (xl[2] - xl[1])
elseif x[i] == Inf elseif x[i] == Inf
x[i] = xl[2] + factor * (xl[2] - xl[1]) x[i] = xl[2] + expansion_factor * (xl[2] - xl[1])
end end
end end
for i in eachindex(y) for i in eachindex(y)
if y[i] == -Inf if y[i] == -Inf
y[i] = yl[1] - factor * (yl[2] - yl[1]) y[i] = yl[1] - expansion_factor * (yl[2] - yl[1])
elseif y[i] == Inf elseif y[i] == Inf
y[i] = yl[2] + factor * (yl[2] - yl[1]) y[i] = yl[2] + expansion_factor * (yl[2] - yl[1])
end end
end end
return x, y return x, y