change suggested types

JohnnyDoorn · Jun 13, 2024 · 3fb6da9 · 3fb6da9
1 parent 67dbdb5
commit 3fb6da9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/inst/qml/Correlation.qml b/inst/qml/Correlation.qml
@@ -27,8 +27,8 @@ Form
 	{
 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
 		AvailableVariablesList{  name: "allVariablesList" }
-		AssignedVariablesList {  name: "variables";				title: qsTr("Variables");	 suggestedColumns: ["ordinal", "scale"] }
-		AssignedVariablesList {  name: "partialOutVariables"; title: qsTr("Partial out"); suggestedColumns: ["ordinal", "scale"] }
+		AssignedVariablesList {  name: "variables";				title: qsTr("Variables"); allowedColumns: ["scale", "ordinal"] }
+		AssignedVariablesList {  name: "partialOutVariables"; title: qsTr("Partial out"); allowedColumns: ["scale"] }
 	}
 
 	Group

diff --git a/inst/qml/CorrelationBayesian.qml b/inst/qml/CorrelationBayesian.qml
@@ -27,7 +27,7 @@ Form
 	{
 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
 		AvailableVariablesList	{	name: "allVariablesList" }
-		AssignedVariablesList	{	name: "variables"; suggestedColumns: ["ordinal", "scale"] }
+		AssignedVariablesList	{	name: "variables"; allowedColumns: ["scale", "ordinal"] }
 	}
 
 	Group

diff --git a/inst/qml/RegressionLinear.qml b/inst/qml/RegressionLinear.qml
@@ -37,7 +37,7 @@ Form
 	VariablesForm
 	{
 		AvailableVariablesList { name: "allVariablesList" }
-		AssignedVariablesList { name: "dependent";	title: qsTr("Dependent Variable");	suggestedColumns: ["scale"]; singleVariable: true;		}
+		AssignedVariablesList { name: "dependent";	title: qsTr("Dependent Variable");	allowedColumns: ["scale"]; singleVariable: true;		}
 		DropDown
 		{
 			name: "method"
@@ -50,7 +50,7 @@ Form
 			]
 		}
 		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["ordinal", "scale"]					}
-		AssignedVariablesList { name: "factors";	title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"];	}
+		AssignedVariablesList { name: "factors";	title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"]; minLevels: 2}
 		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"]; singleVariable: true			}
 	}
 

diff --git a/inst/qml/RegressionLinearBayesian.qml b/inst/qml/RegressionLinearBayesian.qml
@@ -32,9 +32,9 @@ Form {
 	VariablesForm
 	{
 		AvailableVariablesList	{ name: "allVariablesList" }
-		AssignedVariablesList	{ name: "dependent";	title: qsTr("Dependent Variable");		suggestedColumns: ["scale"];	singleVariable: true	}
-		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				suggestedColumns: ["scale"];	allowedColumns: ["scale"]}
-		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	suggestedColumns: ["scale"];	singleVariable: true	}
+		AssignedVariablesList	{ name: "dependent";	title: qsTr("Dependent Variable");		allowedColumns: ["scale"];	singleVariable: true	}
+		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"]}
+		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];	singleVariable: true	}
 	}
 
 	BayesFactorType {}

diff --git a/inst/qml/RegressionLogistic.qml b/inst/qml/RegressionLogistic.qml
@@ -35,7 +35,7 @@ Form
 	VariablesForm
 	{
 		AvailableVariablesList { name: "allVariablesList" }		
-        AssignedVariablesList { name: "dependent";	title: qsTr("Dependent Variable");	suggestedColumns: ["ordinal", "nominal"]; singleVariable: true	}
+        AssignedVariablesList { name: "dependent";	title: qsTr("Dependent Variable");	allowedColumns: ["nominal"]; singleVariable: true	}
 		DropDown
 		{
 			name: "method"
@@ -47,9 +47,9 @@ Form
 				{ label: qsTr("Stepwise"),	value: "stepwise"}
 			]
 		}
-		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");			suggestedColumns: ["scale"]											}
-		AssignedVariablesList { name: "factors";	title: qsTr("Factors");				suggestedColumns: ["ordinal", "nominal"]	                        }
-		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)"); suggestedColumns: ["scale"]; singleVariable: true; debug: true	}
+		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");			allowedColumns: ["scale"]											}
+		AssignedVariablesList { name: "factors";	title: qsTr("Factors");				allowedColumns: ["ordinal", "nominal"], minLevels: 2                }
+		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)"); allowedColumns: ["scale"]; singleVariable: true; debug: true	}
 	}
 
 	Section

diff --git a/inst/qml/RegressionLogisticBayesian.qml b/inst/qml/RegressionLogisticBayesian.qml
@@ -27,8 +27,8 @@ Form {
 	{
 		AvailableVariablesList	{ name: "allVariablesList" }
 		AssignedVariablesList	{ name: "dependent";	title: qsTr("Dependent Variable");		allowedColumns: ["nominal"];	singleVariable: true		}
-		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["ordinal", "scale"];									}
-		AssignedVariablesList	{ name: "factors";		title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"]					}
+		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"]									}
+		AssignedVariablesList	{ name: "factors";		title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"], minLevels: 2  					}
 		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];					singleVariable: true		}
 	}