sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-30 00:29:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

spelling

Browse Source
This commit is contained in:
Alessandro Pasotti 2022-01-06 15:05:29 +01:00
parent fb7b3e0569
commit 055a02c069
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/expression/qgsexpressionfunction.cpp
View File

@ -6653,7 +6653,7 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
// Ninth parameter (for intersects only) is the sort_by_intersection_size flag
double minOverlap { -1 };
double minInscribedCircleRadius { -1 };
bool returnDetails = false;
bool returnDetails = false; //#spellok
bool sortByMeasure = false;
bool sortAscending = false;
bool requireMeasures = false;
@ -6680,13 +6680,13 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
#endif
node = QgsExpressionUtils::getNode( values.at( 7 ), parent );
// Return measures is only effective when an expression is set
returnDetails = !testOnly && node->eval( parent, context ).toBool();
returnDetails = !testOnly && node->eval( parent, context ).toBool(); //#spellok
node = QgsExpressionUtils::getNode( values.at( 8 ), parent );
// Sort by measures is only effective when an expression is set
const QString sorting { node->eval( parent, context ).toString().toLower() };
sortByMeasure = !testOnly && ( sorting.startsWith( "asc" ) || sorting.startsWith( "des" ) );
sortAscending = sorting.startsWith( "asc" );
requireMeasures = sortByMeasure || returnDetails;
requireMeasures = sortByMeasure || returnDetails; //#spellok
overlapOrRadiusFilter = minInscribedCircleRadius != -1 || minOverlap != -1;
}
@ -7042,7 +7042,7 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
results.erase( results.begin() + limit );
}
if ( ! returnDetails )
if ( ! returnDetails ) //#spellok
{
QVariantList expResults;
for ( auto it = results.constBegin(); it != results.constEnd(); ++it )