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

Remove ylims default setting for bar and histogram plots

Browse Source 
Setting `ylims -> ...` doesn't play well with multiple series and cannot
be properly overridden by user.
This commit is contained in:
Oliver Schulz 2017-05-15 23:26:30 +02:00
parent 598211c349
commit 746f96cdcd
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/recipes.jl
View File

@ -323,7 +323,7 @@ end
# create a bar plot as a filled step function # create a bar plot as a filled step function
@recipe function f(::Type{Val{:bar}}, x, y, z) @recipe function f(::Type{Val{:bar}}, x, y, z)
procx, procy, xscale, yscale, baseline, wautolims = _preprocess_barlike(d, x, y) procx, procy, xscale, yscale, baseline = _preprocess_barlike(d, x, y)
nx, ny = length(procx), length(procy) nx, ny = length(procx), length(procy)
axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis] axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis]
cv = [discrete_value!(axis, xi)[1] for xi=procx] cv = [discrete_value!(axis, xi)[1] for xi=procx]
@ -380,7 +380,6 @@ end
x := xseg.pts x := xseg.pts
y := yseg.pts y := yseg.pts
seriestype := :shape seriestype := :shape
ylims --> wautolims
() ()
end end
@deps bar shape @deps bar shape
@ -412,41 +411,20 @@ function _binbarlike_baseline{T<:Real}(min_value::T, scale::Symbol)
end end
end end
function _binbarlike_autolims{T<:Real}(min_value::T, max_value::T, scale::Symbol)
lo = if (scale in _logScales)
_binbarlike_baseline(min_value, scale)
else
min(min_value * T(1.1), zero(T))
end::T
hi = if !isnan(max_value)
if (scale in _logScales)
max_value * T(_logScaleBases[scale]^log10(2))
else
max(max_value * T(1.1), zero(T))
end
else
one(T)
end::T
(lo, hi)
end
function _preprocess_binbarlike_weights{T<:AbstractFloat}(::Type{T}, w, wscale::Symbol) function _preprocess_binbarlike_weights{T<:AbstractFloat}(::Type{T}, w, wscale::Symbol)
w_adj = _scale_adjusted_values(T, w, wscale) w_adj = _scale_adjusted_values(T, w, wscale)
w_min = minimum(w_adj) w_min = minimum(w_adj)
w_max = maximum(w_adj) w_max = maximum(w_adj)
baseline = _binbarlike_baseline(w_min, wscale) baseline = _binbarlike_baseline(w_min, wscale)
autolims = _binbarlike_autolims(w_min, w_max,wscale) w_adj, baseline
w_adj, baseline, autolims
end end
function _preprocess_barlike(d, x, y) function _preprocess_barlike(d, x, y)
xscale = get(d, :xscale, :identity) xscale = get(d, :xscale, :identity)
yscale = get(d, :yscale, :identity) yscale = get(d, :yscale, :identity)
weights, baseline, wautolims = _preprocess_binbarlike_weights(float(eltype(y)), y, yscale) weights, baseline = _preprocess_binbarlike_weights(float(eltype(y)), y, yscale)
x, weights, xscale, yscale, baseline, wautolims x, weights, xscale, yscale, baseline
end end
function _preprocess_binlike(d, x, y) function _preprocess_binlike(d, x, y)
@ -454,13 +432,13 @@ function _preprocess_binlike(d, x, y)
yscale = get(d, :yscale, :identity) yscale = get(d, :yscale, :identity)
T = float(promote_type(eltype(x), eltype(y))) T = float(promote_type(eltype(x), eltype(y)))
edge = T.(x) edge = T.(x)
weights, baseline, wautolims = _preprocess_binbarlike_weights(T, y, yscale) weights, baseline = _preprocess_binbarlike_weights(T, y, yscale)
edge, weights, xscale, yscale, baseline, wautolims edge, weights, xscale, yscale, baseline
end end
@recipe function f(::Type{Val{:barbins}}, x, y, z) @recipe function f(::Type{Val{:barbins}}, x, y, z)
edge, weights, xscale, yscale, baseline, wautolims = _preprocess_binlike(d, x, y) edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, x, y)
if (d[:bar_width] == nothing) if (d[:bar_width] == nothing)
bar_width := diff(edge) bar_width := diff(edge)
end end
@ -473,7 +451,7 @@ end
@recipe function f(::Type{Val{:scatterbins}}, x, y, z) @recipe function f(::Type{Val{:scatterbins}}, x, y, z)
edge, weights, xscale, yscale, baseline, wautolims = _preprocess_binlike(d, x, y) edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, x, y)
xerror := diff(edge)/2 xerror := diff(edge)/2
x := _bin_centers(edge) x := _bin_centers(edge)
y := weights y := weights
@ -538,7 +516,7 @@ end
@recipe function f(::Type{Val{:stepbins}}, x, y, z) @recipe function f(::Type{Val{:stepbins}}, x, y, z)
axis = d[:subplot][Plots.isvertical(d) ? :xaxis : :yaxis] axis = d[:subplot][Plots.isvertical(d) ? :xaxis : :yaxis]
edge, weights, xscale, yscale, baseline, wautolims = _preprocess_binlike(d, x, y) edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, x, y)
xpts, ypts = _stepbins_path(edge, weights, baseline, xscale, yscale) xpts, ypts = _stepbins_path(edge, weights, baseline, xscale, yscale)
if !isvertical(d) if !isvertical(d)
@ -564,8 +542,6 @@ end
x := xpts x := xpts
y := ypts y := ypts
seriestype := :path seriestype := :path
ylims --> wautolims
() ()
end end
Plots.@deps stepbins path Plots.@deps stepbins path
@ -668,7 +644,7 @@ end
if d[:seriestype] == :scatterbins if d[:seriestype] == :scatterbins
# Workaround, error bars currently not set correctly by scatterbins # Workaround, error bars currently not set correctly by scatterbins
edge, weights, xscale, yscale, baseline, wautolims = _preprocess_binlike(d, h.edges[1], h.weights) edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, h.edges[1], h.weights)
xerror --> diff(h.edges[1])/2 xerror --> diff(h.edges[1])/2
seriestype := :scatter seriestype := :scatter
(Plots._bin_centers(edge), weights) (Plots._bin_centers(edge), weights)