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

simplify major / minor grid segments (#3586)

Browse Source 
Co-authored-by: t-bltg <t-bltg@users.noreply.github.com>
This commit is contained in:
t-bltg 2021-06-25 21:10:35 +02:00 committed by GitHub
parent d657c0cb33
commit 7b0066c433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/axes.jl
View File

@ -703,61 +703,46 @@ function axis_drawing_info(sp, letter)
) )
end end
end end
if !(ax[:ticks] in (:none, nothing, false)) if ax[:ticks] ∉ (:none, nothing, false)
f = RecipesPipeline.scale_func(oax[:scale]) f = RecipesPipeline.scale_func(oax[:scale])
invf = RecipesPipeline.inverse_scale_func(oax[:scale]) invf = RecipesPipeline.inverse_scale_func(oax[:scale])
if ax[:tick_direction] !== :none
add_major_or_minor_segments(ticks, grid, segments, factor, cond) = begin
if cond
tick_start, tick_stop = if sp[:framestyle] == :origin tick_start, tick_stop = if sp[:framestyle] == :origin
t = invf(f(0) + 0.012 * (f(oamax) - f(oamin))) t = invf(f(0) + factor * (f(oamax) - f(oamin)))
(-t, t) (-t, t)
else else
ticks_in = ax[:tick_direction] == :out ? -1 : 1 ticks_in = ax[:tick_direction] == :out ? -1 : 1
t = invf(f(oa1) + 0.012 * (f(oa2) - f(oa1)) * ticks_in) t = invf(f(oa1) + factor * (f(oa2) - f(oa1)) * ticks_in)
(oa1, t) (oa1, t)
end end
end end
for tick in ticks[1] for tick in ticks
if ax[:showaxis] && ax[:tick_direction] !== :none if ax[:showaxis] && cond
push!( push!(
tick_segments, tick_segments,
reverse_if((tick, tick_start), isy), reverse_if((tick, tick_start), isy),
reverse_if((tick, tick_stop), isy), reverse_if((tick, tick_stop), isy),
) )
end end
if ax[:grid] if grid
push!( push!(
grid_segments, segments,
reverse_if((tick, oamin), isy), reverse_if((tick, oamin), isy),
reverse_if((tick, oamax), isy), reverse_if((tick, oamax), isy),
) )
end end
end end
end
if !(ax[:minorticks] in (:none, nothing, false)) || ax[:minorgrid] # add major grid segments
tick_start, tick_stop = if sp[:framestyle] == :origin add_major_or_minor_segments(ticks[1], ax[:grid], grid_segments, 0.012, ax[:tick_direction] !== :none)
t = invf(f(0) + 0.006 * (f(oamax) - f(oamin)))
(-t, t) # add minor grid segments
else if ax[:minorticks] ∉ (:none, nothing, false) || ax[:minorgrid]
t = invf(f(oa1) + 0.006 * (f(oa2) - f(oa1)) * ticks_in) add_major_or_minor_segments(minor_ticks, ax[:minorgrid], minorgrid_segments, 0.006, true)
(oa1, t)
end
for tick in minor_ticks
if ax[:showaxis]
push!(
tick_segments,
reverse_if((tick, tick_start), isy),
reverse_if((tick, tick_stop), isy),
)
end
if ax[:minorgrid]
push!(
minorgrid_segments,
reverse_if((tick, oamin), isy),
reverse_if((tick, oamax), isy),
)
end
end
end end
end end
end end
@ -841,73 +826,53 @@ function axis_drawing_info_3d(sp, letter)
) )
end end
end end
# TODO this can be simplified, we do almost the same thing twice for grid and minorgrid
if !(ax[:ticks] in (:none, nothing, false)) if ax[:ticks] ∉ (:none, nothing, false)
f = RecipesPipeline.scale_func(nax[:scale]) f = RecipesPipeline.scale_func(nax[:scale])
invf = RecipesPipeline.inverse_scale_func(nax[:scale]) invf = RecipesPipeline.inverse_scale_func(nax[:scale])
if ax[:tick_direction] !== :none ga0, ga1 = sp[:framestyle] in (:origin, :zerolines) ? (namin, namax) : (na0, na1)
add_major_or_minor_segments(ticks, grid, segments, factor, cond) = begin
if cond
tick_start, tick_stop = if sp[:framestyle] == :origin tick_start, tick_stop = if sp[:framestyle] == :origin
t = invf(f(0) + 0.012 * (f(namax) - f(namin))) t = invf(f(0) + factor * (f(namax) - f(namin)))
(-t, t) (-t, t)
else else
ticks_in = ax[:tick_direction] == :out ? -1 : 1 ticks_in = ax[:tick_direction] == :out ? -1 : 1
t = invf(f(na0) + 0.012 * (f(na1) - f(na0)) * ticks_in) t = invf(f(na0) + factor * (f(na1) - f(na0)) * ticks_in)
(na0, t) (na0, t)
end end
end end
ga0, ga1 = sp[:framestyle] in (:origin, :zerolines) ? (namin, namax) : (na0, na1) for tick in ticks
for tick in ticks[1] if ax[:showaxis] && cond
if ax[:showaxis] && ax[:tick_direction] !== :none
push!( push!(
tick_segments, tick_segments,
sort_3d_axes(tick, tick_start, fa0, letter), sort_3d_axes(tick, tick_start, fa0, letter),
sort_3d_axes(tick, tick_stop, fa0, letter), sort_3d_axes(tick, tick_stop, fa0, letter),
) )
end end
if ax[:grid] if grid
push!( push!(
grid_segments, segments,
sort_3d_axes(tick, ga0, fa0, letter), sort_3d_axes(tick, ga0, fa0, letter),
sort_3d_axes(tick, ga1, fa0, letter), sort_3d_axes(tick, ga1, fa0, letter),
) )
push!( push!(
grid_segments, segments,
sort_3d_axes(tick, ga1, fa0, letter), sort_3d_axes(tick, ga1, fa0, letter),
sort_3d_axes(tick, ga1, fa1, letter), sort_3d_axes(tick, ga1, fa1, letter),
) )
end end
end end
end
if !(ax[:minorticks] in (:none, nothing, false)) || ax[:minorgrid] # add major grid segments
tick_start, tick_stop = if sp[:framestyle] == :origin add_major_or_minor_segments(ticks[1], ax[:grid], grid_segments, 0.012, ax[:tick_direction] !== :none)
t = invf(f(0) + 0.006 * (f(namax) - f(namin)))
(-t, t) # add minor grid segments
else if ax[:minorticks] ∉ (:none, nothing, false) || ax[:minorgrid]
t = invf(f(na0) + 0.006 * (f(na1) - f(na0)) * ticks_in) add_major_or_minor_segments(minor_ticks, ax[:minorgrid], minorgrid_segments, 0.006, true)
(na0, t)
end
for tick in minor_ticks
if ax[:showaxis] && ax[:tick_direction] !== :none
push!(
tick_segments,
sort_3d_axes(tick, tick_start, fa0, letter),
sort_3d_axes(tick, tick_stop, fa0, letter),
)
end
if ax[:minorgrid]
push!(
minorgrid_segments,
sort_3d_axes(tick, ga0, fa0, letter),
sort_3d_axes(tick, ga1, fa0, letter),
)
push!(
minorgrid_segments,
sort_3d_axes(tick, ga1, fa0, letter),
sort_3d_axes(tick, ga1, fa1, letter),
)
end
end
end end
end end
end end