option for setting phylopic width

GuangchuangYu · Dec 5, 2019 · 39882da · 39882da
1 parent aec9e2f
commit 39882da
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 34 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ggimage
 Title: Use Image in 'ggplot2'
-Version: 0.2.5
+Version: 0.2.6
 Authors@R: person("Guangchuang", "Yu",
                   email = "guangchuangyu@gmail.com",
                   role = c("aut", "cre"),
@@ -34,5 +34,5 @@ URL: https://github.com/GuangchuangYu/ggimage
 BugReports: https://github.com/GuangchuangYu/ggimage/issues
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 Roxygen: list(markdown = TRUE)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+
+## ggimage 0.2.6
+
++ change default image width to 256 for phylopic and it can be set to other values by e.g. `options(phylopic_width=512)` (2019-12-05, Thu)
+  - <https://github.com/YuLab-SMU/treedata-book/issues/1>
+
 ## ggimage 0.2.5
 
 + `phylopic_uid` now return a data.frame (2019-11-29, Fri)

diff --git a/R/geom_image.R b/R/geom_image.R
@@ -1,6 +1,6 @@
-geom_ggtree_image <- function() {
+## geom_ggtree_image <- function() {
 
-}
+## }
 
 
 ##' geom layer for visualizing image files

diff --git a/R/geom_phylopic.R b/R/geom_phylopic.R
@@ -3,18 +3,20 @@
 ##'
 ##' @title geom_phylopic
 ##' @inheritParams geom_pokemon
-##' @param height size (by height) of phylopic image to be used
 ##' @return ggplot2 layer
 ##' @export
 ##' @author Guangchuang Yu
 geom_phylopic <- function(mapping=NULL, data=NULL, inherit.aes=TRUE,
-                       na.rm=FALSE, by="width", height = 512, ...) {
-    geom_image(mapping, data, inherit.aes=inherit.aes, na.rm=na.rm, ..., height = height, .fun = phylopic)
+                       na.rm=FALSE, by="width", ...) {
+    geom_image(mapping, data, inherit.aes=inherit.aes, na.rm=na.rm, ..., .fun = phylopic)
 }
 
 
-phylopic <- function(id, height=512) {
-    paste0("http://phylopic.org/assets/images/submissions/", id, ".", height, ".png")
+phylopic <- function(id) {
+    width <- getOption("phylopic_width")
+    if (is.null(width))
+        width <- 256
+    paste0("http://phylopic.org/assets/images/submissions/", id, ".", width, ".png")
 }
 
 phylopic_valid_id <- function(id) {

diff --git a/inst/extdata/bulb.png b/inst/extdata/bulb.png
diff --git a/man/geom_emoji.Rd b/man/geom_emoji.Rd
diff --git a/man/geom_flag.Rd b/man/geom_flag.Rd
diff --git a/man/geom_icon.Rd b/man/geom_icon.Rd
diff --git a/man/geom_image.Rd b/man/geom_image.Rd
diff --git a/man/geom_phylopic.Rd b/man/geom_phylopic.Rd
diff --git a/man/geom_pokemon.Rd b/man/geom_pokemon.Rd
diff --git a/man/geom_subview.Rd b/man/geom_subview.Rd
diff --git a/man/geom_twitchemote.Rd b/man/geom_twitchemote.Rd
diff --git a/man/geom_worldcup2018.Rd b/man/geom_worldcup2018.Rd
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/vignettes/ggimage.Rmd b/vignettes/ggimage.Rmd
@@ -36,11 +36,11 @@ library("ggplot2")
 library("ggimage")
 
 set.seed(2017-02-21)
+img <- list.files(system.file("extdata", package="ggimage"),
+                  pattern="png", full.names=TRUE)
 d <- data.frame(x = rnorm(10),
                 y = rnorm(10),
-                image = sample(c("https://www.r-project.org/logo/Rlogo.png",
-                                 "https://jeroenooms.github.io/images/frink.png"),
-                               size=10, replace = TRUE)
+                image = sample(img, size=10, replace = TRUE)
                 )
 
 ggplot(d, aes(x, y)) + geom_image(aes(image=image), size=.05)