More

Author: boutinb

Engine/jaspBase

@@ -310,6 +310,9 @@ QString AnalysisForm::msgsListToString(const QStringList & list) const
 	if(list.length() == 0)
 		return "";
 
+	if (list.size() == 1)
+		return list[0];
+
 	QString text;
 	for (const QString & msg : list)
 		if(msg.size())

Modules/jaspAnova

@@ -73,7 +73,7 @@ bool BoundControlLayers::isJsonValid(const Json::Value &optionValue) const
 			{
 				const Json::Value& nameOption = value["name"];
 				const Json::Value& variablesOption = value["variables"];
-				valid = nameOption.type() == Json::stringValue && variablesOption.type() == Json::arrayValue;
+				valid = nameOption.type() == Json::stringValue && (variablesOption.type() == Json::arrayValue || variablesOption.type() == Json::stringValue);
 
 				if (!valid)
 					break;

Modules/jaspDescriptives

@@ -284,8 +284,11 @@ Terms BoundControlTerms::_getTermsFromOptions(const Json::Value& option) const
 	if (valueOption.isArray())
 	{
 		int i = 0;
-		for (const Json::Value& jsonValue : valueOption)
+		for (Json::Value jsonValue : valueOption)
 		{
+			if (jsonValue.isObject() && jsonValue.isMember(_optionKey))
+				jsonValue = jsonValue[_optionKey];
+
 			const Json::Value& jsonType = typesOption.size() > i ? typesOption[i] : Json::nullValue;
 			if (jsonValue.isArray())
 			{

Modules/jaspFactor

@@ -30,6 +30,7 @@ FactorsFormBase::FactorsFormBase(QQuickItem *parent)
 	_useControlMouseArea	= false;
 	_containsVariables		= true;
 	_mayUseFormula			= false;
+	_useTermsInRSyntax		= false;
 }
 
 void FactorsFormBase::setUpModel()
@@ -48,61 +49,38 @@ void FactorsFormBase::setUpModel()
 void FactorsFormBase::bindTo(const Json::Value& value)
 {
 	ListModelFactorsForm::FactorVec factors;
-	Json::Value updatedValue = value; // If the value has no types, then we need to update it.
 
-	for (Json::Value& factor : updatedValue)
+	for (const Json::Value& factor : value)
 	{
-		Json::Value types(Json::arrayValue);
-		if (factor.isMember("types"))
-		{
-			if (factor["types"].isArray())
-				types = factor["types"];
-			else if (factor["types"].isString())
-				types.append(factor["types"].asString());
-		}
-		int i = 0;
-
 		Terms initTerms;
-		for (const Json::Value& termsJson : factor[fq(_optionKey)])
+		for (const Json::Value& termJson : factor[fq(_optionKey)])
 		{
 			std::vector<std::string> components;
 
-			if (termsJson.isArray())
+			if (termJson.isArray())
 			{
 				// For interaction, each term is an array of strings
-				for (const Json::Value& elt : termsJson)
+				for (const Json::Value& elt : termJson)
 					if (elt.isString())
 						components.push_back(elt.asString());
 			}
-			else if (termsJson.isString())
+			else if (termJson.isString())
 				// If not, each term is just a string
-				components.push_back(termsJson.asString());
+				components.push_back(termJson.asString());
 
 			if (components.size() > 0)
 			{
-				Term term(components);
-				columnType type = columnType::unknown;
-				if (types.size() <= i)
-				{
-					if (components.size() == 1)
-						type = model()->getVariableRealType(tq(components[0]));
-					types.append(columnTypeToString(type));
-				}
-				else
-				{
-					type = columnTypeFromString(types[i].asString());
-					term.setType(type);
-				}
+				columnTypeVec types;
+				for (const std::string& component : components)
+					types.push_back(model()->getVariableRealType(tq(component)));
+				Term term(components, types);
 				initTerms.add(term);
 			}
-
-			i++;
 		}
-		factor["types"] = types;
 		factors.push_back(ListModelFactorsForm::Factor(tq(factor["name"].asString()), tq(factor["title"].asString()), initTerms));
 	}
 
-	BoundControlBase::bindTo(updatedValue);
+	BoundControlBase::bindTo(value);
 
 	_factorsModel->initFactors(factors);
 }
@@ -117,7 +95,6 @@ Json::Value FactorsFormBase::createJson() const
 		row["name"] = fq(baseName() + QString::number(i + startIndex()));
 		row["title"] = fq(baseTitle() + " " + QString::number(i + startIndex()));
 		row[fq(_optionKey)] = Json::Value(Json::arrayValue);
-		row["types"] = Json::Value(Json::arrayValue);
 
 		result.append(row);
 	}
@@ -158,7 +135,6 @@ void FactorsFormBase::termsChangedHandler()
 		factorJson["name"] = fq(factor.name);
 		factorJson["title"] = fq(factor.title);
 		Json::Value termsJson(Json::arrayValue);
-		Json::Value typesJson(Json::arrayValue);
 
 		for (const Term &term : factor.listView ? factor.listView->model()->terms() : factor.initTerms)
 		{
@@ -171,10 +147,8 @@ void FactorsFormBase::termsChangedHandler()
 			else
 				termJson = term.asString();
 			termsJson.append(termJson);
-			typesJson.append(columnTypeToString(term.type()));
 		}
 		factorJson[fq(_optionKey)] = termsJson;
-		factorJson["types"] = typesJson;
 		boundValue.append(factorJson);
 	}
 

Modules/jaspMixedModels

@@ -122,7 +122,9 @@ class JASPListControl : public JASPControl
 	const QStringList			&	allowedColumns()					const	{ return _allowedColumns;		}
 	QStringList						allowedColumnsIcons()				const;
 	bool							mayUseFormula()						const	{ return _mayUseFormula;		}
+	bool							useTermsInRSyntax()					const	{ return _useTermsInRSyntax;	}
 	void							setMayUseFormula(bool use)					{ _mayUseFormula = use;			}
+	void							setUseTermsInRSyntax(bool use)				{ _useTermsInRSyntax = use;		}
 
 signals:
 			void					modelChanged();
@@ -204,7 +206,8 @@ protected slots:
 							_addAvailableVariablesToAssigned	= false,
 							_allowAnalysisOwnComputedColumns	= true,
 							_allowTypeChange					= false,
-							_mayUseFormula						= true;
+							_mayUseFormula						= true,
+							_useTermsInRSyntax					= true;
 
 	int						_maxRows							= -1,
 							_minNumericLevels					= -1,

Modules/jaspRegression

@@ -126,6 +126,7 @@ void VariablesListBase::setUpModel()
 		auto *	layersModel		= new ListModelLayersAssigned(this);
 				_boundControl	= new BoundControlLayers(layersModel);
 				_draggableModel = layersModel;
+				_useTermsInRSyntax = false;
 		break;
 	}
 

