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

minor preparations for guides

Browse Source
This commit is contained in:
Daniel Schwabeneder 2019-12-11 17:31:05 +01:00
parent 0d09975fba
commit 58bf14fc85
1 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/backends/gr.jl
View File

@ -589,13 +589,13 @@ function gr_legend_pos(sp::Subplot, w, h)
if occursin("right", str) if occursin("right", str)
if occursin("outer", str) if occursin("outer", str)
# As per https://github.com/jheinen/GR.jl/blob/master/src/jlgr.jl#L525 # As per https://github.com/jheinen/GR.jl/blob/master/src/jlgr.jl#L525
xpos = viewport_plotarea[2] + 0.11 + ymirror * gr_yaxis_width(sp) xpos = viewport_plotarea[2] + 0.11 + ymirror * gr_axis_width(sp, sp[:yaxis])
else else
xpos = viewport_plotarea[2] - 0.05 - w xpos = viewport_plotarea[2] - 0.05 - w
end end
elseif occursin("left", str) elseif occursin("left", str)
if occursin("outer", str) if occursin("outer", str)
xpos = viewport_plotarea[1] - 0.05 - w - !ymirror * gr_yaxis_width(sp) xpos = viewport_plotarea[1] - 0.05 - w - !ymirror * gr_axis_width(sp, sp[:yaxis])
else else
xpos = viewport_plotarea[1] + 0.11 xpos = viewport_plotarea[1] + 0.11
end end
@ -604,13 +604,13 @@ function gr_legend_pos(sp::Subplot, w, h)
end end
if occursin("top", str) if occursin("top", str)
if s == :outertop if s == :outertop
ypos = viewport_plotarea[4] + 0.02 + h + xmirror * gr_xaxis_height(sp) ypos = viewport_plotarea[4] + 0.02 + h + xmirror * gr_axis_height(sp, sp[:xaxis])
else else
ypos = viewport_plotarea[4] - 0.06 ypos = viewport_plotarea[4] - 0.06
end end
elseif occursin("bottom", str) elseif occursin("bottom", str)
if s == :outerbottom if s == :outerbottom
ypos = viewport_plotarea[3] - 0.05 - !xmirror * gr_xaxis_height(sp) ypos = viewport_plotarea[3] - 0.05 - !xmirror * gr_axis_height(sp, sp[:xaxis])
else else
ypos = viewport_plotarea[3] + h + 0.06 ypos = viewport_plotarea[3] + h + 0.06
end end
@ -769,26 +769,24 @@ function gr_get_ticks_size(ticks, rot)
return w, h return w, h
end end
function gr_xaxis_height(sp) function gr_axis_height(sp, axis)
xaxis = sp[:xaxis] ticks = get_ticks(sp, axis)
xticks, yticks = get_ticks(sp, xaxis), get_ticks(sp, sp[:yaxis]) gr_set_font(tickfont(axis))
gr_set_font(tickfont(xaxis)) h = (ticks in (nothing, false, :none) ? 0 : last(gr_get_ticks_size(ticks, axis[:rotation])))
h = (xticks in (nothing, false, :none) ? 0 : last(gr_get_ticks_size(xticks, xaxis[:rotation]))) if axis[:guide] != ""
if xaxis[:guide] != "" gr_set_font(guidefont(axis))
gr_set_font(guidefont(xaxis)) h += last(gr_text_size(axis[:guide]))
h += last(gr_text_size(xaxis[:guide]))
end end
return h return h
end end
function gr_yaxis_width(sp) function gr_axis_width(sp, axis)
yaxis = sp[:yaxis] ticks = get_ticks(sp, axis)
xticks, yticks = get_ticks(sp, sp[:xaxis]), get_ticks(sp, yaxis) gr_set_font(tickfont(axis))
gr_set_font(tickfont(yaxis)) w = (ticks in (nothing, false, :none) ? 0 : first(gr_get_ticks_size(ticks, axis[:rotation])))
w = (xticks in (nothing, false, :none) ? 0 : first(gr_get_ticks_size(yticks, yaxis[:rotation]))) if axis[:guide] != ""
if yaxis[:guide] != "" gr_set_font(guidefont(axis))
gr_set_font(guidefont(yaxis)) w += last(gr_text_size(axis[:guide]))
w += last(gr_text_size(yaxis[:guide]))
end end
return w return w
end end
@ -1107,8 +1105,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
GR.setclip(1) GR.setclip(1)
# TODO: tick labels
# tick marks # tick marks
if !(xticks in (:none, nothing, false)) && xaxis[:showaxis] if !(xticks in (:none, nothing, false)) && xaxis[:showaxis]
# x labels # x labels
@ -1135,18 +1131,17 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
for (cv, dv) in zip(xticks...) for (cv, dv) in zip(xticks...)
xi, yi, zi = GR.wc3towc(cv, yt, zt) xi, yi, zi = GR.wc3towc(cv, yt, zt)
xi, yi = GR.wctondc(xi, yi) xi, yi = GR.wctondc(xi, yi)
@show xi, yi
if xaxis[:ticks] in (:auto, :native) if xaxis[:ticks] in (:auto, :native)
# ensure correct dispatch in gr_text for automatic log ticks if xaxis[:formatter] in (:scientific, :auto)
if xaxis[:scale] in _logScales # ensure correct dispatch in gr_text for automatic log ticks
dv = string(dv, "\\ ") if xaxis[:scale] in _logScales
elseif xaxis[:formatter] in (:scientific, :auto) dv = string(dv, "\\ ")
end
dv = convert_sci_unicode(dv) dv = convert_sci_unicode(dv)
end end
end end
xi += (yaxis[:mirror] ? 1 : -1) * 1e-2 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0) xi += (yaxis[:mirror] ? 1 : -1) * 1e-2 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
yi += (xaxis[:mirror] ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0) yi += (xaxis[:mirror] ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
@show xi, yi
gr_text(xi, yi, string(dv)) gr_text(xi, yi, string(dv))
end end
end end
@ -1177,10 +1172,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
xi, yi, zi = GR.wc3towc(xt, cv, zt) xi, yi, zi = GR.wc3towc(xt, cv, zt)
xi, yi = GR.wctondc(xi, yi) xi, yi = GR.wctondc(xi, yi)
if yaxis[:ticks] in (:auto, :native) if yaxis[:ticks] in (:auto, :native)
# ensure correct dispatch in gr_text for automatic log ticks if xaxis[:formatter] in (:scientific, :auto)
if yaxis[:scale] in _logScales # ensure correct dispatch in gr_text for automatic log ticks
dv = string(dv, "\\ ") if yaxis[:scale] in _logScales
elseif xaxis[:formatter] in (:scientific, :auto) dv = string(dv, "\\ ")
end
dv = convert_sci_unicode(dv) dv = convert_sci_unicode(dv)
end end
end end
@ -1214,10 +1210,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
xi, yi, zi = GR.wc3towc(xt, yt, cv) xi, yi, zi = GR.wc3towc(xt, yt, cv)
xi, yi = GR.wctondc(xi, yi) xi, yi = GR.wctondc(xi, yi)
if zaxis[:ticks] in (:auto, :native) if zaxis[:ticks] in (:auto, :native)
# ensure correct dispatch in gr_text for automatic log ticks if zaxis[:formatter] in (:scientific, :auto)
if zaxis[:scale] in _logScales # ensure correct dispatch in gr_text for automatic log ticks
dv = string(dv, "\\ ") if zaxis[:scale] in _logScales
elseif zaxis[:formatter] in (:scientific, :auto) dv = string(dv, "\\ ")
end
dv = convert_sci_unicode(dv) dv = convert_sci_unicode(dv)
end end
end end
@ -1389,9 +1386,8 @@ 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 = 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_axis_height(sp, xaxis)
gr_set_font(guidefont(xaxis)) gr_set_font(guidefont(xaxis))
if xaxis[:guide_position] == :top || (xaxis[:guide_position] == :auto && xaxis[:mirror] == true) if xaxis[:guide_position] == :top || (xaxis[:guide_position] == :auto && xaxis[:mirror] == true)
GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
@ -1403,7 +1399,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
if yaxis[:guide] != "" if yaxis[:guide] != ""
w = 0.02 + gr_yaxis_width(sp) w = 0.02 + gr_axis_width(sp, yaxis)
gr_set_font(guidefont(yaxis)) gr_set_font(guidefont(yaxis))
GR.setcharup(-1, 0) GR.setcharup(-1, 0)
if yaxis[:guide_position] == :right || (yaxis[:guide_position] == :auto && yaxis[:mirror] == true) if yaxis[:guide_position] == :right || (yaxis[:guide_position] == :auto && yaxis[:mirror] == true)