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

move QgsSpatialIndex to stack and fix QList check

Browse Source
This commit is contained in:
root676 2019-11-24 13:25:46 +01:00 committed by Nyall Dawson
parent a7ffa9ff31
commit 948ea41656
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/analysis/processing/qgsalgorithmrandompointsextent.cpp
View File

@ -83,11 +83,11 @@ QgsRandomPointsExtentAlgorithm *QgsRandomPointsExtentAlgorithm::createInstance()
bool QgsRandomPointsExtentAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback * )
{
QgsCoordinateReferenceSystem extent_crs = parameterAsExtentCrs( parameters, QStringLiteral( "EXTENT" ), context);
QgsCoordinateReferenceSystem extent_crs = parameterAsExtentCrs( parameters, QStringLiteral( "EXTENT" ), context );
QgsCoordinateReferenceSystem user_crs = parameterAsCrs( parameters, QStringLiteral( "TARGET_CRS" ), context );
//prefer user crs over extent/project crs if defined
if( extent_crs != user_crs )
if ( extent_crs != user_crs )
mCrs = user_crs;
else
mCrs = extent_crs;
@ -140,7 +140,7 @@ QVariantMap QgsRandomPointsExtentAlgorithm::processAlgorithm( const QVariantMap
}
else
{
std::unique_ptr<QgsSpatialIndex> index( new QgsSpatialIndex() );
QgsSpatialIndex index = QgsSpatialIndex();
int distCheckIterations = 0;
int i = 0;
@ -155,13 +155,13 @@ QVariantMap QgsRandomPointsExtentAlgorithm::processAlgorithm( const QVariantMap
QgsGeometry randomPointGeom = QgsGeometry( new QgsPoint( rx, ry ) );
//check if new random point is inside searching distance to existing points
QList<QgsFeatureId> neighbors = index->nearestNeighbor( randomPointGeom, 1, mDistance );
if ( neighbors.size() == 0 )
QList<QgsFeatureId> neighbors = index.nearestNeighbor( randomPointGeom, 1, mDistance );
if ( neighbors.empty() )
{
QgsFeature f = QgsFeature( i );
f.setAttributes( QgsAttributes() << i );
f.setGeometry( randomPointGeom );
index->addFeature( f );
index.addFeature( f );
sink->addFeature( f, QgsFeatureSink::FastInsert );
i++;
distCheckIterations = 0; //reset distCheckIterations if a point is added