Skip to content

Commit 62fd1dd

Browse files
committed
release 2.6.2 on CRAN
1 parent 88926f4 commit 62fd1dd

9 files changed

+17
-25
lines changed

DESCRIPTION

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Package: sjPlot
22
Type: Package
33
Encoding: UTF-8
44
Title: Data Visualization for Statistics in Social Science
5-
Version: 2.6.1.9000
6-
Date: 2018-10-14
5+
Version: 2.6.2
6+
Date: 2018-12-18
77
Authors@R: c(
88
person("Daniel", "Lüdecke", email = "d.luedecke@uke.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-8895-3206")),
99
person("Carsten", "Schwemmer", email = "carsten.schwemmer@uni-bamberg.de", role = "ctb")
@@ -46,7 +46,6 @@ Imports:
4646
sjstats (>= 0.17.2),
4747
tidyr (>= 0.7.0)
4848
Suggests:
49-
AICcmodavg,
5049
brms,
5150
car,
5251
cluster,

R/sjPlotAnova.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ sjp.aov1 <- function(var.dep,
7676
# --------------------------------------------------------
7777
# remove titles if empty
7878
# --------------------------------------------------------
79-
if (!is.null(axis.labels) && axis.labels == "") axis.labels <- NULL
80-
if (!is.null(axis.title) && axis.title == "") axis.title <- NULL
81-
if (!is.null(title) && title == "") title <- NULL
79+
if (!is.null(axis.labels) && length(axis.labels) == 1 && axis.labels == "") axis.labels <- NULL
80+
if (!is.null(axis.title) && length(axis.title) == 1 && axis.title == "") axis.title <- NULL
81+
if (!is.null(title) && length(title) == 1 && title == "") title <- NULL
8282
# --------------------------------------------------------
8383
# unlist labels
8484
# --------------------------------------------------------

R/sjPlotSetTheme.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ sj.setGeomColors <- function(plot,
560560
# ---------------------------------------------------------
561561
# check for themr options
562562
# ---------------------------------------------------------
563-
if (!is.null(geom.colors) && geom.colors == "themr") {
563+
if (!is.null(geom.colors) && geom.colors[1] == "themr") {
564564
return(plot)
565565
}
566566

R/sjTabSPSS.R

+1-9
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#' @param max.len Numeric, indicates how many values and value labels per variable
3939
#' are shown. Useful for variables with many different values, where the output
4040
#' can be truncated.
41-
#' @param verbose,hide.progress Logical, if \code{TRUE}, a progress bar is displayed
41+
#' @param verbose Logical, if \code{TRUE}, a progress bar is displayed
4242
#' while creating the output.
4343
#'
4444
#' @inheritParams tab_df
@@ -97,21 +97,13 @@ view_df <- function(x,
9797
max.len = 15,
9898
sort.by.name = FALSE,
9999
wrap.labels = 50,
100-
hide.progress = FALSE,
101100
verbose = TRUE,
102101
CSS = NULL,
103102
encoding = NULL,
104103
file = NULL,
105104
use.viewer = TRUE,
106105
remove.spaces = TRUE) {
107106

108-
## TODO remove hide.progress later
109-
110-
if (!missing(hide.progress)) {
111-
message("`hide.progress` is deprecated. Please use `verbose` instead.")
112-
verbose <- !hide.progress
113-
}
114-
115107
# check encoding
116108
encoding <- get.encoding(encoding, x)
117109

R/sjTabStackFrq.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ sjt.stackfrq <- function(items,
146146
value.labels <- sjlabelled::get_labels(
147147
items[[1]],
148148
attr.only = F,
149-
values = NULL,
149+
values = "n",
150150
non.labelled = T
151151
)
152152
}
@@ -165,7 +165,7 @@ sjt.stackfrq <- function(items,
165165
# ----------------------------
166166
if (is.null(value.labels)) value.labels <- as.character(minval:maxval)
167167
# check whether missings should be shown
168-
if (show.na) value.labels <- c(value.labels, string.na)
168+
if (show.na) value.labels <- c(value.labels, `NA` = string.na)
169169
# save amolunt of values
170170
catcount <- length(value.labels)
171171
# check length of x-axis-labels and split longer strings at into new lines

R/tab_model.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ tab_model <- function(
307307

308308
models <- list(...)
309309

310-
if (length(class(models[[1]]) == 1) && class(models[[1]]) == "list")
310+
if (length(class(models[[1]])) == 1 && class(models[[1]]) == "list")
311311
models <- lapply(models[[1]], function(x) x)
312312

313313
names(models) <- unlist(lapply(

R/tidiers.R

+2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ tidy_stan_model <- function(model, ci.lvl, tf, type, bpe, show.zeroinf, facets,
257257
dat <- dplyr::slice(dat, !! -resp.cor)
258258
}
259259

260+
# do transformation on posterior samples first,
261+
# then summarize (see https://discourse.mc-stan.org/t/monotonic-effects-in-non-gaussian-models/6353/5)
260262

261263
# need to transform point estimate as well
262264
if (!is.null(tf)) {

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Collection of plotting and table output functions for data visualization. Result
1111
To install the latest development snapshot (see latest changes below), type following commands into the R console:
1212

1313
```r
14-
library(githubinstall)
15-
githubinstall::githubinstall("sjPlot")
14+
library(devtools)
15+
devtools::install_github("sjPlot")
1616
```
1717

1818
Please note the package dependencies when installing from GitHub. The GitHub version of this package may depend on latest GitHub versions of my other packages, so you may need to install those first, if you encounter any problems. Here's the order for installing packages from GitHub:

man/view_df.Rd

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)