Handle also paired variablesList (#5721)

* Handle also paired variablesList The Bain Paired T-Tests is in preloadData mode, and should work. * Update jaspTestModule * Update QMLComponents/boundcontrols/boundcontrolmultiterms.cpp Co-authored-by: Joris Goosen <Joris@JorisGoosen.nl> --------- Co-authored-by: Joris Goosen <Joris@JorisGoosen.nl>
jasp-stats · Oct 29, 2024 · 70509f4 · 70509f4
1 parent ddee9ba
commit 70509f4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/Common/jaspColumnEncoder b/Common/jaspColumnEncoder
diff --git a/Modules/jaspTestModule b/Modules/jaspTestModule
diff --git a/QMLComponents/boundcontrols/boundcontrolmultiterms.cpp b/QMLComponents/boundcontrols/boundcontrolmultiterms.cpp
@@ -27,11 +27,13 @@ BoundControlMultiTerms::BoundControlMultiTerms(ListModelMultiTermsAssigned* list
 
 void BoundControlMultiTerms::bindTo(const Json::Value& value)
 {
-	BoundControlBase::bindTo(value);
+	Json::Value adjustedValue = _isValueWithTypes(value) ? value["value"] : value;
+
+	BoundControlBase::bindTo(adjustedValue);
 
 	std::vector<std::vector<std::string> > values;
 
-	for (const Json::Value& rowJson : value)
+	for (const Json::Value& rowJson : adjustedValue)
 	{
 		std::vector<std::string> rowValues;
 		if (rowJson.isArray())
@@ -54,7 +56,7 @@ Json::Value BoundControlMultiTerms::createJson() const
 
 bool BoundControlMultiTerms::isJsonValid(const Json::Value &optionValue) const
 {
-	return optionValue.type() == Json::arrayValue;
+	return optionValue.type() == Json::arrayValue || optionValue.type() == Json::objectValue;
 }
 
 void BoundControlMultiTerms::resetBoundValue()
@@ -71,3 +73,37 @@ void BoundControlMultiTerms::resetBoundValue()
 
 	setBoundValue(boundValue);
 }
+
+void BoundControlMultiTerms::setBoundValue(const Json::Value &value, bool emitChanges)
+{
+	Json::Value newValue;
+
+	if (_control->encodeValue())
+	{
+		if (_isValueWithTypes(value))
+			newValue = value;
+		else
+		{
+			// Else we are loading from a jasp version before "preloadData" was on or var.types were added to the options
+			Json::Value types(Json::arrayValue);
+			std::string type =  columnTypeToString(_listModel->listView()->defaultType());
+			for (const Json::Value& row : value)
+			{
+				Json::Value rowType(Json::arrayValue);
+				if (row.isString())
+					rowType.append(type);
+				else if (row.isArray())
+				{
+					for (int i = 0; i < row.size(); i++)
+						rowType.append(type);
+				}
+				types.append(rowType);
+			}
+			newValue["value"] = value;
+			newValue["types"] = types;
+		}
+	}
+
+	BoundControlBase::setBoundValue(newValue.isNull() ? value : newValue, emitChanges);
+
+}
diff --git a/QMLComponents/boundcontrols/boundcontrolmultiterms.h b/QMLComponents/boundcontrols/boundcontrolmultiterms.h
@@ -28,10 +28,11 @@ class BoundControlMultiTerms : public BoundControlBase
 public:
 	BoundControlMultiTerms(ListModelMultiTermsAssigned* listModel);
 
-	bool		isJsonValid(const Json::Value& optionValue) const	override;
-	Json::Value	createJson()								const	override;
-	void		bindTo(const Json::Value &value)					override;
-	void		resetBoundValue()									override;
+	bool		isJsonValid(const Json::Value& optionValue)							const	override;
+	Json::Value	createJson()														const	override;
+	void		bindTo(const Json::Value &value)											override;
+	void		resetBoundValue()															override;
+	void		setBoundValue(const Json::Value &value, bool emitChanges = true)			override;
 
 
 private:
+1 −5		R/testEncoding.R
+2 −2		inst/Description.qml
+24 −0		inst/qml/testEncoding.qml