From 556a0ccce694971e6f8099e1faa2aca8854dfba8 Mon Sep 17 00:00:00 2001 From: sbalci Date: Sun, 24 Dec 2023 22:40:26 +0300 Subject: [PATCH] update WIP --- DESCRIPTION | 4 +- R/jjbarstats.b.R | 20 +- R/jjbetweenstats.b.R | 20 +- R/jjdotplotstats.b.R | 8 +- R/jjhistostats.b.R | 400 ++++++++++++++++------------------- R/jjhistostats.h.R | 2 - R/jjpiestats.b.R | 4 +- R/statsplot2.h.R | 6 +- jamovi/0000.yaml | 2 +- jamovi/jjbarstats.u.yaml | 6 +- jamovi/jjbetweenstats.u.yaml | 6 +- jamovi/jjcorrmat.u.yaml | 6 +- jamovi/jjdotplotstats.u.yaml | 6 +- jamovi/jjhistostats.r.yaml | 12 +- jamovi/jjhistostats.u.yaml | 7 +- jamovi/jjpiestats.u.yaml | 6 +- jamovi/jjscatterstats.u.yaml | 6 +- jamovi/jjwithinstats.u.yaml | 6 +- jamovi/multisurvival.u.yaml | 2 +- jamovi/multisurvival2.u.yaml | 2 +- jamovi/statsplot2.a.yaml | 2 +- jamovi/survivalcont.u.yaml | 2 +- jamovi/vartree.u.yaml | 2 +- jsurvival | 2 +- 24 files changed, 260 insertions(+), 279 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 723dc4eb..ccb38277 100644 --- 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 index 2753a26a..97a8df5c 100644 --- 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 index 5bb34168..f387eb04 100644 --- 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 index ac4dd3d8..fe7a1e4d 100644 --- 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, diff --git a/R/jjhistostats.b.R b/R/jjhistostats.b.R index f495ee8b..691a23fd 100644 --- a/R/jjhistostats.b.R +++ b/R/jjhistostats.b.R @@ -9,26 +9,26 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) "jjhistostatsClass", inherit = jjhistostatsBase, private = list( - # init ---- + # init ---- .init = function() { deplen <- length(self$options$dep) - self$results$plot$setSize(deplen * 800, - 600) - - self$results$plot2$setSize(800, deplen * 300) + self$results$plot$setSize(400, deplen * 300) + # self$results$plot2$setSize(800, deplen * 300) } - , + # run ---- + , .run = function() { - # Initial Message ---- + ## Initial Message ---- if (is.null(self$options$dep)) { - # TODO ---- + + ## todo ---- todo <- glue::glue( - "
+ "
Welcome to ClinicoPath

This tool will help you generate Histograms. @@ -44,24 +44,21 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) return() } else { - # TODO ---- + todo <- glue::glue("
You have selected to make a histogram.
") self$results$todo$setContent(todo) if (nrow(self$data) == 0) stop('Data contains no (complete) rows') - } } - - , .plot = function(image, ggtheme, theme, ...) { # the plot function ---- - # Error messages ---- + ## Error messages ---- if (is.null(self$options$dep)) return() @@ -70,31 +67,7 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) stop('Data contains no (complete) rows') - # Prepare Data ---- - - - # direction, paired ---- - - # direction <- self$options$direction - # - # if (direction == "repeated") { - # - # paired <- TRUE - # - # } else if (direction == "independent") { - # - # paired <- FALSE - # - # } - - - # distribution <- - # jmvcore::constructFormula(terms = self$options$distribution) - - # pairw <- self$options$pairw - - - # read data ---- + ## read data ---- mydata <- self$data @@ -105,8 +78,7 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) mydata[[var]] <- jmvcore::toNumeric(mydata[[var]]) - - # Exclude NA ---- + ## Exclude NA ---- excl <- self$options$excl @@ -114,107 +86,105 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) mydata <- jmvcore::naOmit(mydata) } - - # type of statistics ---- - - - typestatistics <- - jmvcore::constructFormula(terms = self$options$typestatistics) - - - - # ADD HERE ---- - # arguments ---- - - - binwidth <- NULL - - if(self$options$changebinwidth) { - binwidth <- self$options$binwidth - } + dep <- self$options$dep - barmeasure <- - jmvcore::constructFormula(terms = self$options$barmeasure) - centralityparameter <- - jmvcore::constructFormula(terms = self$options$centralityparameter) + ## arguments ---- + # binwidth <- NULL + # + # if(self$options$changebinwidth) { + # binwidth <- self$options$binwidth + # } + # + # + # barmeasure <- + # jmvcore::constructFormula(terms = self$options$barmeasure) + # + # centralityparameter <- + # jmvcore::constructFormula(terms = self$options$centralityparameter) + # - # mydep <- mydata[[self$options$dep]] - # mygroup <- mydata[[self$options$group]] + ## direction, paired ---- + # direction <- self$options$direction + # + # if (direction == "repeated") { + # + # paired <- TRUE + # + # } else if (direction == "independent") { + # + # paired <- FALSE + # + # } - dep <- self$options$dep - # group <- self$options$group + # distribution <- + # jmvcore::constructFormula( + # terms = self$options$distribution + # ) + # pairw <- self$options$pairw - dep <- jmvcore::composeTerm(components = dep) - # group <- jmvcore::composeTerm(components = group) - # gghistostats ---- + # gghistostats # https://indrajeetpatil.github.io/ggstatsplot/reference/gghistostats.html - - # dep == 1 ---- + ## dep == 1 ---- if (length(self$options$dep) == 1) { plot <- ggstatsplot::gghistostats( data = mydata, - x = !!dep, - - binwidth = binwidth, - # bar.measure = barmeasure, - # xlab = NULL, - # title = NULL, - # subtitle = NULL, - # caption = NULL, - - type = typestatistics, - - - # test.value = 0, - # bf.prior = 0.707, - # bf.message = TRUE, - # effsize.type = "g", - # conf.level = 0.95, - # tr = 0.2, - # nboot = 100, - # k = 2L, - - ggtheme = ggplot2::theme_bw(), - ggstatsplot.layer = TRUE, - - - - bar.fill = "grey50", - results.subtitle = self$options$resultssubtitle, - test.k = 0, - test.value.line = FALSE, - test.value.line.args = list(size = 1), - test.value.label.args = list(size = 3), - - centrality.plotting = self$options$centralityline, - - centrality.parameter = centralityparameter, - centrality.k = 2, - centrality.line.args = list(size = 1, color = "blue"), - centrality.label.args = list(color = "blue", size = 3), - normal.curve = self$options$normalcurve, - normal.curve.args = list(size = 3), - ggplot.component = NULL, - output = "plot" - ) - - - - + x = !!rlang::sym(dep) + # , + # binwidth = binwidth, + # # bar.measure = barmeasure, + # # xlab = NULL, + # # title = NULL, + # # subtitle = NULL, + # # caption = NULL, + # + # type = typestatistics, + # + # + # # test.value = 0, + # # bf.prior = 0.707, + # # bf.message = TRUE, + # # effsize.type = "g", + # # conf.level = 0.95, + # # tr = 0.2, + # # nboot = 100, + # # k = 2L, + # + # ggtheme = ggplot2::theme_bw(), + # ggstatsplot.layer = TRUE, + # + # + # + # bar.fill = "grey50", + # results.subtitle = self$options$resultssubtitle, + # test.k = 0, + # test.value.line = FALSE, + # test.value.line.args = list(size = 1), + # test.value.label.args = list(size = 3), + # + # centrality.plotting = self$options$centralityline, + # + # centrality.parameter = centralityparameter, + # centrality.k = 2, + # centrality.line.args = list(size = 1, color = "blue"), + # centrality.label.args = list(color = "blue", size = 3), + # normal.curve = self$options$normalcurve, + # normal.curve.args = list(size = 3), + # ggplot.component = NULL, + # output = "plot" @@ -223,73 +193,93 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) + ) } - # dep > 1 ---- + ## dep > 1 ---- if (length(self$options$dep) > 1) { + dep2 <- as.list(self$options$dep) + dep2_symbols <- purrr::map(dep2, rlang::sym) plotlist <- purrr::pmap( - .l = list(x = dep2, - # title = list(dep), - messages = FALSE), - .f = ggstatsplot::gghistostats, - data = mydata, - - binwidth = binwidth, - bar.measure = barmeasure, - # xlab = NULL, - # title = NULL, - # subtitle = NULL, - # caption = NULL, - - type = typestatistics, - - # test.value = 0, - # bf.prior = 0.707, - # bf.message = TRUE, - # effsize.type = "g", - # conf.level = 0.95, - # nboot = 100, - # k = 2L, - - ggtheme = ggplot2::theme_bw(), - ggstatsplot.layer = TRUE, - - - bar.fill = "grey50", - results.subtitle = self$options$resultssubtitle, - - # test.k = 0, - # test.value.line = FALSE, - # test.value.line.args = list(size = 1), - # test.value.label.args = list(size = 3), - - centrality.plotting = self$options$centralityline, - - centrality.parameter = centralityparameter, - centrality.k = 2, - centrality.line.args = list(size = 1, color = "blue"), - centrality.label.args = list(color = "blue", size = 3), - normal.curve = self$options$normalcurve, - normal.curve.args = list(size = 3), - ggplot.component = NULL, - # output = "plot", - # messages = TRUE + .l = list( + x = dep2_symbols, + messages = FALSE), + .f = function(x, messages) { + ggstatsplot::gghistostats( + data = mydata, + x = !!x, + messages = messages + + + + # , + # binwidth = binwidth, + # bar.measure = barmeasure, + # # xlab = NULL, + # # title = NULL, + # # subtitle = NULL, + # # caption = NULL, + # + # type = typestatistics, + # + # # test.value = 0, + # # bf.prior = 0.707, + # # bf.message = TRUE, + # # effsize.type = "g", + # # conf.level = 0.95, + # # nboot = 100, + # # k = 2L, + # + # ggtheme = ggplot2::theme_bw(), + # ggstatsplot.layer = TRUE, + # + # + # bar.fill = "grey50", + # results.subtitle = self$options$resultssubtitle, + # + # # test.k = 0, + # # test.value.line = FALSE, + # # test.value.line.args = list(size = 1), + # # test.value.label.args = list(size = 3), + # + # centrality.plotting = self$options$centralityline, + # + # centrality.parameter = centralityparameter, + # centrality.k = 2, + # centrality.line.args = list(size = 1, color = "blue"), + # centrality.label.args = list(color = "blue", size = 3), + # normal.curve = self$options$normalcurve, + # normal.curve.args = list(size = 3), + # ggplot.component = NULL, + # output = "plot" + + + + + + + + + + + + ) + } ) plot <- - ggstatsplot::combine_plots(plotlist = plotlist, - nrow = length(self$options$dep)) - - + ggstatsplot::combine_plots( + plotlist = plotlist, + plotgrid.args = list(ncol = 1) + ) } - # Print Plot ---- - + ## Print Plot ---- print(plot) TRUE @@ -298,9 +288,9 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) , .plot2 = function(image, ggtheme, theme, ...) { - # the plot function ---- + # the plot2 function ---- - # Error messages ---- + ## Error messages ---- if (is.null(self$options$dep) || is.null(self$options$grvar)) @@ -309,22 +299,18 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) if (nrow(self$data) == 0) stop('Data contains no (complete) rows') - - # Prepare Data ---- - - # read data ---- + ## read data ---- mydata <- self$data vars <- self$options$dep - for (var in vars) mydata[[var]] <- jmvcore::toNumeric(mydata[[var]]) - # direction, paired ---- + ## direction, paired ---- # direction <- self$options$direction # @@ -338,7 +324,7 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) # # } - # Exclude NA ---- + ## Exclude NA ---- excl <- self$options$excl @@ -346,53 +332,38 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) mydata <- jmvcore::naOmit(mydata) } - - - - - # type of statistics ---- + ## type of statistics ---- typestatistics <- - jmvcore::constructFormula(terms = self$options$typestatistics) - + jmvcore::constructFormula( + terms = self$options$typestatistics) dep <- self$options$dep - # group <- self$options$group - - - dep <- jmvcore::composeTerm(components = dep) - - # group <- jmvcore::composeTerm(components = group) - - # ADD HERE ---- - # arguments ---- + ## arguments ---- binwidth <- NULL if(self$options$changebinwidth) { - binwidth <- self$options$binwidth - } - - barmeasure <- - jmvcore::constructFormula(terms = self$options$barmeasure) - + jmvcore::constructFormula( + terms = self$options$barmeasure) centralityparameter <- - jmvcore::constructFormula(terms = self$options$centralityparameter) + jmvcore::constructFormula( + terms = self$options$centralityparameter) - # grouped_gghistostats ---- + # grouped_gghistostats # https://indrajeetpatil.github.io/ggstatsplot/reference/grouped_gghistostats.html grvar <- self$options$grvar - # dep = 1 ---- + ## dep = 1 ---- if (length(self$options$dep) == 1) { plot2 <- ggstatsplot::grouped_gghistostats( @@ -424,10 +395,7 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) } - - - - # dep > 1 ---- + ## dep > 1 ---- if (length(self$options$dep) > 1) { dep2 <- as.list(self$options$dep) @@ -464,14 +432,14 @@ jjhistostatsClass <- if (requireNamespace('jmvcore')) ) plot2 <- - ggstatsplot::combine_plots(plotlist = plotlist, - ncol = 1) + ggstatsplot::combine_plots( + plotlist = plotlist, + plotgrid.args = list(ncol = 1) + ) } - - - # Print Plot ---- + ## Print Plot 2 ---- print(plot2) TRUE diff --git a/R/jjhistostats.h.R b/R/jjhistostats.h.R index 5a7a6907..ef9b7579 100644 --- a/R/jjhistostats.h.R +++ b/R/jjhistostats.h.R @@ -259,8 +259,6 @@ jjhistostatsResults <- if (requireNamespace("jmvcore", quietly=TRUE)) R6::R6Clas options=options, name="plot2", title="`Histogram Splitted by {grvar}`", - width=800, - height=600, renderFun=".plot2", requiresData=TRUE, visible="(grvar)")) diff --git a/R/jjpiestats.b.R b/R/jjpiestats.b.R index 6c119b0e..041e1eab 100644 --- a/R/jjpiestats.b.R +++ b/R/jjpiestats.b.R @@ -104,7 +104,7 @@ jjpiestatsClass <- if (requireNamespace('jmvcore')) R6::R6Class( # group <- self$options$group - dep <- jmvcore::composeTerm(components = dep) + # dep <- jmvcore::composeTerm(components = dep) # group <- jmvcore::composeTerm(components = group) @@ -123,7 +123,7 @@ jjpiestatsClass <- if (requireNamespace('jmvcore')) R6::R6Class( plot1 <- ggstatsplot::ggpiestats( data = mydata, - x = !!dep, + x = !!rlang::sym(dep), y = NULL, counts = NULL, ratio = NULL, diff --git a/R/statsplot2.h.R b/R/statsplot2.h.R index 00a1fac7..08660e46 100644 --- a/R/statsplot2.h.R +++ b/R/statsplot2.h.R @@ -12,7 +12,7 @@ statsplot2Options <- if (requireNamespace("jmvcore", quietly=TRUE)) R6::R6Class( direction = "independent", distribution = "p", alluvsty = "t1", - excl = TRUE, + excl = FALSE, originaltheme = FALSE, ...) { super$initialize( @@ -54,7 +54,7 @@ statsplot2Options <- if (requireNamespace("jmvcore", quietly=TRUE)) R6::R6Class( private$..excl <- jmvcore::OptionBool$new( "excl", excl, - default=TRUE) + default=FALSE) private$..originaltheme <- jmvcore::OptionBool$new( "originaltheme", originaltheme, @@ -204,7 +204,7 @@ statsplot2 <- function( direction = "independent", distribution = "p", alluvsty = "t1", - excl = TRUE, + excl = FALSE, originaltheme = FALSE) { if ( ! requireNamespace("jmvcore", quietly=TRUE)) diff --git a/jamovi/0000.yaml b/jamovi/0000.yaml index 1cd9182c..9c2f8cb3 100644 --- a/jamovi/0000.yaml +++ b/jamovi/0000.yaml @@ -1,7 +1,7 @@ --- title: Common Analysis for Clinicopathological Research name: ClinicoPath -version: 0.0.2.16 +version: 0.0.2.17 jms: '1.0' authors: - Serdar Balci diff --git a/jamovi/jjbarstats.u.yaml b/jamovi/jjbarstats.u.yaml index 420fb248..62fb4e29 100644 --- a/jamovi/jjbarstats.u.yaml +++ b/jamovi/jjbarstats.u.yaml @@ -30,7 +30,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -43,7 +43,7 @@ children: name: excl - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -65,7 +65,7 @@ children: enable: (pairwisecomparisons) - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjbetweenstats.u.yaml b/jamovi/jjbetweenstats.u.yaml index 538c0e58..e4c43baa 100644 --- a/jamovi/jjbetweenstats.u.yaml +++ b/jamovi/jjbetweenstats.u.yaml @@ -33,7 +33,7 @@ children: - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -47,7 +47,7 @@ children: - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -72,7 +72,7 @@ children: - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjcorrmat.u.yaml b/jamovi/jjcorrmat.u.yaml index 1ba74038..0d035dd8 100644 --- a/jamovi/jjcorrmat.u.yaml +++ b/jamovi/jjcorrmat.u.yaml @@ -24,7 +24,7 @@ children: - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -38,7 +38,7 @@ children: - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -63,7 +63,7 @@ children: - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjdotplotstats.u.yaml b/jamovi/jjdotplotstats.u.yaml index f24a2be0..cae5514c 100644 --- a/jamovi/jjdotplotstats.u.yaml +++ b/jamovi/jjdotplotstats.u.yaml @@ -31,7 +31,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -44,7 +44,7 @@ children: name: excl - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -66,7 +66,7 @@ children: enable: (pairwisecomparisons) - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjhistostats.r.yaml b/jamovi/jjhistostats.r.yaml index 153f80ef..9821dd39 100644 --- a/jamovi/jjhistostats.r.yaml +++ b/jamovi/jjhistostats.r.yaml @@ -26,13 +26,21 @@ items: type: Html + # - name: mydataview + # title: mydataview + # type: Preformatted + + # - name: mydataview2 + # title: mydataview2 + # type: Preformatted + # title: '` ${group} - {dep} by {grvar}`' - name: plot2 title: '`Histogram Splitted by {grvar}`' type: Image - width: 800 - height: 600 + # width: 800 + # height: 600 renderFun: .plot2 requiresData: true visible: (grvar) diff --git a/jamovi/jjhistostats.u.yaml b/jamovi/jjhistostats.u.yaml index 274543aa..9f1800ce 100644 --- a/jamovi/jjhistostats.u.yaml +++ b/jamovi/jjhistostats.u.yaml @@ -23,7 +23,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -34,9 +34,10 @@ children: children: - type: CheckBox name: excl + - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -51,7 +52,7 @@ children: name: centralityparameter - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjpiestats.u.yaml b/jamovi/jjpiestats.u.yaml index 9893dcbe..9305a37b 100644 --- a/jamovi/jjpiestats.u.yaml +++ b/jamovi/jjpiestats.u.yaml @@ -31,7 +31,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -44,7 +44,7 @@ children: name: excl - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -66,7 +66,7 @@ children: enable: (pairwisecomparisons) - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjscatterstats.u.yaml b/jamovi/jjscatterstats.u.yaml index 5e96a8fb..a966edd7 100644 --- a/jamovi/jjscatterstats.u.yaml +++ b/jamovi/jjscatterstats.u.yaml @@ -31,7 +31,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -44,7 +44,7 @@ children: name: excl - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -66,7 +66,7 @@ children: enable: (pairwisecomparisons) - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: Label label: Plot diff --git a/jamovi/jjwithinstats.u.yaml b/jamovi/jjwithinstats.u.yaml index c440a8e6..06fdcb2d 100644 --- a/jamovi/jjwithinstats.u.yaml +++ b/jamovi/jjwithinstats.u.yaml @@ -30,7 +30,7 @@ children: isTarget: true - type: CollapseBox label: Data - collapsed: false + collapsed: true children: - type: Label label: Data @@ -43,7 +43,7 @@ children: name: excl - type: CollapseBox label: Analysis - collapsed: false + collapsed: true children: - type: Label label: Analysis @@ -65,7 +65,7 @@ children: enable: (pairwisecomparisons) - type: CollapseBox label: Plot - collapsed: false + collapsed: true children: - type: LayoutBox margin: large diff --git a/jamovi/multisurvival.u.yaml b/jamovi/multisurvival.u.yaml index 4a7bc2e0..842547d0 100644 --- a/jamovi/multisurvival.u.yaml +++ b/jamovi/multisurvival.u.yaml @@ -166,7 +166,7 @@ children: - type: CollapseBox label: Plots - collapsed: false + collapsed: true stretchFactor: 1 children: - type: Label diff --git a/jamovi/multisurvival2.u.yaml b/jamovi/multisurvival2.u.yaml index c2aad8d6..9da05a6c 100644 --- a/jamovi/multisurvival2.u.yaml +++ b/jamovi/multisurvival2.u.yaml @@ -138,7 +138,7 @@ children: enable: (outcome && multievent) - type: CollapseBox label: Plots - collapsed: false + collapsed: true stretchFactor: 1 children: - type: Label diff --git a/jamovi/statsplot2.a.yaml b/jamovi/statsplot2.a.yaml index 8e607da5..ce90ba82 100644 --- a/jamovi/statsplot2.a.yaml +++ b/jamovi/statsplot2.a.yaml @@ -77,7 +77,7 @@ options: - name: excl title: Exclude Missing (NA) type: Bool - default: true + default: false - name: originaltheme title: Add GGStatsPlot Layer diff --git a/jamovi/survivalcont.u.yaml b/jamovi/survivalcont.u.yaml index 5083187d..2e5bb328 100644 --- a/jamovi/survivalcont.u.yaml +++ b/jamovi/survivalcont.u.yaml @@ -35,7 +35,7 @@ children: isTarget: true - type: CollapseBox label: Finding Cut-off - collapsed: false + collapsed: true children: - type: Label label: Cut-off diff --git a/jamovi/vartree.u.yaml b/jamovi/vartree.u.yaml index f51433cf..93946e1e 100644 --- a/jamovi/vartree.u.yaml +++ b/jamovi/vartree.u.yaml @@ -55,7 +55,7 @@ children: - type: CollapseBox label: Options stretchFactor: 1 - collapsed: false + collapsed: true children: - type: LayoutBox margin: large diff --git a/jsurvival b/jsurvival index 5dc9989c..aa5da1c6 160000 --- a/jsurvival +++ b/jsurvival @@ -1 +1 @@ -Subproject commit 5dc9989cb4ff4b1475e1fd9116bcfa5b59348438 +Subproject commit aa5da1c6c6950e4bdbfc8733426a41ecbcc1d3fc