notice changes to values (#5692)

* notice changes to values fixes jasp-stats/INTERNAL-jasp#2659 (computed columns not cascading) * fix last bug and make code prettier
jasp-stats · Oct 10, 2024 · 8389216 · 8389216
1 parent bcc8a91
commit 8389216
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/CommonData/column.cpp b/CommonData/column.cpp
@@ -488,7 +488,8 @@ columnType Column::setValues(const stringvec & values, const stringvec & labels,
 
 	for(size_t i=0; i<values.size(); i++)
 	{
-		setValue(i, values[i], labels.size() ? labels[i] : "", false);
+		if(setValue(i, values[i], labels.size() ? labels[i] : "", false) && aChange)
+			(*aChange) = true;
 
 
 		if(values[i] != "" || (labels.size() && labels[i] != ""))

diff --git a/Desktop/data/datasetpackage.cpp b/Desktop/data/datasetpackage.cpp
@@ -2540,7 +2540,7 @@ Column * DataSetPackage::requestComputedColumnCreation(const std::string & colum
 
 bool DataSetPackage::requestColumnCreation(const std::string & columnName, Analysis * analysis, columnType type)
 {
-	if(DataSetPackage::pkg()->isColumnNameFree(columnName))
+	if(!DataSetPackage::pkg()->isColumnNameFree(columnName))
 		return false;
 
 	createComputedColumn(columnName, type, computedColumnType::analysisNotComputed, analysis);

diff --git a/QMLComponents/boundcontrols/boundcontrolbase.cpp b/QMLComponents/boundcontrols/boundcontrolbase.cpp
@@ -83,16 +83,17 @@ void BoundControlBase::handleComputedColumn(const Json::Value& value)
 		std::string			newName  = value.asString(),
 							orgName  = orgValue.asString();
 
-		if (newName.empty() && !orgName.empty())
-			emit _control->requestComputedColumnDestruction(orgName);
-
-		else if (newName != orgName)
+		if (newName != orgName)
 		{
-			if (_isComputedColumn)	emit _control->requestComputedColumnCreation(newName);
-			else					emit _control->requestColumnCreation(newName, _columnType);
-
 			if (!orgName.empty())
 				emit _control->requestComputedColumnDestruction(orgName);
+
+			if(!newName.empty())
+			{
+				if (_isComputedColumn)	emit _control->requestComputedColumnCreation(newName);
+				else					emit _control->requestColumnCreation(newName, _columnType);
+			}
+
 		}
 	}
 }

diff --git a/QMLComponents/controls/textinputbase.cpp b/QMLComponents/controls/textinputbase.cpp
@@ -214,7 +214,8 @@ void TextInputBase::setUp()
 
 void TextInputBase::setDisplayValue()
 {
-	setProperty("displayValue", _value);
+	if(property("displayValue") != _value)
+		setProperty("displayValue", _value);
 }
 
 void TextInputBase::rScriptDoneHandler(const QString &result)