Skip to content

Commit f434cfc

Browse files
committed
If no intialValuesSource, use defaultValue
Implements jasp-stats/INTERNAL-jasp#2661
1 parent 9e4e5f5 commit f434cfc

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

QMLComponents/controls/tableviewbase.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,15 @@ void TableViewBase::setInitialValuesControl()
166166
disconnect(_initialValuesControl->model(), &ListModel::termsChanged, _tableModel, &ListModelTableViewBase::initialValuesChanged);
167167

168168
QString initialValuesSourceName = initialValuesSource().toString();
169+
169170
if (!initialValuesSourceName.isEmpty() && form())
170171
{
171172
_initialValuesControl = qobject_cast<JASPListControl*>(form()->getControl(initialValuesSourceName));
172173
addDependency(_initialValuesControl);
173174
connect(_initialValuesControl->model(), &ListModel::termsChanged, _tableModel, &ListModelTableViewBase::initialValuesChanged);
174-
_tableModel->initialValuesChanged();
175175
}
176+
177+
_tableModel->initialValuesChanged(); //It could also be based on defaultValue https://github.com/jasp-stats/INTERNAL-jasp/issues/2661
176178
}
177179

178180
void TableViewBase::rScriptDoneHandler(const QString & result)

QMLComponents/models/listmodelfiltereddataentry.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,15 @@ void ListModelFilteredDataEntry::initialValuesChanged()
155155
_initialValues.push_back(value.toDouble());
156156
}
157157
}
158-
158+
else if(_tableView->initialValuesSource().toString().isEmpty())
159+
{
160+
int rowCount = requestInfo(VariableInfo::DataSetRowCount).toInt();
161+
QVariant defaultValue = _tableView->defaultValue();
162+
bool isDbl = false;
163+
double dblVal = defaultValue.toDouble(&isDbl);
164+
if(isDbl)
165+
_initialValues = doublevec(rowCount, dblVal);
166+
}
159167
fillTable();
160168
}
161169

0 commit comments

Comments
 (0)