Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add geometry generator required fields to request
  • Loading branch information
m-kuhn committed Mar 11, 2019
1 parent 6eec3a7 commit 6b42ccb
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/core/qgspallabeling.cpp
Expand Up @@ -486,7 +486,16 @@ bool QgsPalLayerSettings::prepare( const QgsRenderContext &context, QSet<QString
mGeometryGeneratorExpression = QgsExpression( geometryGenerator );
mGeometryGeneratorExpression.prepare( &context.expressionContext() );
if ( mGeometryGeneratorExpression.hasParserError() )
{
QgsMessageLog::logMessage( QObject::tr( "Labeling" ), mGeometryGeneratorExpression.parserErrorString() );
return false;
}

const auto referencedColumns = mGeometryGeneratorExpression.referencedColumns();
for ( const QString &name : referencedColumns )
{
attributeNames.insert( name );
}
}

return true;
Expand Down Expand Up @@ -1601,7 +1610,7 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext
std::unique_ptr<QgsGeometry> scopedClonedGeom;
if ( simplifyMethod.simplifyHints() != QgsVectorSimplifyMethod::NoSimplification && simplifyMethod.forceLocalOptimization() )
{
int simplifyHints = simplifyMethod.simplifyHints() | QgsMapToPixelSimplifier::SimplifyEnvelope;
unsigned int simplifyHints = simplifyMethod.simplifyHints() | QgsMapToPixelSimplifier::SimplifyEnvelope;
QgsMapToPixelSimplifier::SimplifyAlgorithm simplifyAlgorithm = static_cast< QgsMapToPixelSimplifier::SimplifyAlgorithm >( simplifyMethod.simplifyAlgorithm() );
QgsGeometry g = geom;
QgsMapToPixelSimplifier simplifier( simplifyHints, simplifyMethod.tolerance(), simplifyAlgorithm );
Expand Down

0 comments on commit 6b42ccb

Please sign in to comment.