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

Extract loc->isindexing from indexprepared

Browse Source
This commit is contained in:
Julien Cabieces 2019-10-30 10:55:37 +01:00
parent d246d9f593
commit d0e26fb3bc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/qgssnappingutils.cpp
View File

@ -68,7 +68,7 @@ QgsPointLocator *QgsSnappingUtils::locatorForLayerUsingStrategy( QgsVectorLayer
QgsPointLocator *loc = locatorForLayer( vl ); QgsPointLocator *loc = locatorForLayer( vl );
if ( isIndexPrepared( loc, aoi ) ) if ( loc->isIndexing() || isIndexPrepared( loc, aoi ) )
return loc; return loc;
else else
return temporaryLocatorForLayer( vl, pointMap, tolerance ); return temporaryLocatorForLayer( vl, pointMap, tolerance );
@ -91,9 +91,6 @@ QgsPointLocator *QgsSnappingUtils::temporaryLocatorForLayer( QgsVectorLayer *vl,
bool QgsSnappingUtils::isIndexPrepared( QgsPointLocator *loc, const QgsRectangle &areaOfInterest ) bool QgsSnappingUtils::isIndexPrepared( QgsPointLocator *loc, const QgsRectangle &areaOfInterest )
{ {
if ( loc->isIndexing() )
return true;
if ( mStrategy == IndexAlwaysFull && loc->hasIndex() ) if ( mStrategy == IndexAlwaysFull && loc->hasIndex() )
return true; return true;
@ -374,7 +371,7 @@ void QgsSnappingUtils::prepareIndex( const QList<LayerAndAreaOfInterest> &layers
QgsPointLocator *loc = locatorForLayer( vl ); QgsPointLocator *loc = locatorForLayer( vl );
if ( !isIndexPrepared( loc, entry.second ) ) if ( !loc->isIndexing() && !isIndexPrepared( loc, entry.second ) )
layersToIndex << entry; layersToIndex << entry;
} }
if ( !layersToIndex.isEmpty() ) if ( !layersToIndex.isEmpty() )