If no intialValuesSource, use defaultValue

Implements jasp-stats/INTERNAL-jasp#2661
jasp-stats · Oct 15, 2024 · 867877d · 867877d
1 parent cbb69cf
commit 867877d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/QMLComponents/controls/tableviewbase.cpp b/QMLComponents/controls/tableviewbase.cpp
@@ -166,13 +166,15 @@ void TableViewBase::setInitialValuesControl()
 		disconnect(_initialValuesControl->model(), &ListModel::termsChanged, _tableModel, &ListModelTableViewBase::initialValuesChanged);
 
 	QString initialValuesSourceName = initialValuesSource().toString();
+
 	if (!initialValuesSourceName.isEmpty() && form())
 	{
 		_initialValuesControl = qobject_cast<JASPListControl*>(form()->getControl(initialValuesSourceName));
 		addDependency(_initialValuesControl);
 		connect(_initialValuesControl->model(), &ListModel::termsChanged, _tableModel, &ListModelTableViewBase::initialValuesChanged);
-		_tableModel->initialValuesChanged();
 	}
+
+	_tableModel->initialValuesChanged(); //It could also be based on defaultValue https://github.com/jasp-stats/INTERNAL-jasp/issues/2661
 }
 
 void TableViewBase::rScriptDoneHandler(const QString & result)

diff --git a/QMLComponents/models/listmodelfiltereddataentry.cpp b/QMLComponents/models/listmodelfiltereddataentry.cpp
@@ -155,7 +155,15 @@ void ListModelFilteredDataEntry::initialValuesChanged()
 				_initialValues.push_back(value.toDouble());
 		}
 	}
-
+	else if(_tableView->initialValuesSource().toString().isEmpty())
+	{
+		int			rowCount		= requestInfo(VariableInfo::DataSetRowCount).toInt();
+		QVariant	defaultValue	= _tableView->defaultValue();
+		bool		isDbl			= false;
+		double		dblVal			= defaultValue.toDouble(&isDbl);
+		if(isDbl)
+					_initialValues	= doublevec(rowCount, dblVal);
+	}
 	fillTable();
 }