Skip to content

Commit 8798543

Browse files
committed
move some codes
1 parent 01b29ef commit 8798543

File tree

9 files changed

+59
-212
lines changed

9 files changed

+59
-212
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: ggtree
22
Type: Package
33
Title: an R package for visualization of tree and annotation data
4-
Version: 3.13.1
4+
Version: 3.13.2
55
Authors@R: c(
66
person("Guangchuang", "Yu", email = "guangchuangyu@gmail.com", role = c("aut", "cre", "cph"),
77
comment = c(ORCID = "0000-0002-6485-8781")),
@@ -31,7 +31,7 @@ Imports:
3131
methods,
3232
purrr,
3333
rlang,
34-
ggfun (>= 0.1.5),
34+
ggfun (>= 0.1.7),
3535
yulab.utils (>= 0.1.6),
3636
tidyr,
3737
tidytree (>= 0.4.5),

NAMESPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ importFrom(dplyr,select)
178178
importFrom(ggfun,"%<+%")
179179
importFrom(ggfun,get_aes_var)
180180
importFrom(ggfun,identify)
181+
importFrom(ggfun,td_filter)
182+
importFrom(ggfun,td_mutate)
183+
importFrom(ggfun,td_unnest)
181184
importFrom(ggplot2,Geom)
182185
importFrom(ggplot2,GeomLabel)
183186
importFrom(ggplot2,GeomPoint)

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
2323
-->
2424

25+
# ggtree 3.13.2
26+
27+
+ mv `td_filter()`, `td_unnest()` and `td_mutate()` to 'ggfun' package (2024-10-24, Thu)
28+
2529
# ggtree 3.13.1
2630

2731
+ layout argument can be a function to re-calculate the coord of nodes (2024-07-27, Sat, #622)

R/reexports.R

Lines changed: 46 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,71 @@
1-
##' @importFrom ggfun %<+%
2-
##' @export
3-
##' @examples
4-
##' nwk <- system.file("extdata", "sample.nwk", package="treeio")
5-
##' tree <- read.tree(nwk)
6-
##' p <- ggtree(tree)
7-
##' dd <- data.frame(taxa=LETTERS[1:13],
8-
##' place=c(rep("GZ", 5), rep("HK", 3), rep("CZ", 4), NA),
9-
##' value=round(abs(rnorm(13, mean=70, sd=10)), digits=1))
10-
##' row.names(dd) <- NULL
11-
##' p %<+% dd + geom_text(aes(color=place, label=label), hjust=-0.5)
1+
#' @importFrom ggfun %<+%
2+
#' @export
3+
#' @examples
4+
#' nwk <- system.file("extdata", "sample.nwk", package="treeio")
5+
#' tree <- read.tree(nwk)
6+
#' p <- ggtree(tree)
7+
#' dd <- data.frame(taxa=LETTERS[1:13],
8+
#' place=c(rep("GZ", 5), rep("HK", 3), rep("CZ", 4), NA),
9+
#' value=round(abs(rnorm(13, mean=70, sd=10)), digits=1))
10+
#' row.names(dd) <- NULL
11+
#' p %<+% dd + geom_text(aes(color=place, label=label), hjust=-0.5)
1212
ggfun::`%<+%`
1313

14-
##' @importFrom magrittr %>%
15-
##' @export
14+
#' @importFrom ggfun td_filter
15+
#' @export
16+
ggfun::td_filter
17+
18+
#' @importFrom ggfun td_mutate
19+
#' @export
20+
ggfun::td_mutate
21+
22+
#' @importFrom ggfun td_unnest
23+
#' @export
24+
ggfun::td_unnest
25+
26+
27+
#' @importFrom magrittr %>%
28+
#' @export
1629
magrittr::`%>%`
1730

18-
##' @importFrom ape rtree
19-
##' @export
31+
#' @importFrom ape rtree
32+
#' @export
2033
ape::rtree
2134

22-
##' @importFrom ape read.tree
23-
##' @export
35+
#' @importFrom ape read.tree
36+
#' @export
2437
ape::read.tree
2538

26-
##' @importFrom tidytree groupOTU
27-
##' @export
39+
#' @importFrom tidytree groupOTU
40+
#' @export
2841
tidytree::groupOTU
2942

30-
##' @importFrom tidytree groupClade
31-
##' @export
43+
#' @importFrom tidytree groupClade
44+
#' @export
3245
tidytree::groupClade
3346

34-
##' @importFrom tidytree nodeid
35-
##' @export
47+
#' @importFrom tidytree nodeid
48+
#' @export
3649
tidytree::nodeid
3750

38-
##' @importFrom tidytree nodelab
39-
##' @export
51+
#' @importFrom tidytree nodelab
52+
#' @export
4053
tidytree::nodelab
4154

42-
##' @importFrom tidytree MRCA
43-
##' @export
55+
#' @importFrom tidytree MRCA
56+
#' @export
4457
tidytree::MRCA
4558

46-
##' @importFrom dplyr collapse
47-
##' @export
59+
#' @importFrom dplyr collapse
60+
#' @export
4861
dplyr::collapse
4962

50-
##' @importFrom ggplot2 fortify
51-
##' @export
63+
#' @importFrom ggplot2 fortify
64+
#' @export
5265
ggplot2::fortify
5366

54-
##' @importFrom ggplot2 ggplot
55-
##' @export
67+
#' @importFrom ggplot2 ggplot
68+
#' @export
5669
ggplot2::ggplot
5770

5871
##' @importFrom ggplot2 xlim

R/treedata-function.R

Lines changed: 0 additions & 72 deletions
This file was deleted.

man/reexports.Rd

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/td_filter.Rd

Lines changed: 0 additions & 40 deletions
This file was deleted.

man/td_mutate.Rd

Lines changed: 0 additions & 27 deletions
This file was deleted.

man/td_unnest.Rd

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)