Skip to content

Commit 470f3f1

Browse files
prepare to release fix pending CRAN notes refresh docs
1 parent 318dba6 commit 470f3f1

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

Figure_8_4.png

-11 KB
Binary file not shown.

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ export(forest_plot)
77
export(get_sample_data)
88
export(run_interactiveforestplot)
99
import(data.table, except = c(last,between,first))
10+
importFrom(colourpicker,colourInput)

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* added and exported `expand_modelframe` function
77
* added the possibility to select the shapes manually via `interval_shape` and `bsv_shape`
88
* added capability for user to reverse color legend separately via `legend_color_reverse`
9-
* added capability for user to specify text for legend titles via `interval_legend_title` and `shape_legend_title` as well as to control text size via `legend_title_size`
10-
* added capability for user to specify facet text color via `x_facet_text_col` and `y_facet_text_col`
9+
* added capability for user to specify text for legend titles via `interval_legend_title` and `shape_legend_title` as well as to control legend title text size via `legend_title_size`
10+
* added capability for user to specify facet text color via `x_facet_text_col` and `y_facet_text_col` for improved theming support
1111
* added possibility to add different ref line(s)/area(s) by parameter via
1212
`ref_value_by_panel` and `ref_value_by_panel_data` function arguments (not in the shiny, app)
1313

R/forest_plot.R

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#' @importFrom colourpicker colourInput
2+
# ' @importFrom ggplot2 translate_shape_string not yet
3+
14
# Same as base R `which()` function, but return 0 instead of an empty vector
25
# if there are no TRUE values in the array
36
which0 <- function(x) {
@@ -290,7 +293,7 @@ label_wrap <- function(width) {
290293
#' ref_value_by_panel_data = as.data.frame(
291294
#' plotdata %>%
292295
#' distinct(paramname2,covname) %>%
293-
#' mutate(xintercept=ifelse(paramname2=="CMAX",1,1.2))))
296+
#' dplyr::mutate(xintercept=ifelse(paramname2=="CMAX",1,1.2))))
294297
#'
295298
#' # Example 3
296299
#'
@@ -314,7 +317,7 @@ label_wrap <- function(width) {
314317
#' # Example 4
315318
#' plotdata <- get_sample_data("dataforest.csv")
316319
#' plotdata <- plotdata %>%
317-
#' mutate(midlabel = format(round(mid,2), nsmall = 2),
320+
#' dplyr::mutate(midlabel = format(round(mid,2), nsmall = 2),
318321
#' lowerlabel = format(round(lower,2), nsmall = 2),
319322
#' upperlabel = format(round(upper,2), nsmall = 2),
320323
#' LABEL = paste0(midlabel, " [", lowerlabel, "-", upperlabel, "]"))
@@ -684,8 +687,8 @@ forest_plot <- function(
684687
inherit.aes = FALSE,
685688
)+
686689
ggplot2::geom_ribbon(
687-
data = ref_value_by_panel_data %>%
688-
mutate(x= xintercept,
690+
data = cbind(as.data.frame(ref_value_by_panel_data),
691+
x = ref_value_by_panel_data$xintercept,
689692
ymax = Inf,
690693
ymin = -Inf,
691694
fill = area_legend_text),
@@ -1240,5 +1243,3 @@ draw_key_pointrangeh <- function(data, params, size) {
12401243
)
12411244
}
12421245

1243-
# ' @importFrom colourpicker colourInput
1244-
# ' @importFrom ggplot2 translate_shape_string

coveffectsplot_full.png

-17.7 KB
Binary file not shown.

man/forest_plot.Rd

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

0 commit comments

Comments
 (0)