Minor fixups, add tests

src/core/auth/qgsauthcertutils.cpp

@@ -26,7 +26,6 @@
 #include "qgsapplication.h"
 #include "qgsauthmanager.h"
 #include "qgslogger.h"
-#include "qgsapplication.h"
 
 #ifdef Q_OS_MAC
 #include <string.h>

src/core/symbology/qgspointdisplacementrenderer.cpp

@@ -75,17 +75,21 @@ void QgsPointDisplacementRenderer::drawGroup( QPointF centerPoint, QgsRenderCont
   QList<QPointF> symbolPositions;
   QList<QPointF> labelPositions;
   double circleRadius = -1.0;
-  double gridRadius;
-  int gridSize;
+  double gridRadius = -1.0;
+  int gridSize = -1;
 
   calculateSymbolAndLabelPositions( symbolContext, centerPoint, group.size(), diagonal, symbolPositions, labelPositions, circleRadius, gridRadius, gridSize );
 
-  //draw circle
-  if ( circleRadius > 0 )
-    drawCircle( circleRadius, symbolContext, centerPoint, group.size() );
-  //draw grid
-  else
-    drawGrid( gridSize, symbolContext, symbolPositions, group.size() );
+  //only draw circle/grid if there's a pen present - otherwise skip drawing transparent grids
+  if ( mCircleColor.isValid() && mCircleColor.alpha() > 0 )
+  {
+    //draw circle
+    if ( circleRadius > 0 )
+      drawCircle( circleRadius, symbolContext, centerPoint, group.size() );
+    //draw grid
+    else
+      drawGrid( gridSize, symbolContext, symbolPositions, group.size() );
+  }
 
   if ( group.size() > 1 )
   {
@@ -306,8 +310,8 @@ void QgsPointDisplacementRenderer::calculateSymbolAndLabelPositions( QgsSymbolRe
       double centerDiagonal = symbolContext.renderContext().convertToPainterUnits( M_SQRT2 * mCenterSymbol->size(),
                               mCenterSymbol->sizeUnit(), mCenterSymbol->sizeMapUnitScale() );
       int pointsRemaining = nPosition;
-      gridSize = ceil( sqrt( pointsRemaining ) );
-      if ( pointsRemaining - pow( gridSize - 1, 2 ) < gridSize )
+      gridSize = std::ceil( std::sqrt( pointsRemaining ) );
+      if ( pointsRemaining - std::pow( gridSize - 1, 2 ) < gridSize )
         gridSize -= 1;
       double originalPointRadius = ( ( centerDiagonal / 2.0 + symbolDiagonal / 2.0 ) + symbolDiagonal ) / 2;
       double userPointRadius =  originalPointRadius + circleAdditionPainterUnits;
@@ -336,7 +340,7 @@ void QgsPointDisplacementRenderer::calculateSymbolAndLabelPositions( QgsSymbolRe
 
 void QgsPointDisplacementRenderer::centralizeGrid( QList<QPointF> &pointSymbolPositions, double radius, int size ) const
 {
-  double shiftAmount = -radius * ( size - 1 ) / 2;
+  double shiftAmount = -radius * ( size - 1.0 ) / 2.0;
   QPointF centralShift( shiftAmount, shiftAmount );
   for ( int i = 0; i < pointSymbolPositions.size(); ++i )
   {

tests/src/python/test_qgspointdisplacementrenderer.py

@@ -206,6 +206,26 @@ def testRenderVariables(self):
         self.layer.renderer().setCenterSymbol(old_marker)
         self.assertTrue(result)
 
+    def testRenderGrid(self):
+        self.layer.renderer().setTolerance(10)
+        self.layer.renderer().setPlacement(QgsPointDisplacementRenderer.Grid)
+        renderchecker = QgsMultiRenderChecker()
+        renderchecker.setMapSettings(self.mapsettings)
+        renderchecker.setControlPathPrefix('displacement_renderer')
+        renderchecker.setControlName('expected_displacement_grid')
+        self.assertTrue(renderchecker.runTest('expected_displacement_grid'))
+
+    def testRenderGridAdjust(self):
+        self.layer.renderer().setTolerance(10)
+        self.layer.renderer().setCircleRadiusAddition(5)
+        self.layer.renderer().setPlacement(QgsPointDisplacementRenderer.Grid)
+        self.layer.renderer().setCircleColor(QColor())
+        renderchecker = QgsMultiRenderChecker()
+        renderchecker.setMapSettings(self.mapsettings)
+        renderchecker.setControlPathPrefix('displacement_renderer')
+        renderchecker.setControlName('expected_displacement_adjust_grid')
+        self.assertTrue(renderchecker.runTest('expected_displacement_adjust_grid'))
+
 
 if __name__ == '__main__':
     unittest.main()