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

Use QMutexLocker

Browse Source
This commit is contained in:
Nyall Dawson 2019-11-29 09:55:17 +10:00
parent fc64c3fa3c
commit 8878e9b30b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/pal/pal.cpp
View File

@ -266,7 +266,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
QStringList layersWithFeaturesInBBox;
mMutex.lock();
QMutexLocker palLocker( &mMutex );
for ( const auto &it : mLayers )
{
Layer *layer = it.second.get();
@ -286,7 +286,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
layer->chopFeaturesAtRepeatDistance();
layer->mMutex.lock();
QMutexLocker locker( &layer->mMutex );
// find features within bounding box and generate candidates list
context.layer = layer;
@ -294,7 +294,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
// find obstacles within bounding box
layer->mObstacleIndex.Search( amin, amax, extractObstaclesCallback, static_cast< void * >( &obstacleContext ) );
layer->mMutex.unlock();
locker.unlock();
if ( context.features->size() - previousFeatureCount > 0 || obstacleContext.obstacleCount > previousObstacleCount )
{
@ -303,7 +303,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
previousFeatureCount = context.features->size();
previousObstacleCount = obstacleContext.obstacleCount;
}
mMutex.unlock();
palLocker.unlock();
prob->mLayerCount = layersWithFeaturesInBBox.size();
prob->labelledLayersName = layersWithFeaturesInBBox;