update WIP

sbalci · Dec 24, 2023 · 556a0cc · 556a0cc
1 parent 241ad91
commit 556a0cc
Show file tree

Hide file tree

Showing 24 changed files with 260 additions and 279 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: ClinicoPath
 Title: Analysis for Clinicopathological Research
-Version: 0.0.2.16
+Version: 0.0.2.17
 Date: 2023-12-24
 Authors@R: 
     person(given = "Serdar",
@@ -70,8 +70,6 @@ Imports:
     gtExtras,
     labelled,
     PMCMRplus
-Remotes:
-    nbarrowman/vtree@ffa53d4ea5050fa9b26918f4bb30595e91a0f489
 VignetteBuilder:
     knitr
 Encoding: UTF-8

diff --git a/R/jjbarstats.b.R b/R/jjbarstats.b.R
@@ -121,9 +121,9 @@ jjbarstatsClass <- if (requireNamespace('jmvcore'))
 
                 # dep1 <- jmvcore::composeTerms(listOfComponents = dep)
 
-                dep1 <- jmvcore::composeTerm(components = dep)
+                # dep1 <- jmvcore::composeTerm(components = dep)
 
-                group <- jmvcore::composeTerm(components = group)
+                # group <- jmvcore::composeTerm(components = group)
 
 
                 # ggbarstats ----
@@ -137,8 +137,8 @@ jjbarstatsClass <- if (requireNamespace('jmvcore'))
                     plot <-
                         ggstatsplot::ggbarstats(
                             data = mydata,
-                            x = !!dep1,
-                            y = !!group,
+                            x = !!rlang::sym(dep),
+                            y = !!rlang::sym(group),
 
                             # paired = paired,
 
@@ -234,8 +234,10 @@ jjbarstatsClass <- if (requireNamespace('jmvcore'))
                             # y = NULL
                         )
 
-                    plot <- ggstatsplot::combine_plots(plotlist = plotlist,
-                                                       nrow = length(self$options$dep))
+                    plot <- ggstatsplot::combine_plots(
+                        plotlist = plotlist,
+                            plotgrid.args = list(ncol = 1)
+                            )
 
 
 
@@ -384,8 +386,10 @@ jjbarstatsClass <- if (requireNamespace('jmvcore'))
                             # ggstatsplot.layer = originaltheme
                         )
 
-                    plot2 <- ggstatsplot::combine_plots(plotlist = plotlist,
-                                                        ncol = 1)
+                    plot2 <- ggstatsplot::combine_plots(
+                        plotlist = plotlist,
+                            plotgrid.args = list(ncol = 1)
+                            )
 
                     }
 

diff --git a/R/jjbetweenstats.b.R b/R/jjbetweenstats.b.R
@@ -149,9 +149,9 @@ jjbetweenstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
 
 
 
-            dep <- jmvcore::composeTerm(components = dep)
+            # dep <- jmvcore::composeTerm(components = dep)
 
-            group <- jmvcore::composeTerm(components = group)
+            # group <- jmvcore::composeTerm(components = group)
 
             # ggbetweenstats ----
             # https://indrajeetpatil.github.io/ggstatsplot/reference/ggbetweenstats.html
@@ -161,8 +161,8 @@ jjbetweenstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
             if (length(self$options$dep) == 1) {
             plot <- ggstatsplot::ggbetweenstats(
                 data = mydata,
-                x = !!group,
-                y = !!dep
+                x = !!rlang::sym(group),
+                y = !!rlang::sym(dep)
                 , type = typestatistics
                 , ggtheme = ggtheme
                 , ggstatsplot.layer = originaltheme
@@ -249,8 +249,10 @@ jjbetweenstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
 
                     )
 
-                plot <- ggstatsplot::combine_plots(plotlist = plotlist,
-                                                   nrow = length(self$options$dep))
+                plot <- ggstatsplot::combine_plots(
+                    plotlist = plotlist,
+                            plotgrid.args = list(ncol = 1)
+                            )
 
 
 
@@ -425,8 +427,10 @@ jjbetweenstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
 
                     )
 
-                plot2 <- ggstatsplot::combine_plots(plotlist = plotlist,
-                                                    ncol = 1)
+                plot2 <- ggstatsplot::combine_plots(
+                    plotlist = plotlist,
+                            plotgrid.args = list(ncol = 1)
+                            )
 
             }
 

diff --git a/R/jjdotplotstats.b.R b/R/jjdotplotstats.b.R
@@ -116,9 +116,9 @@ jjdotplotstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
             originaltheme <- self$options$originaltheme
 
 
-            dep <- jmvcore::composeTerm(components = dep)
+            # dep <- jmvcore::composeTerm(components = dep)
 
-            group <- jmvcore::composeTerm(components = group)
+            # group <- jmvcore::composeTerm(components = group)
 
 
             # ggdotplotstats ----
@@ -129,8 +129,8 @@ jjdotplotstatsClass <- if (requireNamespace('jmvcore')) R6::R6Class(
             plot <-
                 ggstatsplot::ggdotplotstats(
                     data = mydata,
-                    x = !!dep,
-                    y = !!group,
+                    x = !!rlang::sym(dep),
+                    y = !!rlang::sym(group),
                     xlab = NULL,
                     ylab = NULL,
                     title = NULL,