From 32b3de9cd403caec00adb5e4a3f06dac287f6a19 Mon Sep 17 00:00:00 2001 From: FBartos Date: Mon, 18 Sep 2023 10:11:36 +0200 Subject: [PATCH 1/4] fix output ordering --- R/robustbayesianmetaanalysis.R | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/R/robustbayesianmetaanalysis.R b/R/robustbayesianmetaanalysis.R index 9b4d8804..47903346 100644 --- a/R/robustbayesianmetaanalysis.R +++ b/R/robustbayesianmetaanalysis.R @@ -950,7 +950,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU ### create overview table modelsSummary <- createJaspTable(title = gettext("Models Overview")) - modelsSummary$position <- 6 + modelsSummary$position <- 8 modelsSummary$dependOn(c(.robmaDependencies, "bayesFactorType", "inferenceModelsOverview", "inferenceModelsOverviewBF", "inferenceModelsOverviewOrder", "inferenceShortenPriorName")) jaspResults[["mainSummary"]][["modelsSummary"]] <- modelsSummary @@ -1032,7 +1032,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU return() } else { individualModels <- createJaspContainer(title = gettext("Individual Models Summary")) - individualModels$position <- 5 + individualModels$position <- 9 individualModels$dependOn(c(.robmaDependencies, "bayesFactorType", "inferenceIndividualModels", "inferenceIndividualModelsSingleModel", "inferenceIndividualModelsSingleModelNumber", "inferenceShortenPriorName", "inferenceOutputScale")) jaspResults[["individualModels"]] <- individualModels } @@ -1193,7 +1193,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU width <- 800 forestPlot <- createJaspPlot(title = title, width = width, height = height) - forestPlot$position <- 6 + forestPlot$position <- 10 forestPlot$dependOn(c(.robmaDependencies, "plotsForestPlot", "plotsForestPlotOrder", "plotsForestPlotType", "inferenceOutputScale")) jaspResults[["forestPlot"]] <- forestPlot @@ -1222,7 +1222,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU # create / access the container if (is.null(jaspResults[["estimatesPlots"]])) { estimatesPlots <- createJaspContainer(title = gettext("Posterior Distribution Plots")) - estimatesPlots$position <- 7 + estimatesPlots$position <- 11 estimatesPlots$dependOn(c(.robmaDependencies, "plotsPooledEstimatesType", "plotsPooledEstimatesPriorDistribution", "inferenceOutputScale")) jaspResults[["estimatesPlots"]] <- estimatesPlots } else { @@ -1306,7 +1306,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU # create / access the container if (is.null(jaspResults[["modelsPlots"]])) { modelsPlots <- createJaspContainer(title = gettext("Posterior Model Estimates Plots")) - modelsPlots$position <- 8 + modelsPlots$position <- 12 modelsPlots$dependOn(c(.robmaDependencies, "plotsIndividualModelsType", "plotsIndividualModelsOrder", "plotsIndividualModelsOrderBy", "plotsIndividualModelsShowBayesianUpdating", "plotsIndividualModelsShowPosteriorEstimates", "inferenceOutputScale")) jaspResults[["modelsPlots"]] <- modelsPlots } else { @@ -1394,7 +1394,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU # create / access the container if (is.null(jaspResults[["diagnostics"]])) { diagnostics <- createJaspContainer(title = gettext("Diagnostics")) - diagnostics$position <- 9 + diagnostics$position <- 13 diagnostics$dependOn(.robmaDependencies) jaspResults[["diagnostics"]] <- diagnostics } else { @@ -1457,7 +1457,7 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU # create / access the container if (is.null(jaspResults[["diagnostics"]])) { diagnostics <- createJaspContainer(title = gettext("Diagnostics")) - diagnostics$position <- 9 + diagnostics$position <- 14 diagnostics$dependOn(.robmaDependencies) jaspResults[["diagnostics"]] <- diagnostics } else { From 76a6995b0a66343f9c8dee37d1d2c955cae72bd3 Mon Sep 17 00:00:00 2001 From: FBartos Date: Mon, 18 Sep 2023 10:29:26 +0200 Subject: [PATCH 2/4] fix diagnostics plots --- R/robustbayesianmetaanalysis.R | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/R/robustbayesianmetaanalysis.R b/R/robustbayesianmetaanalysis.R index 47903346..e8809c0a 100644 --- a/R/robustbayesianmetaanalysis.R +++ b/R/robustbayesianmetaanalysis.R @@ -1576,7 +1576,10 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU title = FALSE ) - if (is.null(newPlots)) + # (temporal) fix for the package returning a list with empty plots on the remaining spots + newPlots <- newPlots[!sapply(newPlots, is.null)] + + if (length(newPlots) == 0) next noPars <- FALSE @@ -1620,7 +1623,10 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU title = FALSE ) - if (is.null(newPlots)) + # (temporal) fix for the package returning a list with empty plots on the remaining spots + newPlots <- newPlots[!sapply(newPlots, is.null)] + + if (length(newPlots) == 0) next noPars <- FALSE @@ -1665,7 +1671,10 @@ RobustBayesianMetaAnalysis <- function(jaspResults, dataset, options, state = NU title = FALSE ) - if (is.null(newPlots)) + # (temporal) fix for the package returning a list with empty plots on the remaining spots + newPlots <- newPlots[!sapply(newPlots, is.null)] + + if (length(newPlots) == 0) next noPars <- FALSE From 0c95fde756657c6ca91aedcaaffeecdae4fe65f6 Mon Sep 17 00:00:00 2001 From: FBartos Date: Mon, 18 Sep 2023 10:41:18 +0200 Subject: [PATCH 3/4] fix effect size output option --- inst/qml/RobustBayesianMetaAnalysis.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/qml/RobustBayesianMetaAnalysis.qml b/inst/qml/RobustBayesianMetaAnalysis.qml index fa152ab4..f1be8ad4 100644 --- a/inst/qml/RobustBayesianMetaAnalysis.qml +++ b/inst/qml/RobustBayesianMetaAnalysis.qml @@ -379,7 +379,7 @@ Form { label: qsTr("Cohen's d"), value: "cohensD"}, { label: qsTr("Fisher's z"), value: "fishersZ"}, { label: qsTr("logOR"), value: "logOr"}, - { label: qsTr("Correlation"), value: "r"} + { label: qsTr("Correlation"), value: "correlation"} ] } From 7055c1ea72b03c531b6aa3591bb72e46a0fbd740 Mon Sep 17 00:00:00 2001 From: FBartos Date: Mon, 18 Sep 2023 13:03:28 +0200 Subject: [PATCH 4/4] fix 'plotsIndividualModelsOrder' --- inst/qml/RobustBayesianMetaAnalysis.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/qml/RobustBayesianMetaAnalysis.qml b/inst/qml/RobustBayesianMetaAnalysis.qml index f1be8ad4..a188efc0 100644 --- a/inst/qml/RobustBayesianMetaAnalysis.qml +++ b/inst/qml/RobustBayesianMetaAnalysis.qml @@ -578,7 +578,7 @@ Form RadioButtonGroup { - name: "plotsIndividualModelsOrderelsOrderBy" + name: "plotsIndividualModelsOrder" title: qsTr("Order") RadioButton