sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

deduplicate duplicate code

Browse Source
This commit is contained in:
signedav 2023-02-24 17:18:22 +01:00
parent e1d43b01a8
commit cc3c2ec022
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -139,13 +139,8 @@ namespace QgsWms
} }
else else
{ {
context.setScaleFactor( mContext.dotsPerMm() ); //use default scale settings
const double mmPerMapUnit = 1 / QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mProject ); configureDefaultRenderContext( context );
context.setMapToPixel( QgsMapToPixel( 1 / ( mmPerMapUnit * context.scaleFactor() ) ) );
QgsDistanceArea distanceArea;
distanceArea.setSourceCrs( QgsCoordinateReferenceSystem( mWmsParameters.crs() ), mProject->transformContext() );
distanceArea.setEllipsoid( geoNone() );
context.setDistanceArea( distanceArea );
} }
// create image according to context // create image according to context
@ -211,13 +206,7 @@ namespace QgsWms
// create context // create context
QgsRenderContext context = QgsRenderContext::fromQPainter( painter.get() ); QgsRenderContext context = QgsRenderContext::fromQPainter( painter.get() );
context.setScaleFactor( mContext.dotsPerMm() ); configureDefaultRenderContext( context );
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 );
ctx.context = &context; ctx.context = &context;
nodeModel.drawSymbol( settings, &ctx, size.height() / dpmm ); nodeModel.drawSymbol( settings, &ctx, size.height() / dpmm );
@ -1387,6 +1376,17 @@ namespace QgsWms
} }
} }
void QgsRenderer::configureDefaultRenderContext( QgsRenderContext &context )
{
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 );
}
QDomDocument QgsRenderer::featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings, QDomDocument QgsRenderer::featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings,
const QImage *outputImage, const QString &version ) const const QImage *outputImage, const QString &version ) const
{ {

6
src/server/services/wms/qgswmsrenderer.h
View File

@ -195,6 +195,12 @@ namespace QgsWms
*/ */
void configureMapSettings( const QPaintDevice *paintDevice, QgsMapSettings &mapSettings, bool mandatoryCrsParam = true ); 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
*/
void configureDefaultRenderContext( QgsRenderContext &context );
QDomDocument featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings, QDomDocument featureInfoDocument( QList<QgsMapLayer *> &layers, const QgsMapSettings &mapSettings,
const QImage *outputImage, const QString &version ) const; const QImage *outputImage, const QString &version ) const;