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

Merge pull request #720 from daschw/pull-request/f2235abf

Browse Source 
Added logic to choose *round* DateTime tick positions
This commit is contained in:
Tom Breloff 2017-03-15 12:14:12 -04:00 committed by GitHub
commit ea15f7746d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/axes.jl
View File

@ -156,6 +156,13 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
scale = axis[:scale] scale = axis[:scale]
sf = scalefunc(scale) sf = scalefunc(scale)
# If the axis input was a Date or DateTime use a special logic to find
# "round" Date(Time)s as ticks
# TODO: maybe: non-trivial scale (:ln, :log2, :log10) for date/datetime
if axis[:formatter] in (dateformatter, datetimeformatter) && ticks == nothing && scale == :identity
return optimize_datetime_ticks(amin, amax; k_min = 2, k_max = 4)
end
# get a list of well-laid-out ticks # get a list of well-laid-out ticks
scaled_ticks = if ticks == nothing scaled_ticks = if ticks == nothing
optimize_ticks( optimize_ticks(

7
src/recipes.jl
View File

@ -792,8 +792,11 @@ abline!(args...; kw...) = abline!(current(), args...; kw...)
# ------------------------------------------------- # -------------------------------------------------
# Dates # Dates
@recipe f(::Type{Date}, dt::Date) = (dt -> convert(Int,dt), dt -> string(convert(Date,dt))) dateformatter(dt) = string(convert(Date, convert(DateTime, dt)))
@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> convert(Int,dt), dt -> string(convert(DateTime,dt))) datetimeformatter(dt) = string(convert(DateTime, dt))
@recipe f(::Type{Date}, dt::Date) = (dt -> convert(Int, convert(DateTime, dt)), dateformatter)
@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> convert(Int,dt), datetimeformatter)
# ------------------------------------------------- # -------------------------------------------------
# Complex Numbers # Complex Numbers