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

avoid multiple calls to axis_drawing_info

Browse Source
This commit is contained in:
Daniel Schwabeneder 2019-11-20 19:09:37 +01:00
parent 4263ced69b
commit cb6f0772b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/gr.jl
View File

@ -749,7 +749,7 @@ end
function gr_xaxis_height(sp) function gr_xaxis_height(sp)
xaxis = sp[:xaxis] xaxis = sp[:xaxis]
xticks, yticks = axis_drawing_info(sp)[1:2] xticks, yticks = get_ticks(sp, xaxis), get_ticks(sp, sp[:yaxis])
gr_set_font(tickfont(xaxis)) gr_set_font(tickfont(xaxis))
h = (xticks in (nothing, false, :none) ? 0 : last(gr_get_ticks_size(xticks, xaxis[:rotation]))) h = (xticks in (nothing, false, :none) ? 0 : last(gr_get_ticks_size(xticks, xaxis[:rotation])))
if xaxis[:guide] != "" if xaxis[:guide] != ""
@ -761,7 +761,7 @@ end
function gr_yaxis_width(sp) function gr_yaxis_width(sp)
yaxis = sp[:yaxis] yaxis = sp[:yaxis]
xticks, yticks = axis_drawing_info(sp)[1:2] xticks, yticks = get_ticks(sp, sp[:xaxis]), get_ticks(sp, yaxis)
gr_set_font(tickfont(yaxis)) gr_set_font(tickfont(yaxis))
w = (xticks in (nothing, false, :none) ? 0 : first(gr_get_ticks_size(yticks, yaxis[:rotation]))) w = (xticks in (nothing, false, :none) ? 0 : first(gr_get_ticks_size(yticks, yaxis[:rotation])))
if yaxis[:guide] != "" if yaxis[:guide] != ""
@ -791,7 +791,7 @@ function _update_min_padding!(sp::Subplot{GRBackend})
toppad += h toppad += h
end end
# Add margin for x and y ticks # Add margin for x and y ticks
xticks, yticks = axis_drawing_info(sp)[1:2] xticks, yticks = get_ticks(sp, sp[:xaxis]), get_ticks(sp, sp[:yaxis])
if !(xticks in (nothing, false, :none)) if !(xticks in (nothing, false, :none))
flip, mirror = gr_set_xticks_font(sp) flip, mirror = gr_set_xticks_font(sp)
l = 0.01 + last(gr_get_ticks_size(xticks, sp[:xaxis][:rotation])) l = 0.01 + last(gr_get_ticks_size(xticks, sp[:xaxis][:rotation]))
@ -1182,7 +1182,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
gr_set_font(guidefont(xaxis)) gr_set_font(guidefont(xaxis))
GR.titles3d(xaxis[:guide], yaxis[:guide], zaxis[:guide]) GR.titles3d(xaxis[:guide], yaxis[:guide], zaxis[:guide])
else else
xticks, yticks = axis_drawing_info(sp)[1:2] xticks, yticks = get_ticks(sp, sp[:xaxis]), get_ticks(sp, sp[:yaxis])
if xaxis[:guide] != "" if xaxis[:guide] != ""
h = 0.01 + gr_xaxis_height(sp) h = 0.01 + gr_xaxis_height(sp)
gr_set_font(guidefont(xaxis)) gr_set_font(guidefont(xaxis))