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

add proper pad for ticks

Browse Source
This commit is contained in:
Pietro Vertechi 2017-08-23 18:00:39 +01:00
parent 06115f25ba
commit 91158b1c20
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/backends/gr.jl
View File

@ -565,10 +565,19 @@ function gr_set_yticks_font(sp)
return flip, mirror return flip, mirror
end end
function gr_get_ticks_size(ticks, i)
l = 0.0
for (cv, dv) in zip(ticks...)
tb = gr_inqtext(0, 0, string(dv))[i]
tb_min, tb_max = extrema(tb)
l = max(l, tb_max - tb_min)
end
return l
end
function _update_min_padding!(sp::Subplot{GRBackend}) function _update_min_padding!(sp::Subplot{GRBackend})
# Add margin given by the user # Add margin given by the user
leftpad = 10mm + sp[:left_margin] leftpad = 2mm + sp[:left_margin]
toppad = 2mm + sp[:top_margin] toppad = 2mm + sp[:top_margin]
rightpad = 4mm + sp[:right_margin] rightpad = 4mm + sp[:right_margin]
bottompad = 2mm + sp[:bottom_margin] bottompad = 2mm + sp[:bottom_margin]
@ -576,21 +585,25 @@ function _update_min_padding!(sp::Subplot{GRBackend})
if sp[:title] != "" if sp[:title] != ""
toppad += 5mm toppad += 5mm
end end
# Add margin for x ticks # Add margin for x and y ticks
xticks = axis_drawing_info(sp)[1] xticks, yticks = axis_drawing_info(sp)[1:2]
if !(xticks in (nothing, false)) if !(xticks in (nothing, false))
gr_set_font(sp[:xaxis][:tickfont], flip, mirror = gr_set_xticks_font(sp)
halign = (:left, :hcenter, :right)[sign(sp[:xaxis][:rotation]) + 2], l = gr_get_ticks_size(xticks, 2)
valign = :top, if mirror
color = sp[:xaxis][:foreground_color_axis], toppad += 1mm + gr_plot_size[2] * l * px
rotation = sp[:xaxis][:rotation]) else
h = 0.0 bottompad += 1mm + gr_plot_size[2] * l * px
for (cv, dv) in zip(xticks...) end
tbx, tby = gr_inqtext(0, 0, string(dv)) end
tby_min, tby_max = extrema(tby) if !(yticks in (nothing, false))
h = max(h, tby_max - tby_min) flip, mirror = gr_set_yticks_font(sp)
l = gr_get_ticks_size(yticks, 1)
if mirror
rightpad += 1mm + gr_plot_size[1] * l * px
else
leftpad += 1mm + gr_plot_size[1] * l * px
end end
bottompad += 1mm + gr_plot_size[2] * h * px
end end
# Add margin for x label # Add margin for x label
if sp[:xaxis][:guide] != "" if sp[:xaxis][:guide] != ""