widen further; added zorder to pyplot annotations

This commit is contained in:
Thomas Breloff 2016-06-07 12:38:35 -04:00
parent 1b6bfa1259
commit d0209d945d
2 changed files with 7 additions and 4 deletions

View File

@ -201,7 +201,8 @@ end
# push the limits out slightly # push the limits out slightly
function widen(lmin, lmax) function widen(lmin, lmax)
span = lmax - lmin span = lmax - lmin
eps = max(1e-16, min(1e-2span, 1e-10)) # eps = max(1e-16, min(1e-2span, 1e-10))
eps = max(1e-16, 0.03span)
lmin-eps, lmax+eps lmin-eps, lmax+eps
end end

View File

@ -472,7 +472,8 @@ function _series_added(plt::Plot{PyPlotBackend}, series::Series)
ax[:annotate]("", ax[:annotate]("",
xytext = (0.001xyprev[1] + 0.999xy[1], 0.001xyprev[2] + 0.999xy[2]), xytext = (0.001xyprev[1] + 0.999xy[1], 0.001xyprev[2] + 0.999xy[2]),
xy = xy, xy = xy,
arrowprops = arrowprops arrowprops = arrowprops,
zorder = 999
) )
end end
end end
@ -1046,7 +1047,7 @@ end
function createPyPlotAnnotationObject(sp::Subplot{PyPlotBackend}, x, y, val) function createPyPlotAnnotationObject(sp::Subplot{PyPlotBackend}, x, y, val)
ax = sp.o ax = sp.o
ax[:annotate](val, xy = (x,y)) ax[:annotate](val, xy = (x,y), zorder = 999)
end end
@ -1059,7 +1060,8 @@ function createPyPlotAnnotationObject(sp::Subplot{PyPlotBackend}, x, y, val::Plo
horizontalalignment = val.font.halign == :hcenter ? "center" : string(val.font.halign), horizontalalignment = val.font.halign == :hcenter ? "center" : string(val.font.halign),
verticalalignment = val.font.valign == :vcenter ? "center" : string(val.font.valign), verticalalignment = val.font.valign == :vcenter ? "center" : string(val.font.valign),
rotation = val.font.rotation * 180 / π, rotation = val.font.rotation * 180 / π,
size = val.font.pointsize size = val.font.pointsize,
zorder = 999
) )
end end