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

Merge pull request #8705 from arnaud-morvan/server_diagrams_filter

Browse Source 
Apply featureFilterProvider in QgsVectorLayerDiagramProvider
This commit is contained in:
Matthias Kuhn 2019-01-10 18:02:36 +01:00 committed by GitHub
commit fd00cd54fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/core/auto_generated/qgsmaprendererjob.sip.in
View File

@ -183,6 +183,7 @@ emitted when asynchronous rendering is finished (or canceled).
};

19
src/core/qgsmaprenderercustompainterjob.cpp
View File

@ -295,12 +295,12 @@ void QgsMapRendererCustomPainterJob::doRender()
mLabelJob.img->fill( 0 );
painter.begin( mLabelJob.img );
mLabelJob.context.setPainter( &painter );
drawLabeling( mSettings, mLabelJob.context, mLabelingEngineV2.get(), &painter );
drawLabeling( mLabelJob.context, mLabelingEngineV2.get(), &painter );
painter.end();
}
else
{
drawLabeling( mSettings, mLabelJob.context, mLabelingEngineV2.get(), mPainter );
drawLabeling( mLabelJob.context, mLabelingEngineV2.get(), mPainter );
}
mLabelJob.complete = true;
@ -318,8 +318,7 @@ void QgsMapRendererCustomPainterJob::doRender()
QgsDebugMsgLevel( "Rendering completed in (seconds): " + QString( "%1" ).arg( renderTime.elapsed() / 1000.0 ), 2 );
}
void QgsMapRendererJob::drawLabeling( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
void QgsMapRendererJob::drawLabeling( QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
{
QgsDebugMsgLevel( QStringLiteral( "Draw labeling start" ), 5 );
@ -329,22 +328,22 @@ void QgsMapRendererJob::drawLabeling( const QgsMapSettings &settings, QgsRenderC
// Reset the composition mode before rendering the labels
painter->setCompositionMode( QPainter::CompositionMode_SourceOver );
// TODO: this is not ideal - we could override rendering stopped flag that has been set in meanwhile
renderContext = QgsRenderContext::fromMapSettings( settings );
renderContext.setPainter( painter );
if ( labelingEngine2 )
{
// set correct extent
renderContext.setExtent( settings.visibleExtent() );
renderContext.setCoordinateTransform( QgsCoordinateTransform() );
labelingEngine2->run( renderContext );
}
QgsDebugMsg( QStringLiteral( "Draw labeling took (seconds): %1" ).arg( t.elapsed() / 1000. ) );
}
void QgsMapRendererJob::drawLabeling( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
{
Q_UNUSED( settings );
drawLabeling( renderContext, labelingEngine2, painter );
}
bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer *ml )
{

1
src/core/qgsmaprendererjob.cpp
View File

@ -358,6 +358,7 @@ LabelRenderJob QgsMapRendererJob::prepareLabelingJob( QPainter *painter, QgsLabe
job.context.setPainter( painter );
job.context.setLabelingEngine( labelingEngine2 );
job.context.setExtent( mSettings.visibleExtent() );
job.context.setFeatureFilterProvider( mFeatureFilterProvider );
// if we can use the cache, let's do it and avoid rendering!
bool hasCache = canUseLabelCache && mCache && mCache->hasCacheImage( LABEL_CACHE_ID );

8
src/core/qgsmaprendererjob.h
View File

@ -286,8 +286,14 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
*/
void cleanupLabelJob( LabelRenderJob &job ) SIP_SKIP;
/**
* \note not available in Python bindings
* \deprecated Will be removed in QGIS 4.0
*/
Q_DECL_DEPRECATED static void drawLabeling( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter ) SIP_SKIP;
//! \note not available in Python bindings
static void drawLabeling( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter ) SIP_SKIP;
static void drawLabeling( QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter ) SIP_SKIP;
private:

2
src/core/qgsmaprendererparalleljob.cpp
View File

@ -297,7 +297,7 @@ void QgsMapRendererParallelJob::renderLabelsStatic( QgsMapRendererParallelJob *s
// draw the labels!
try
{
drawLabeling( self->mSettings, job.context, self->mLabelingEngineV2.get(), &painter );
drawLabeling( job.context, self->mLabelingEngineV2.get(), &painter );
}
catch ( QgsException &e )
{

6
src/core/qgsvectorlayerdiagramprovider.cpp
View File

@ -78,9 +78,13 @@ QList<QgsLabelFeature *> QgsVectorLayerDiagramProvider::labelFeatures( QgsRender
QgsFeatureRequest request;
request.setFilterRect( layerExtent );
request.setSubsetOfAttributes( attributeNames, mFields );
const QgsFeatureFilterProvider *featureFilterProvider = context.featureFilterProvider();
if ( featureFilterProvider )
{
featureFilterProvider->filterFeatures( qobject_cast<QgsVectorLayer *>( mLayer ), request );
}
QgsFeatureIterator fit = mSource->getFeatures( request );
QgsFeature fet;
while ( fit.nextFeature( fet ) )
{