fixed bivc table bug

mtennekes · Sep 25, 2024 · 3146740 · 3146740
1 parent d9fb78e
commit 3146740
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/R/c4a_table.R b/R/c4a_table.R
@@ -22,12 +22,16 @@ table_columns = function(type, show.scores) {
 		qn = c(qn, "chroma", "hues", "contrastWT", "contrastBK", "float")
 		qs = c(qs, "Cmax",  "HwidthLR", "CRwt", "CRbk", "Blues")
 		sn = c("HL", "HR", "Lmid")
-	} else {
-		# qn = c(qn, "nameable", "contrastWT", "contrastBK", "contrast", "float")
-		# qs = c(qs, "nameability", "CRwt", "CRbk", "CRmin", "Blues")
+	} else if (type == "cat") {
 		qn = c(qn, "hues", "chroma", "contrastWT", "contrastBK", "equiluminance", "float", "nameable")
 		qs = c(qs, "Hspread", "Cmax", "CRwt", "CRbk", "CRmin", "Blues", "nameability")
 		sn = character(0)
+	} else if (type == "bivc") {
+		qn = c(qn, "chroma", "contrastWT", "contrastBK", "equiluminance", "float", "nameable")
+		qs = c(qs, "Cmax", "CRwt", "CRbk", "CRmin", "Blues", "nameability")
+		sn = character(0)
+	} else {
+		stop("Unknown type")
 	}
 
 

diff --git a/R/onLoad.R b/R/onLoad.R
@@ -193,17 +193,17 @@ do_cellspec = function(lst) {
 
 		types = c("Categorical" = "cat",
 				  "Sequential" = "seq",
-				  "Cyclic" = "cyc",
 				  "Diverging" = "div",
+				  "Cyclic" = "cyc",
 				  "Bivariate (sequential x sequential)" = "bivs",
 				  "Bivariate (sequential x categorical)" = "bivc",
 				  "Bivariate (sequential x diverging)" = "bivd",
 				  "Bivariate (sequential x desaturated)" = "bivg")
 
 		types1 = c("Categorical" = "cat",
 				   "Sequential" = "seq",
-				   "Cyclic" = "cyc",
 				   "Diverging" = "div",
+				   "Cyclic" = "cyc",
 				   "Bivariate" = "biv")
 
 		types2 = list(biv = c("Sequential x sequential" = "bivs",