Skip to content

Fix minor breaks for dates #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2012
Merged

Fix minor breaks for dates #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15bdb23
Proper minor breaks for dates
wch Jul 18, 2012
8b53576
Re-roxygenize
wch Jul 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ S3method(scale_break_info,discrete)
S3method(scale_breaks,continuous)
S3method(scale_breaks,discrete)
S3method(scale_breaks_minor,continuous)
S3method(scale_breaks_minor,date)
S3method(scale_breaks_minor,datetime)
S3method(scale_breaks_minor,discrete)
S3method(scale_clone,continuous)
S3method(scale_clone,discrete)
Expand Down
37 changes: 2 additions & 35 deletions R/scale-.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,9 @@ scale_breaks_minor.continuous <- function(scale, n = 2, b = scale_break_position
SIMPLIFY = FALSE)))
}
} else if (is.function(scale$minor_breaks)) {
# Find breaks in data space, and convert to numeric
breaks <- scale$minor_breaks(scale$trans$inv(limits))
breaks <- scale$trans$trans(breaks)
} else {
breaks <- scale$minor_breaks
}
Expand All @@ -425,41 +427,6 @@ scale_breaks_minor.continuous <- function(scale, n = 2, b = scale_break_position
discard(breaks, limits)
}

#' @S3method scale_breaks_minor date
scale_breaks_minor.date <- function(scale, n = 2, b =
scale_break_positions(scale), limits = scale_limits(scale)) {
limits <- scale$trans$inv(limits)

if (zero_range(as.numeric(limits))) {
return(NULL)
}

if (is.null(scale$minor_breaks)) {
return(NULL)
} else if (length(scale$minor_breaks) == 1 && !is.function(scale$minor_breaks) && is.na(scale$minor_breaks)) {
warning("minor_breaks = NA is deprecated. Please use minor_breaks = NULL to remove minor breaks in the scale.")
return(NULL)
} else if (is.waive(scale$minor_breaks)) {
b <- b[!is.na(b)]
if (length(b) < 2) return()

bd <- diff(b)[1]
if (min(limits) < min(b)) b <- c(b[1] - bd, b)
if (max(limits) > max(b)) b <- c(b, b[length(b)] + bd)
breaks <- unique(unlist(mapply(seq, b[-length(b)], b[-1], length=n+1,
SIMPLIFY = FALSE)))
} else if (is.function(scale$minor_breaks)) {
breaks <- scale$minor_breaks(scale$trans$inv(limits))
} else {
breaks <- scale$minor_breaks
}

# Any minor breaks outside the dimensions need to be thrown away
censor(breaks, scale_limits(scale))
}
#' @S3method scale_breaks_minor datetime
scale_breaks_minor.datetime <- scale_breaks_minor.date

#' @S3method scale_breaks_minor discrete
scale_breaks_minor.discrete <- function(...) NULL

Expand Down