From 13bb08a2c7214123533501f2e2465525deedad5d Mon Sep 17 00:00:00 2001
From: Johnny <j.b.vandoorn@uva.nl>
Date: Tue, 2 Apr 2024 13:24:49 +0200
Subject: [PATCH] add Brunos widget

---
 inst/qml/RegressionLinear.qml | 69 ++++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 10 deletions(-)

diff --git a/inst/qml/RegressionLinear.qml b/inst/qml/RegressionLinear.qml
index 33bc9704..9005ed84 100644
--- a/inst/qml/RegressionLinear.qml
+++ b/inst/qml/RegressionLinear.qml
@@ -55,21 +55,70 @@ Form
 	}
 
 
+	// Section
+	// {
+	// 	title: qsTr("Model")
+
+	// 	VariablesForm
+	// 	{
+	// 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
+	// 		AvailableVariablesList
+	// 		{
+	// 			name: "availableTerms"
+	// 			title: qsTr("Components")
+	// 			width: parent.width / 4
+	// 			source: ['covariates', 'factors']
+	// 		}
+	// 		ModelTermsList { width: parent.width * 5 / 9 }
+	// 	}
+
+	// 	CheckBox { name: "interceptTerm"; label: qsTr("Include intercept"); checked: true }
+	// }
+
 	Section
 	{
 		title: qsTr("Model")
 
-		VariablesForm
+		
+		// VariablesForm
+		// {
+		// 	preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
+		// 	AvailableVariablesList
+		// 	{
+		// 		title: "Available variables"
+		// 		name: "availableVariables"
+		// 		source: ['covariates', 'factors']
+
+		// 	}
+		// 	AssignedVariablesList
+		// 	{
+		// 		title: "Selected variables"
+		// 		name: "variables"
+		// 	}
+		// }
+
+		FactorsForm
 		{
-			preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
-			AvailableVariablesList
-			{
-				name: "availableTerms"
-				title: qsTr("Components")
-				width: parent.width / 4
-				source: ['covariates', 'factors']
-			}
-			ModelTermsList { width: parent.width * 5 / 9 }
+			id:					factors
+			name:				"modelTerms"
+			allowAll:			true
+			nested:				nested.checked
+			allowInteraction:	true
+			initNumberFactors:	2
+			baseName:			"model"
+			baseTitle:			"Model"
+			// availableVariablesList.source:		"variables"
+			availableVariablesList.source: ['covariates', 'factors']
+			startIndex:			0
+			availableVariablesListName: "availableTerms"
+		}
+
+		CheckBox
+		{
+			id:			nested
+			label:		"Nested"
+			name:		"nested"
+			checked:	true
 		}
 
 		CheckBox { name: "interceptTerm"; label: qsTr("Include intercept"); checked: true }