diff --git a/R/JAGSWrapper.R b/R/JAGSWrapper.R index 97aaffa..8ce6e51 100644 --- a/R/JAGSWrapper.R +++ b/R/JAGSWrapper.R @@ -30,7 +30,7 @@ JAGS <- function( bivariateScatterPlot = FALSE, burnin = 500, chains = 3, - colorScheme = "colorblind", + colorPalette = "colorblind", customInference = list(list(ciLevel = 0.95, data = "", dataSplit = "", ess = TRUE, hdiLevel = 0.95, inferenceCi = FALSE, inferenceCiLevel = 0.95, inferenceCustomHigh = "1", inferenceCustomLow = "0", inferenceHdi = FALSE, inferenceHdiLevel = 0.95, inferenceManual = FALSE, mean = TRUE, median = TRUE, name = "Plot 1", overlayGeomType = "density", overlayHistogramBinWidthType = "sturges", overlayHistogramManualNumberOfBins = 30, parameter = "", parameterOrder = "orderMean", parameterSubset = "", plotCustomHigh = "1", plotCustomLow = "0", plotInterval = "ci", plotsType = "", rhat = TRUE, savageDickey = FALSE, savageDickeyPoint = "0", savageDickeyPosteriorMethod = "samplingPosteriorPoint", savageDickeyPosteriorSamplingType = "normalKernel", savageDickeyPriorHeight = "0", savageDickeyPriorMethod = "sampling", savageDickeySamplingType = "normalKernel", sd = TRUE, shadeIntervalInPlot = FALSE)), densityPlot = FALSE, deviance = FALSE, @@ -64,7 +64,7 @@ JAGS <- function( options[["data"]] <- NULL options[["version"]] <- NULL - optionsWithFormula <- c("colorScheme", "customInference", "initialValues", "model", "monitoredParameters", "monitoredParametersShown", "userData") + optionsWithFormula <- c("colorPalette", "customInference", "initialValues", "model", "monitoredParameters", "monitoredParametersShown", "userData") for (name in optionsWithFormula) { if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } diff --git a/R/jagsModule.R b/R/jagsModule.R index b66ebb0..7b60c34 100644 --- a/R/jagsModule.R +++ b/R/jagsModule.R @@ -387,7 +387,7 @@ JAGSInternal <- function(jaspResults, dataset, options, state = NULL) { .JAGSmcmcPlots <- function(jaspResults, options, mcmcResult) { if (is.null(jaspResults[["mainContainer"]][["plotContainer"]])) { - plotContainer <- createJaspContainer(dependencies = c("monitoredParametersShown", "colorScheme")) + plotContainer <- createJaspContainer(dependencies = c("monitoredParametersShown", "colorPalette")) } else { plotContainer <- jaspResults[["mainContainer"]][["plotContainer"]] } @@ -401,7 +401,7 @@ JAGSInternal <- function(jaspResults, dataset, options, state = NULL) { if (is.null(jaspResults[["mainContainer"]][["plotContainer"]])) jaspResults[["mainContainer"]][["plotContainer"]] <- plotContainer - colorpalette <- options[["colorScheme"]] + colorpalette <- options[["colorPalette"]] oldColorpalette <- jaspGraphs::getGraphOption("palette") on.exit(jaspGraphs::setGraphOption("palette", oldColorpalette)) jaspGraphs::setGraphOption("palette", colorpalette) diff --git a/inst/Upgrades.qml b/inst/Upgrades.qml index 0f9beba..5fcc6db 100644 --- a/inst/Upgrades.qml +++ b/inst/Upgrades.qml @@ -87,4 +87,13 @@ Upgrades ChangeRename { from: "showDeviance"; to: "deviance" } } + + Upgrade + { + functionName: "JAGS" + fromVersion: "0.18.0" + toVersion: "0.18.1" + + ChangeRename{from: "colorScheme"; to: "colorPalette "} + } } diff --git a/inst/qml/JAGS.qml b/inst/qml/JAGS.qml index 2dc6d63..a9e875d 100644 --- a/inst/qml/JAGS.qml +++ b/inst/qml/JAGS.qml @@ -58,7 +58,7 @@ Form } AssignedVariablesList { name: "monitoredParametersShown"; title: qsTr("Show results for these parameters")} } - + Section { title: qsTr("Observed Values") @@ -73,20 +73,7 @@ Form title: qsTr("Plots") Group { - DropDown - { - name: "colorScheme" - indexDefaultValue: 0 - label: qsTr("Color scheme for plots:") - values: - [ - { label: qsTr("Colorblind"), value: "colorblind" }, - { label: qsTr("Colorblind Alt."), value: "colorblind2" }, - { label: qsTr("Viridis"), value: "viridis" }, - { label: qsTr("Blue"), value: "blue" }, - { label: qsTr("Gray"), value: "gray" } - ] - } + ColorPalette{} CheckBox { name: "aggregatedChains"; label: qsTr("Aggregate chains for densities and histograms"); checked:true } CheckBox { name: "legend"; label: qsTr("Show legends"); checked:true } CheckBox { name: "densityPlot"; label: qsTr("Density") }