From 93d16a27c1cb67e7305360429cea15b80eb3f4dc Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Sun, 30 Apr 2017 19:27:01 +0200 Subject: [PATCH] undo unnecessary changes --- src/axes.jl | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/axes.jl b/src/axes.jl index 9dfa18a9..276d7374 100644 --- a/src/axes.jl +++ b/src/axes.jl @@ -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)