Skip to content

Commit

Permalink
small tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
JorisGoosen committed Jan 15, 2025
1 parent 497bde8 commit 81b760f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions QMLComponents/analysisform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ void AnalysisForm::addColumnControl(JASPControl* control, bool isComputed)
{
if (isComputed)
{
connect(control, &JASPControl::requestComputedColumnCreation, _analysis, &AnalysisBase::requestComputedColumnCreationHandler, Qt::QueuedConnection);
connect(control, &JASPControl::requestComputedColumnDestruction, _analysis, &AnalysisBase::requestComputedColumnDestructionHandler, Qt::QueuedConnection);
connect(control, &JASPControl::requestComputedColumnCreation, _analysis, &AnalysisBase::requestComputedColumnCreationHandler);
connect(control, &JASPControl::requestComputedColumnDestruction, _analysis, &AnalysisBase::requestComputedColumnDestructionHandler);
}
else
connect(control, &JASPControl::requestColumnCreation, _analysis, &AnalysisBase::requestColumnCreationHandler);
Expand Down
4 changes: 2 additions & 2 deletions QMLComponents/models/listmodelfiltereddataentry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void ListModelFilteredDataEntry::runFilter()

void ListModelFilteredDataEntry::filterDoneHandler(const QString &name, const QString & error)
{
if(name.toStdString() != _filterName)
if(name.toStdString() != _filter->name())
return;

Log::log() << "ListModelFilteredDataEntry::filterDoneHandler for " << name << " and error '" << error << "'" << std::endl;
Expand Down Expand Up @@ -224,7 +224,7 @@ void ListModelFilteredDataEntry::fillTable()
_tableTerms.rowNames.clear();
_tableTerms.values.clear();

if (_filter)
if(_filter)
_filter->checkForUpdates();

size_t dataRows = _filter && _filter->filtered().size() > 0 ? _filter->filtered().size() : getDataSetRowCount();
Expand Down

0 comments on commit 81b760f

Please sign in to comment.