add header and change name

jasp-stats · Nov 8, 2024 · 4e052ab · 4e052ab
1 parent 007500a
commit 4e052ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/R/contingencytables.R b/R/contingencytables.R
@@ -135,7 +135,7 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
 
     # Create table
     crossTabMain <- createJaspTable(title = gettext("Contingency Tables"))
-    crossTabMain$dependOn(c("countsExpected", "countsObserved", "tableMargin", "percentagesRow",  "percentagesColumn",
+    crossTabMain$dependOn(c("countsExpected", "countsObserved", "marginShowTotals", "percentagesRow",  "percentagesColumn",
                             "percentagesTotal", "rowOrder", "columnOrder", "residualsUnstandardized",
                             "residualsPearson", "residualsStandardized"))
     crossTabMain$showSpecifiedColumnsOnly <- TRUE
@@ -168,7 +168,7 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
     # Totals columns
     totalTitle <- gettext("Total")
 
-    if (options$tableMargin && (counts.fp || options$countsExpected || options$percentagesRow || options$percentagesColumn ||
+    if (options$marginShowTotals && (counts.fp || options$countsExpected || options$percentagesRow || options$percentagesColumn ||
          options$percentagesTotal || options$residualsUnstandardized || options$residualsPearson || options$residualsStandardized)) {
       if (options$countsObserved)          crossTabMain$addColumnInfo(name = "total[counts]",                   title = totalTitle, type = "number",  format = "sf:4;dp:2")
       if (options$countsExpected)          crossTabMain$addColumnInfo(name = "total[expected]",                 title = totalTitle, type = "number",  format = "sf:4;dp:2")
@@ -178,7 +178,7 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
       if (options$residualsUnstandardized) crossTabMain$addColumnInfo(name = "total[unstandardized.residuals]", title = totalTitle, type = "number",  format = "sf:4;dp:2")
       if (options$residualsPearson)        crossTabMain$addColumnInfo(name = "total[pearson.residuals]",        title = totalTitle, type = "number",  format = "sf:4;dp:2")
       if (options$residualsStandardized)   crossTabMain$addColumnInfo(name = "total[standardized.residuals]",   title = totalTitle, type = "number",  format = "sf:4;dp:2")
-    } else if (options$tableMargin)
+    } else if (options$marginShowTotals)
       if (options$countsObserved)          crossTabMain$addColumnInfo(name = "total[counts]",                   title = totalTitle, type = "integer")
 
     analysisContainer[["crossTabMain"]] <- crossTabMain
@@ -943,11 +943,11 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
       names(row)  <- paste0(names(row),"[counts]")
       sum         <- sum(counts.matrix)
 
-      if(options$tableMargin && (counts.fp || options$countsExpected || options$percentagesRow ||
+      if(options$marginShowTotals && (counts.fp || options$countsExpected || options$percentagesRow ||
          options$percentagesColumn || options$percentagesTotal || options$residualsUnstandardized ||
          options$residualsPearson || options$residualsStandardized))
         row[["total[counts]"]] <- sum
-      else  if (options$tableMargin)
+      else  if (options$marginShowTotals)
         row[["total[counts]"]] <- as.integer(sum)
 
       if (options$countsObserved)
@@ -986,7 +986,7 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
           options$residualsStandardized))
       row[[".isNewGroup"]] <- TRUE
 
-    if (options$tableMargin) {
+    if (options$marginShowTotals) {
       row                       <- .crossTabLayerNames(row, group)
       rows[[length(rows) + 1]]  <- row
     }

diff --git a/inst/qml/ContingencyTables.qml b/inst/qml/ContingencyTables.qml
@@ -150,8 +150,12 @@ Form
 			CheckBox { name: "percentagesTotal";	label: qsTr("Total")	}
 		}
 
-
-		CheckBox { name: "tableMargin";		label: qsTr("Table margin");		checked: true }
+		Group
+		{
+			title: qsTr("Margin")
+			CheckBox { name: "marginShowTotals";		label: qsTr("Show totals");		checked: true }
+		}
+
 	}
 
 	Section

diff --git a/inst/qml/ContingencyTablesBayesian.qml b/inst/qml/ContingencyTablesBayesian.qml
@@ -128,7 +128,11 @@ Form
 			CheckBox { name: "percentagesTotal";	label: qsTr("Total")	}
 		}
 
-		CheckBox { name: "tableMargin";		label: qsTr("Table margin");		checked: true }
+		Group
+		{
+			title: qsTr("Margin")
+			CheckBox { name: "marginShowTotals";		label: qsTr("Show totals");		checked: true }
+		}
 	}
 
 	Section