pass painter to the function to create the default renderer context and return it

signedav · signedav · commit a85019498fc6 · 2023-03-03T14:24:00.000+01:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -140,7 +140,7 @@ namespace QgsWms
     else
     {
       //use default scale settings
-      configureDefaultRenderContext( context );
+      context = configureDefaultRenderContext();
     }
 
     // create image according to context
@@ -205,8 +205,7 @@ namespace QgsWms
     ctx.painter = painter.get();
 
     // create context
-    QgsRenderContext context = QgsRenderContext::fromQPainter( painter.get() );
-    configureDefaultRenderContext( context );
+    QgsRenderContext context = configureDefaultRenderContext( painter.get() );
     ctx.context = &context;
 
     nodeModel.drawSymbol( settings, &ctx, size.height() / dpmm );
@@ -1376,15 +1375,17 @@ namespace QgsWms
     }
   }
 
-  void QgsRenderer::configureDefaultRenderContext( QgsRenderContext &context )
+  QgsRenderContext QgsRenderer::configureDefaultRenderContext( QPainter *painter )
   {
+    QgsRenderContext context = QgsRenderContext::fromQPainter( painter );
     context.setScaleFactor( mContext.dotsPerMm() );
     const double mmPerMapUnit = 1 / QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mProject );
     context.setMapToPixel( QgsMapToPixel( 1 / ( mmPerMapUnit * context.scaleFactor() ) ) );
     QgsDistanceArea distanceArea = QgsDistanceArea();
     distanceArea.setSourceCrs( QgsCoordinateReferenceSystem( mWmsParameters.crs() ), mProject->transformContext() );
     distanceArea.setEllipsoid( geoNone() );
     context.setDistanceArea( distanceArea );
+    return context;
   }
 
   QDomDocument QgsRenderer::featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings,
diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -196,10 +196,12 @@ namespace QgsWms
       void configureMapSettings( const QPaintDevice *paintDevice, QgsMapSettings &mapSettings, bool mandatoryCrsParam = true );
 
       /**
-       * Configures QgsRenderContext according to the WMS parameters and default settings. Used, for example, when no mapSettings are available.
-       * \param context render context keeping info about the scale
+       * Configures QgsRenderContext according to the WMS parameters and default settings as well as the passed painter.
+       * Used, for example, when no mapSettings are available.
+       * \param painter to create the context from
+       * \returns the renderer context with default parameters and settings of the passed painter
        */
-      void configureDefaultRenderContext( QgsRenderContext &context );
+      QgsRenderContext configureDefaultRenderContext( QPainter *painter = nullptr );
 
       QDomDocument featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings,
                                         const QImage *outputImage, const QString &version ) const;

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ namespace QgsWms`
`140`	`140`	`else`
`141`	`141`	`{`
`142`	`142`	`//use default scale settings`
`143`		`- configureDefaultRenderContext( context );`
	`143`	`+ context = configureDefaultRenderContext();`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`// create image according to context`
`@@ -205,8 +205,7 @@ namespace QgsWms`
`205`	`205`	`ctx.painter = painter.get();`
`206`	`206`
`207`	`207`	`// create context`
`208`		`- QgsRenderContext context = QgsRenderContext::fromQPainter( painter.get() );`
`209`		`- configureDefaultRenderContext( context );`
	`208`	`+ QgsRenderContext context = configureDefaultRenderContext( painter.get() );`
`210`	`209`	`ctx.context = &context;`
`211`	`210`
`212`	`211`	`nodeModel.drawSymbol( settings, &ctx, size.height() / dpmm );`
`@@ -1376,15 +1375,17 @@ namespace QgsWms`
`1376`	`1375`	`}`
`1377`	`1376`	`}`
`1378`	`1377`
`1379`		`- void QgsRenderer::configureDefaultRenderContext( QgsRenderContext &context )`
	`1378`	`+ QgsRenderContext QgsRenderer::configureDefaultRenderContext( QPainter *painter )`
`1380`	`1379`	`{`
	`1380`	`+ QgsRenderContext context = QgsRenderContext::fromQPainter( painter );`
`1381`	`1381`	`context.setScaleFactor( mContext.dotsPerMm() );`
`1382`	`1382`	`const double mmPerMapUnit = 1 / QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mProject );`
`1383`	`1383`	`context.setMapToPixel( QgsMapToPixel( 1 / ( mmPerMapUnit * context.scaleFactor() ) ) );`
`1384`	`1384`	`QgsDistanceArea distanceArea = QgsDistanceArea();`
`1385`	`1385`	`distanceArea.setSourceCrs( QgsCoordinateReferenceSystem( mWmsParameters.crs() ), mProject->transformContext() );`
`1386`	`1386`	`distanceArea.setEllipsoid( geoNone() );`
`1387`	`1387`	`context.setDistanceArea( distanceArea );`
	`1388`	`+ return context;`
`1388`	`1389`	`}`
`1389`	`1390`
`1390`	`1391`	`QDomDocument QgsRenderer::featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings,`