Modules/jaspTTests

@@ -32,6 +32,7 @@ void ListModelLayersAssigned::initLayers(const std::vector<std::vector<std::stri
 {
 	beginResetModel();
 
+	_variables.clear();
 	for (const std::vector<std::string>& variables : allVariables)
 	{
 		QList<QString> layer;

QMLComponents/analysisform.cpp

@@ -63,10 +63,8 @@ Terms FormulaParser::parseTerm(QString termStr)
 			parsedComponents.push_back(pair.first);
 			types.push_back(pair.second);
 		}
-		Term term(parsedComponents);
-		term.setTypes(types);
 
-		return term;
+		return Term(parsedComponents, types);
 	};
 
 	Terms result;

QMLComponents/boundcontrols/boundcontrollayers.cpp

@@ -500,9 +500,20 @@ FormulaParser::ParsedTerms FormulaSource::_fillOptionsWithFixedTerms(ListModel*
 			continue;
 		}
 		bool found = false;
-		Terms terms;
+		Terms terms, termsToSearch;
 		terms.add(parsedTerm);
-		Terms termsToSearch = isInteractionModel ? Terms(parsedTerm.components()) : terms;
+		if (isInteractionModel)
+		{
+			int i = 0;
+			for (const QString component : parsedTerm.components())
+			{
+				columnType type = parsedTerm.types().size() > i ? parsedTerm.types()[i] : columnType::unknown;
+				termsToSearch.add(Term(component, type));
+				i++;
+			}
+		}
+		else
+			 termsToSearch = terms;
 
 		if (termsToSearch.size() == 0) continue;
 

QMLComponents/boundcontrols/boundcontrolterms.cpp

@@ -129,7 +129,7 @@ QString RSyntax::generateSyntax(bool showAllOptions, bool useHtml) const
 				result += "," + newLine + indent + getRSyntaxFromControlName(control) + " = ";
 
 				JASPListControl* listControl = qobject_cast<JASPListControl*>(control);
-				if (listControl && !listControl->hasRowComponent() && listControl->containsVariables() && listControl->controlType() != JASPControl::ControlType::FactorsForm)
+				if (listControl && !listControl->hasRowComponent() && listControl->containsVariables() && listControl->useTermsInRSyntax())
 					result += _transformInteractionTerms(listControl->model());
 				else
 					result += transformJsonToR(foundValue);