Skip to content

Commit 5646942

Browse files
update geom_diatom_code
1 parent 93aed90 commit 5646942

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

.Rhistory

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,23 @@ devtools::load_all()
447447
devtools::check()
448448
devtools::check()
449449
devtools::install_github("junqueiragaabi/DiatoViz")
450-
library(DiatoViz)
451-
teste <- DiatoViz::valid_diatom_code()
452-
View(teste)
453-
teste
454-
lenth(teste)
455-
lenght(teste)
456-
length(teste)
457-
DiatoViz::diatom_species
458-
a <- DiatoViz::diatom_species
459-
View(a)
450+
usethis::use_logo("logo.png")
451+
devtools::load_all()
452+
devtools::check()
453+
usethis::use_pkgdown()
454+
pkgdown::build_site()
455+
View(diatom_species)
456+
devtools::load_all()
457+
devtools::check()
458+
pkgdown::build_site()
459+
usethis::use_vignette()
460+
use_pkgdown(config_file = "_pkgdown.yml", destdir = "docs")
461+
usethis::use_pkgdown(config_file = "_pkgdown.yml", destdir = "docs")
462+
usethis::use_pkgdown_github_pages()
463+
usethis::use_pkgdown_github_pages()
464+
cite("DiatoViz")
465+
citation("DiatoViz")
466+
citation("DiatoViz")
467+
devtools::load_all()
468+
citation("DiatoViz")
469+
citation()

R/geom_diatom_code.R

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,17 @@ GeomDIATOM <- ggplot2::ggproto(
6666
),
6767
draw_panel = function(data, panel_params, coord, na.rm = FALSE) {
6868

69-
diatom_code <- clean_diatom_code(as.character(data$diatom_code), keep_non_matches = FALSE)
69+
data <- coord$transform(data, panel_params)
7070

71-
data$path <- shape_from_diatom(diatom_code)
71+
data$diatom_code <- clean_diatom_code(as.character(data$diatom_code), keep_non_matches = FALSE)
7272

73-
ggpath::GeomFromPath$draw_panel(
74-
data = data,
75-
panel_params = panel_params,
76-
coord = coord,
77-
na.rm = na.rm
78-
)
73+
grobs <- lapply(seq_along(data$diatom_code), ggpath::build_grobs, alpha = data$alpha, colour = data$colour, data = data)
74+
75+
class(grobs) <- "gList"
76+
77+
grid::gTree(children = grobs)
7978
},
8079
draw_key = function(...) grid::nullGrob()
8180
)
81+
82+

0 commit comments

Comments
 (0)