Be more respectful of the render context's antialias flag, and

avoid incorrectly antialiasing rendering of certain objects (such as map labels) when not wanted Fixes #36964
qgis · Jun 8, 2020 · bab8384 · bab8384
1 parent da904fb
commit bab8384
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 21 deletions.
diff --git a/src/app/decorations/qgsdecorationcopyright.cpp b/src/app/decorations/qgsdecorationcopyright.cpp
@@ -117,7 +117,8 @@ void QgsDecorationCopyright::render( const QgsMapSettings &mapSettings, QgsRende
     return;
 
   context.painter()->save();
-  context.painter()->setRenderHint( QPainter::Antialiasing, true );
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    context.painter()->setRenderHint( QPainter::Antialiasing, true );
 
   QString displayString = QgsExpression::replaceExpressionText( mLabelText, &context.expressionContext() );
   QStringList displayStringList = displayString.split( '\n' );

diff --git a/src/app/decorations/qgsdecorationlayoutextent.cpp b/src/app/decorations/qgsdecorationlayoutextent.cpp
@@ -121,7 +121,8 @@ void QgsDecorationLayoutExtent::render( const QgsMapSettings &mapSettings, QgsRe
     return;
 
   context.painter()->save();
-  context.painter()->setRenderHint( QPainter::Antialiasing, true );
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    context.painter()->setRenderHint( QPainter::Antialiasing, true );
   mSymbol->startRender( context );
 
   const QgsMapToPixel &m2p = mapSettings.mapToPixel();

diff --git a/src/app/decorations/qgsdecorationtitle.cpp b/src/app/decorations/qgsdecorationtitle.cpp
@@ -106,7 +106,8 @@ void QgsDecorationTitle::render( const QgsMapSettings &mapSettings, QgsRenderCon
     return;
 
   context.painter()->save();
-  context.painter()->setRenderHint( QPainter::Antialiasing, true );
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    context.painter()->setRenderHint( QPainter::Antialiasing, true );
 
   QString displayString = QgsExpression::replaceExpressionText( mLabelText, &context.expressionContext() );
   QStringList displayStringList = displayString.split( '\n' );

diff --git a/src/core/labeling/qgslabelingengine.cpp b/src/core/labeling/qgslabelingengine.cpp
@@ -405,7 +405,8 @@ void QgsLabelingEngine::drawLabels( QgsRenderContext &context, const QString &la
 
   const QgsLabelingEngineSettings &settings = mMapSettings.labelingEngineSettings();
   QPainter *painter = context.painter();
-  painter->setRenderHint( QPainter::Antialiasing );
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    painter->setRenderHint( QPainter::Antialiasing );
 
   // prepare for rendering
   for ( QgsAbstractLabelProvider *provider : qgis::as_const( mProviders ) )

diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -584,7 +584,8 @@ QSizeF QgsSymbolLegendNode::drawSymbol( const QgsLegendSettings &settings, ItemC
       opacity = static_cast<int >( std::round( 255 * vectorLayer->opacity() ) );
 
     p->save();
-    p->setRenderHint( QPainter::Antialiasing );
+    if ( context->flags() & QgsRenderContext::Antialiasing )
+      p->setRenderHint( QPainter::Antialiasing );
 
     switch ( settings.symbolAlignment() )
     {
@@ -613,7 +614,8 @@ QSizeF QgsSymbolLegendNode::drawSymbol( const QgsLegendSettings &settings, ItemC
       QImage tempImage = QImage( tempImageSize, QImage::Format_ARGB32 );
       tempImage.fill( Qt::transparent );
       QPainter imagePainter( &tempImage );
-      imagePainter.setRenderHint( QPainter::Antialiasing );
+      if ( context->flags() & QgsRenderContext::Antialiasing )
+        imagePainter.setRenderHint( QPainter::Antialiasing );
       context->setPainter( &imagePainter );
       imagePainter.translate( maxBleed, maxBleed );
       s->drawPreviewIcon( &imagePainter, symbolSize, context, false, nullptr, &patchShape );

diff --git a/src/core/layout/qgslayoutitem.cpp b/src/core/layout/qgslayoutitem.cpp
@@ -1216,6 +1216,10 @@ void QgsLayoutItem::drawFrame( QgsRenderContext &context )
   p->save();
   p->setPen( pen() );
   p->setBrush( Qt::NoBrush );
+
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    p->setRenderHint( QPainter::Antialiasing, true );
+
   p->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
   p->restore();
 }
@@ -1229,6 +1233,10 @@ void QgsLayoutItem::drawBackground( QgsRenderContext &context )
   p->save();
   p->setBrush( brush() );
   p->setPen( Qt::NoPen );
+
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    p->setRenderHint( QPainter::Antialiasing, true );
+
   p->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
   p->restore();
 }

diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -2239,25 +2239,21 @@ void QgsLayoutItemMap::drawMapFrame( QPainter *p )
 {
   if ( frameEnabled() && p )
   {
-    p->save();
-    p->setPen( pen() );
-    p->setBrush( Qt::NoBrush );
-    p->setRenderHint( QPainter::Antialiasing, true );
-    p->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
-    p->restore();
+    QgsRenderContext rc = QgsLayoutUtils::createRenderContextForMap( this, p );
+    rc.setExpressionContext( createExpressionContext() );
+
+    QgsLayoutItem::drawFrame( rc );
   }
 }
 
 void QgsLayoutItemMap::drawMapBackground( QPainter *p )
 {
   if ( hasBackground() && p )
   {
-    p->save();
-    p->setBrush( brush() );//this causes a problem in atlas generation
-    p->setPen( Qt::NoPen );
-    p->setRenderHint( QPainter::Antialiasing, true );
-    p->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
-    p->restore();
+    QgsRenderContext rc = QgsLayoutUtils::createRenderContextForMap( this, p );
+    rc.setExpressionContext( createExpressionContext() );
+
+    QgsLayoutItem::drawBackground( rc );
   }
 }
 

diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -720,7 +720,7 @@ void QgsLayoutItemMapGrid::drawGridFrame( QPainter *p, const QList< QPair< doubl
   if ( p )
   {
     p->save();
-    p->setRenderHint( QPainter::Antialiasing );
+    p->setRenderHint( QPainter::Antialiasing, mMap->layout()->renderContext().flags() & QgsLayoutRenderContext::FlagAntialiasing );
   }
 
   //Sort the coordinate positions for each side

diff --git a/src/core/layout/qgslayoutitemmapoverview.cpp b/src/core/layout/qgslayoutitemmapoverview.cpp
@@ -109,7 +109,8 @@ void QgsLayoutItemMapOverview::draw( QPainter *painter )
   painter->setCompositionMode( mBlendMode );
   painter->translate( mMap->mXOffset, mMap->mYOffset );
   painter->scale( 1 / dotsPerMM, 1 / dotsPerMM ); // scale painter from mm to dots
-  painter->setRenderHint( QPainter::Antialiasing );
+  if ( context.flags() & QgsRenderContext::Antialiasing )
+    painter->setRenderHint( QPainter::Antialiasing );
 
   mFrameSymbol->startRender( context );
 

diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp
@@ -773,7 +773,8 @@ QPixmap QgsSymbolLayerUtils::symbolPreviewPixmap( const QgsSymbol *symbol, QSize
   pixmap.fill( Qt::transparent );
   QPainter painter;
   painter.begin( &pixmap );
-  painter.setRenderHint( QPainter::Antialiasing );
+  if ( !customContext || customContext->flags() & QgsRenderContext::Antialiasing )
+    painter.setRenderHint( QPainter::Antialiasing );
 
   if ( customContext )
   {