Turn antialising render flag on when appropriate in QgsRenderContext:…

…:fromQPainter()
qgis · Apr 24, 2019 · 43adfa71476bbf0d07c5a91f31570abf790df2c1 · 43adfa7
1 parent 7363276
commit 43adfa71476bbf0d07c5a91f31570abf790df2c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp
@@ -105,6 +105,10 @@ QgsRenderContext QgsRenderContext::fromQPainter( QPainter *painter )
   {
     context.setScaleFactor( 3.465 ); //assume 88 dpi as standard value
   }
+  if ( painter && painter->renderHints() & QPainter::Antialiasing )
+  {
+    context.setFlag( QgsRenderContext::Antialiasing, true );
+  }
   return context;
 }
 

diff --git a/tests/src/python/test_qgsrendercontext.py b/tests/src/python/test_qgsrendercontext.py
@@ -73,15 +73,18 @@ def testFromQPainter(self):
         p = QPainter()
         c = QgsRenderContext.fromQPainter(p)
         self.assertEqual(c.painter(), p)
+        self.assertEqual(c.testFlag(QgsRenderContext.Antialiasing), False)
         self.assertAlmostEqual(c.scaleFactor(), 88 / 25.4, 3)
 
         im = QImage(1000, 600, QImage.Format_RGB32)
         dots_per_m = 300 / 25.4 * 1000  # 300 dpi to dots per m
         im.setDotsPerMeterX(dots_per_m)
         im.setDotsPerMeterY(dots_per_m)
         p = QPainter(im)
+        p.setRenderHint(QPainter.Antialiasing)
         c = QgsRenderContext.fromQPainter(p)
         self.assertEqual(c.painter(), p)
+        self.assertEqual(c.testFlag(QgsRenderContext.Antialiasing), True)
         self.assertAlmostEqual(c.scaleFactor(), dots_per_m / 1000, 3)  # scaleFactor should be pixels/mm
 
     def testFromMapSettings(self):

diff --git a/...ta/control_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations.png b/...ta/control_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations.png