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

undo unnecessary changes

Browse Source
This commit is contained in:
Daniel Schwabeneder 2017-04-30 19:27:01 +02:00
parent a602309a02
commit 93d16a27c1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/axes.jl
View File

@ -187,26 +187,21 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
sf(amax);
k_min = 5, # minimum number of ticks
k_max = 8, # maximum number of ticks
)[1], sf(amin), sf(amax)
)[1]
elseif typeof(ticks) <: Int
scaled_ticks, viewmin, viewmax = optimize_ticks(
sf(amin),
sf(amax);
# TODO: find a better configuration to return the chosen number
# of ticks
k_min = ticks, # minimum number of ticks
k_max = ticks, # maximum number of ticks
k_ideal = ticks,
# k_min = ticks + 1, # minimum number of ticks
# k_max = ticks + 2, # maximum number of ticks
# k_ideal = ticks + 2,
# `strict_span = false` rewards cases where the span of the
# chosen ticks is not too much bigger than amin - amax:
strict_span = false,
)
axis[:lims] = map(invscalefunc(scale), (viewmin, viewmax))
else
scaled_ticks = map(sf, (filter(t -> amin <= t <= amax, ticks), amin, amax))
scaled_ticks = map(sf, (filter(t -> amin <= t <= amax, ticks)))
end
unscaled_ticks = map(invscalefunc(scale), scaled_ticks)
@ -503,10 +498,10 @@ end
# compute the line segments which should be drawn for this axis
function axis_drawing_info(sp::Subplot)
xaxis, yaxis = sp[:xaxis], sp[:yaxis]
xticks = get_ticks(xaxis)
yticks = get_ticks(yaxis)
xmin, xmax = axis_limits(xaxis)
ymin, ymax = axis_limits(yaxis)
xticks = get_ticks(xaxis)
yticks = get_ticks(yaxis)
spine_segs = Segments(2)
grid_segs = Segments(2)