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

Merge pull request #1184 from daschw/gr-box-flip

Browse Source 
fix combination of box framestyle and flip on gr
This commit is contained in:
Daniel Schwabeneder 2017-10-17 09:23:47 +02:00 committed by GitHub
commit d6748792e9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/axes.jl
View File

@ -522,19 +522,19 @@ function axis_drawing_info(sp::Subplot)
# xaxis # xaxis
if xaxis[:showaxis] if xaxis[:showaxis]
if sp[:framestyle] != :grid if sp[:framestyle] != :grid
yval = if sp[:framestyle] in (:origin, :zerolines) y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
0.0 0.0, 0.0
else else
xor(xaxis[:mirror], yaxis[:flip]) ? ymax : ymin xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
end end
push!(xaxis_segs, (xmin, yval), (xmax, yval)) push!(xaxis_segs, (xmin, y1), (xmax, y1))
# don't show the 0 tick label for the origin framestyle # don't show the 0 tick label for the origin framestyle
if sp[:framestyle] == :origin && length(xticks) > 1 if sp[:framestyle] == :origin && length(xticks) > 1
showticks = xticks[1] .!= 0 showticks = xticks[1] .!= 0
xticks = (xticks[1][showticks], xticks[2][showticks]) xticks = (xticks[1][showticks], xticks[2][showticks])
end end
end end
sp[:framestyle] in (:semi, :box) && push!(xborder_segs, (xmin,ymax), (xmax,ymax)) # top spine sp[:framestyle] in (:semi, :box) && push!(xborder_segs, (xmin, y2), (xmax, y2)) # top spine
end end
if !(xaxis[:ticks] in (nothing, false)) if !(xaxis[:ticks] in (nothing, false))
f = scalefunc(yaxis[:scale]) f = scalefunc(yaxis[:scale])
@ -561,19 +561,19 @@ function axis_drawing_info(sp::Subplot)
# yaxis # yaxis
if yaxis[:showaxis] if yaxis[:showaxis]
if sp[:framestyle] != :grid if sp[:framestyle] != :grid
xval = if sp[:framestyle] in (:origin, :zerolines) x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
0.0 0.0, 0.0
else else
xor(yaxis[:mirror], xaxis[:flip]) ? xmax : xmin xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, xmin) : (xmin, xmax)
end end
push!(yaxis_segs, (xval, ymin), (xval, ymax)) push!(yaxis_segs, (x1, ymin), (x1, ymax))
# don't show the 0 tick label for the origin framestyle # don't show the 0 tick label for the origin framestyle
if sp[:framestyle] == :origin && length(yticks) > 1 if sp[:framestyle] == :origin && length(yticks) > 1
showticks = yticks[1] .!= 0 showticks = yticks[1] .!= 0
yticks = (yticks[1][showticks], yticks[2][showticks]) yticks = (yticks[1][showticks], yticks[2][showticks])
end end
end end
sp[:framestyle] in (:semi, :box) && push!(yborder_segs, (xmax,ymin), (xmax,ymax)) # right spine sp[:framestyle] in (:semi, :box) && push!(yborder_segs, (x2, ymin), (x2, ymax)) # right spine
end end
if !(yaxis[:ticks] in (nothing, false)) if !(yaxis[:ticks] in (nothing, false))
f = scalefunc(xaxis[:scale]) f = scalefunc(xaxis[:scale])