From 7e008374f998b903a909bffba2ed5f343e1c0a14 Mon Sep 17 00:00:00 2001 From: Adeel Khan Date: Tue, 21 Aug 2018 22:09:09 -0400 Subject: [PATCH] Bump to 0.17 --- DESCRIPTION | 4 ++-- README.md | 4 ++-- cran-comments.md | 3 +-- .../shinyapps.io/adeelk93/collapsibletree.dcf | 4 ++-- man/collapsibleTree.Rd | 23 +++++++++++-------- man/collapsibleTreeNetwork.Rd | 5 ++-- man/collapsibleTreeSummary.Rd | 7 +++--- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 46b315a..3a3f203 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: collapsibleTree Type: Package Title: Interactive Collapsible Tree Diagrams using 'D3.js' -Version: 0.1.6 +Version: 0.1.7 Authors@R: c( person("Adeel", "Khan", email = "AdeelK@gwu.edu", role = c("aut", "cre")), person("Dhrumin", "Shah", role = "ctb"), @@ -25,7 +25,7 @@ Imports: methods Enhances: knitr, shiny LazyData: true -RoxygenNote: 6.0.1 +RoxygenNote: 6.1.0 Suggests: colorspace, RColorBrewer, diff --git a/README.md b/README.md index 190b44a..82ff0ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# collapsibleTree 0.1.6 +# collapsibleTree 0.1.7 [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/collapsibleTree)](https://cran.r-project.org/package=collapsibleTree) [![CRAN @@ -192,7 +192,7 @@ feature suggestions\! Would love to hear your comments. ``` r library(collapsibleTree) date() -#> [1] "Sat May 5 12:35:21 2018" +#> [1] "Tue Aug 21 22:07:51 2018" testthat::test_dir("tests/testthat", reporter = testthat::SummaryReporter) #> Error handling: ......... diff --git a/cran-comments.md b/cran-comments.md index 033792f..d7cecd4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,5 @@ ## Test environments -* OS X 10.12.3, R 3.4.1 -* Ubuntu 16.04.2, R 3.3.3 +* OS X 10.13.6, R 3.5.0 ## R CMD check results diff --git a/docs/Shiny/rsconnect/shinyapps.io/adeelk93/collapsibletree.dcf b/docs/Shiny/rsconnect/shinyapps.io/adeelk93/collapsibletree.dcf index bb59996..a84f3b8 100644 --- a/docs/Shiny/rsconnect/shinyapps.io/adeelk93/collapsibletree.dcf +++ b/docs/Shiny/rsconnect/shinyapps.io/adeelk93/collapsibletree.dcf @@ -5,8 +5,8 @@ account: adeelk93 server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 164943 -bundleId: 994001 +bundleId: 1359491 url: https://adeelk93.shinyapps.io/collapsibletree/ -when: 1506186854.57586 +when: 1525669121.51449 asMultiple: FALSE asStatic: FALSE diff --git a/man/collapsibleTree.Rd b/man/collapsibleTree.Rd index 469f3e2..be543ad 100644 --- a/man/collapsibleTree.Rd +++ b/man/collapsibleTree.Rd @@ -14,20 +14,23 @@ d3noob: \url{https://bl.ocks.org/d3noob/43a860bc0024792f8803bba8ca0d5ecd}. \usage{ collapsibleTree(df, ..., inputId = NULL, attribute = "leafCount", aggFun = sum, fill = "lightsteelblue", linkLength = NULL, - fontSize = 10, tooltip = FALSE, tooltipHtml = NULL, nodeSize = NULL, - collapsed = TRUE, zoomable = TRUE, width = NULL, height = NULL) + fontSize = 10, tooltip = FALSE, tooltipHtml = NULL, + nodeSize = NULL, collapsed = TRUE, zoomable = TRUE, width = NULL, + height = NULL) \method{collapsibleTree}{data.frame}(df, hierarchy, - root = deparse(substitute(df)), inputId = NULL, attribute = "leafCount", - aggFun = sum, fill = "lightsteelblue", fillByLevel = TRUE, - linkLength = NULL, fontSize = 10, tooltip = FALSE, nodeSize = NULL, - collapsed = TRUE, zoomable = TRUE, width = NULL, height = NULL, ...) + root = deparse(substitute(df)), inputId = NULL, + attribute = "leafCount", aggFun = sum, fill = "lightsteelblue", + fillByLevel = TRUE, linkLength = NULL, fontSize = 10, + tooltip = FALSE, nodeSize = NULL, collapsed = TRUE, + zoomable = TRUE, width = NULL, height = NULL, ...) \method{collapsibleTree}{Node}(df, hierarchy_attribute = "level", - root = df$name, inputId = NULL, attribute = "leafCount", aggFun = sum, - fill = "lightsteelblue", linkLength = NULL, fontSize = 10, - tooltip = FALSE, tooltipHtml = NULL, nodeSize = NULL, - collapsed = TRUE, zoomable = TRUE, width = NULL, height = NULL, ...) + root = df$name, inputId = NULL, attribute = "leafCount", + aggFun = sum, fill = "lightsteelblue", linkLength = NULL, + fontSize = 10, tooltip = FALSE, tooltipHtml = NULL, + nodeSize = NULL, collapsed = TRUE, zoomable = TRUE, width = NULL, + height = NULL, ...) } \arguments{ \item{df}{a \code{data.frame} from which to construct a nested list diff --git a/man/collapsibleTreeNetwork.Rd b/man/collapsibleTreeNetwork.Rd index dac2983..767f24f 100644 --- a/man/collapsibleTreeNetwork.Rd +++ b/man/collapsibleTreeNetwork.Rd @@ -11,8 +11,9 @@ d3noob: \url{https://bl.ocks.org/d3noob/43a860bc0024792f8803bba8ca0d5ecd}. \usage{ collapsibleTreeNetwork(df, inputId = NULL, attribute = "leafCount", aggFun = sum, fill = "lightsteelblue", linkLength = NULL, - fontSize = 10, tooltip = TRUE, tooltipHtml = NULL, nodeSize = NULL, - collapsed = TRUE, zoomable = TRUE, width = NULL, height = NULL) + fontSize = 10, tooltip = TRUE, tooltipHtml = NULL, + nodeSize = NULL, collapsed = TRUE, zoomable = TRUE, width = NULL, + height = NULL) } \arguments{ \item{df}{a network data frame (where every row is a node) diff --git a/man/collapsibleTreeSummary.Rd b/man/collapsibleTreeSummary.Rd index 81023ba..6100e99 100644 --- a/man/collapsibleTreeSummary.Rd +++ b/man/collapsibleTreeSummary.Rd @@ -10,9 +10,10 @@ d3noob: \url{https://bl.ocks.org/d3noob/43a860bc0024792f8803bba8ca0d5ecd}. } \usage{ collapsibleTreeSummary(df, hierarchy, root = deparse(substitute(df)), - inputId = NULL, attribute = "leafCount", fillFun = colorspace::heat_hcl, - maxPercent = 25, percentOfParent = FALSE, linkLength = NULL, - fontSize = 10, tooltip = TRUE, nodeSize = NULL, collapsed = TRUE, + inputId = NULL, attribute = "leafCount", + fillFun = colorspace::heat_hcl, maxPercent = 25, + percentOfParent = FALSE, linkLength = NULL, fontSize = 10, + tooltip = TRUE, nodeSize = NULL, collapsed = TRUE, zoomable = TRUE, width = NULL, height = NULL, ...) } \arguments{