sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34581 from obrix/fix_qgsfeaturefiltermodel_updateCompleter_sync

Browse Source 
Small rework on QgsFeatureFilterModel
This commit is contained in:
Matthias Kuhn 2020-02-24 16:28:34 +01:00 committed by GitHub
commit 3f10d8d56c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/qgsfeaturefiltermodel.cpp
View File

@ -225,6 +225,12 @@ QVariant QgsFeatureFilterModel::data( const QModelIndex &index, int role ) const
void QgsFeatureFilterModel::updateCompleter()
{
emit beginUpdate();
if ( !mGatherer )
{
emit endUpdate();
return;
}
QVector<Entry> entries = mGatherer->entries();
if ( mExtraIdentifierValueIndex == -1 )
@ -335,6 +341,8 @@ void QgsFeatureFilterModel::updateCompleter()
emit filterJobCompleted();
}
emit endUpdate();
gathererThreadFinished();
}
void QgsFeatureFilterModel::gathererThreadFinished()
@ -356,7 +364,6 @@ void QgsFeatureFilterModel::scheduledReload()
// Send the gatherer thread to the graveyard:
// forget about it, tell it to stop and delete when finished
disconnect( mGatherer, &QgsFieldExpressionValuesGatherer::collectedValues, this, &QgsFeatureFilterModel::updateCompleter );
disconnect( mGatherer, &QgsFieldExpressionValuesGatherer::finished, this, &QgsFeatureFilterModel::gathererThreadFinished );
connect( mGatherer, &QgsFieldExpressionValuesGatherer::finished, mGatherer, &QgsFieldExpressionValuesGatherer::deleteLater );
mGatherer->stop();
wasLoading = true;
@ -408,7 +415,6 @@ void QgsFeatureFilterModel::scheduledReload()
mGatherer->setData( mShouldReloadCurrentFeature );
connect( mGatherer, &QgsFieldExpressionValuesGatherer::collectedValues, this, &QgsFeatureFilterModel::updateCompleter );
connect( mGatherer, &QgsFieldExpressionValuesGatherer::finished, this, &QgsFeatureFilterModel::gathererThreadFinished );
mGatherer->start();
if ( !wasLoading )