gr: corrected alignment of rotated axes labels

This commit is contained in:
Josef Heinen 2017-02-14 09:55:46 +01:00
parent 471b09bd6c
commit eb7534d319

View File

@ -33,7 +33,7 @@ const _gr_attr = merge_with_base_supported([
:arrow, :arrow,
]) ])
const _gr_seriestype = [ const _gr_seriestype = [
:path, :scatter, :hexbin, :path, :scatter,
:heatmap, :pie, :image, :heatmap, :pie, :image,
:contour, :path3d, :scatter3d, :surface, :wireframe, :contour, :path3d, :scatter3d, :surface, :wireframe,
:shape :shape
@ -653,6 +653,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
flip = sp[:yaxis][:flip] flip = sp[:yaxis][:flip]
mirror = sp[:xaxis][:mirror] mirror = sp[:xaxis][:mirror]
gr_set_font(sp[:xaxis][:tickfont], gr_set_font(sp[:xaxis][:tickfont],
halign = (:left, :hcenter, :right)[sign(sp[:xaxis][:rotation]) + 2],
valign = (mirror ? :bottom : :top), valign = (mirror ? :bottom : :top),
color = sp[:xaxis][:foreground_color_axis], color = sp[:xaxis][:foreground_color_axis],
rotation = sp[:xaxis][:rotation]) rotation = sp[:xaxis][:rotation])
@ -670,6 +671,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
mirror = sp[:yaxis][:mirror] mirror = sp[:yaxis][:mirror]
gr_set_font(sp[:yaxis][:tickfont], gr_set_font(sp[:yaxis][:tickfont],
halign = (mirror ? :left : :right), halign = (mirror ? :left : :right),
valign = (:top, :vcenter, :bottom)[sign(sp[:yaxis][:rotation]) + 2],
color = sp[:yaxis][:foreground_color_axis], color = sp[:yaxis][:foreground_color_axis],
rotation = sp[:yaxis][:rotation]) rotation = sp[:yaxis][:rotation])
for (cv, dv) in zip(yticks...) for (cv, dv) in zip(yticks...)
@ -798,9 +800,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
gr_draw_markers(series, x, y) gr_draw_markers(series, x, y)
end end
elseif st == :hexbin
GR.hexbin(x, y, nbins = series[:bins])
elseif st == :contour elseif st == :contour
zmin, zmax = gr_lims(zaxis, false) zmin, zmax = gr_lims(zaxis, false)
clims = sp[:clims] clims = sp[:clims]