Merge 8eec77b784a827968d30856b6b91cf23ab750906 into 76c84c7615fd5fc614d1d83e02edfab2d342ea8a

This commit is contained in:
Josef Heinen 2016-06-06 15:05:19 +00:00
commit ca6a9c0891

View File

@ -268,16 +268,16 @@ end
# using the axis extrema and limit overrides, return the min/max value for this axis # using the axis extrema and limit overrides, return the min/max value for this axis
gr_x_axislims(sp::Subplot) = axis_limits(sp.attr[:xaxis], true) gr_x_axislims(sp::Subplot) = axis_limits(sp.attr[:xaxis], false)
gr_y_axislims(sp::Subplot) = axis_limits(sp.attr[:yaxis], true) gr_y_axislims(sp::Subplot) = axis_limits(sp.attr[:yaxis], false)
gr_z_axislims(sp::Subplot) = axis_limits(sp.attr[:zaxis], true) gr_z_axislims(sp::Subplot) = axis_limits(sp.attr[:zaxis], false)
gr_xy_axislims(sp::Subplot) = gr_x_axislims(sp)..., gr_y_axislims(sp)... gr_xy_axislims(sp::Subplot) = gr_x_axislims(sp)..., gr_y_axislims(sp)...
function gr_lims(axis::Axis, adjust::Bool, expand = nothing) function gr_lims(axis::Axis, adjust::Bool, expand = nothing)
if expand != nothing if expand != nothing
expand_extrema!(axis, expand) expand_extrema!(axis, expand)
end end
lims = axis_limits(axis, true) lims = axis_limits(axis, false)
if adjust if adjust
GR.adjustrange(lims...) GR.adjustrange(lims...)
else else