Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions R/geom_gene.R
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ makeContent.genetree <- function(x) {
cds_data <- data %>% filter(.data$type == "CDS")
if (nrow(cds_data) > 0) {
cds_exons <- cds_data %>%
dplyr::group_by(id) %>%
dplyr::group_by(.data$id) %>%
dplyr::summarize(
dplyr::across(c(-.data$x, -.data$xend, -.data$y), first),
exons = list(exon_polys(.data$x, .data$xend, .data$y, height, arrow_width, arrow_height))
Expand All @@ -269,7 +269,7 @@ makeContent.genetree <- function(x) {
rna_data <- data %>% filter(.data$type != "CDS")
if (nrow(rna_data) > 0) {
rna_exons <- rna_data %>%
dplyr::group_by(id) %>%
dplyr::group_by(.data$id) %>%
dplyr::summarize(
dplyr::across(c(-.data$x, -.data$xend, -.data$y), first),
exons = list(exon_polys(.data$x, .data$xend, .data$y, rna_height, rna_arrow_width, rna_arrow_height))
Expand All @@ -290,7 +290,7 @@ makeContent.genetree <- function(x) {
dplyr::group_by(.data$group) %>%
# remove CDS if group has mRNA
dplyr::filter(.data$type != (if ("mRNA" %in% .data$type) "CDS" else "!bogus")) %>%
dplyr::group_by(id) %>%
dplyr::group_by(.data$id) %>%
dplyr::filter(n() > 1) %>%
dplyr::summarize(
dplyr::across(c(-.data$x, -.data$xend, -.data$y), first),
Expand Down
6 changes: 3 additions & 3 deletions R/position_strandpile.R
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ PositionStrandpile <- ggproto("PositionStrandpile", Position,
} else if (params$grouped) { # i.e. multi-exon as one unit
# not pretty, but works for now
data_grouped <- data %>%
dplyr::group_by(y, group) %>%
dplyr::group_by(.data$y, .data$group) %>%
dplyr::summarize(
start = min(x, xend) + 1, end = max(x, xend), is_reverse = ifelse(params$strandwise,
xor(min(x) > max(xend), params$flip), params$flip
)
)

data_grouped <- data_grouped %>%
dplyr::group_by(y, is_reverse) %>%
dplyr::group_by(.data$y, .data$is_reverse) %>%
dplyr::mutate(yoff = (params$base + params$offset *
stack_pos(start, end, params$gap)) *
ifelse(is_reverse, -1, 1)) %>%
Expand All @@ -146,7 +146,7 @@ PositionStrandpile <- ggproto("PositionStrandpile", Position,
start = pmin(x, xend) + 1, end = pmax(x, xend),
is_reverse = if (params$strandwise) xor(x > xend, params$flip) else params$flip
) %>%
dplyr::group_by(y, is_reverse) %>%
dplyr::group_by(.data$y, .data$is_reverse) %>%
dplyr::mutate(yoff = (params$base + params$offset *
stack_pos(start, end, params$gap)) *
ifelse(is_reverse, -1, 1)) %>%
Expand Down
2 changes: 1 addition & 1 deletion R/read.R
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ filter_def_formats <- function(ff, format = NULL, context = NULL, parser = NULL)
if (!is.null(context)) {
# context=NA defines fallback parser which is always last in arrange
ff <- ff %>%
dplyr::group_by(format) %>%
dplyr::group_by(.data$format) %>%
dplyr::filter(context %in% !!context | is.na(context)) %>%
dplyr::arrange(context, .by_group = TRUE) %>%
slice_head(n = 1)
Expand Down
8 changes: 5 additions & 3 deletions man/geom_feat.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions man/geom_feat_text.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 18 additions & 16 deletions man/geom_gene.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions man/geom_link.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions man/geom_seq_break.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/geom_variant.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions man/geom_wiggle.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.