diff --git a/DESCRIPTION b/DESCRIPTION index 78d7af0..52511ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,24 +1,33 @@ -Package: forestmodel -Encoding: UTF-8 Type: Package +Package: forestmodel Title: Forest Plots from Regression Models Version: 0.6.3 Date: 2020-08-08 -Authors@R: c( - person("Nick", "Kennedy, email = "r@nick-kennedy.com", role = c("aut", "cre")), - person("Shixiang", "Wang", email = "w_shixiang@163.com", role = "aut")) +Authors@R: + c(person(given = "Nick", + family = "Kennedy", + role = c("aut", "cre"), + email = "r@nick-kennedy.com"), + person(given = "Shixiang", + family = "Wang", + role = "aut", + email = "w_shixiang@163.com")) Maintainer: Nick Kennedy -Description: Produces forest plots using 'ggplot2' from models produced by functions - such as stats::lm(), stats::glm() and survival::coxph(). +Description: Produces forest plots using 'ggplot2' from models produced by + functions such as stats::lm(), stats::glm() and survival::coxph(). License: GPL-2 -LazyData: TRUE -Depends: R (>= 3.3.0), - ggplot2 (>= 3.1.0) -Imports: dplyr (>= 0.8.0), +Depends: + ggplot2 (>= 3.1.0), + R (>= 3.3.0) +Imports: broom (>= 0.5.0), + dplyr (>= 0.8.0), rlang (>= 0.3.0), tibble (>= 1.4.2) -Suggests: survival, +Suggests: + labelled, metafor, - labelled + survival +Encoding: UTF-8 +LazyData: TRUE RoxygenNote: 7.1.1 diff --git a/R/forest_model.R b/R/forest_model.R index 682a86f..e2aa466 100644 --- a/R/forest_model.R +++ b/R/forest_model.R @@ -303,6 +303,7 @@ forest_model <- function(model, mutate(model_name = model_names[i]) }) %>% bind_rows() + forest_terms = forest_terms %>% mutate(model_name = factor(model_name, levels = unique(model_name))) if (merge_models) { forest_terms$model_name <- NULL } @@ -310,6 +311,8 @@ forest_model <- function(model, forest_terms <- make_forest_terms(model) } + forest_terms = forest_terms %>% mutate(term_label = factor(term_label, levels = unique(term_label))) + # #use_exp <- grepl("exp", deparse(trans)) if (!is.null(limits)) { forest_terms <- forest_terms %>%