sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix map units per pixel in HiDPI

Browse Source
This commit is contained in:
Denis Rouzaud 2018-10-23 15:34:17 -04:00
parent 2d1b539003
commit c868e62ef5
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsmaprenderercustompainterjob.cpp
View File

@ -68,8 +68,8 @@ void QgsMapRendererCustomPainterJob::start()
QPaintDevice *paintDevice = mPainter->device();
QString errMsg = QStringLiteral( "pre-set DPI not equal to painter's DPI (%1 vs %2)" )
.arg( paintDevice->logicalDpiX() )
.arg( mSettings.outputDpi() );
Q_ASSERT_X( qgsDoubleNear( paintDevice->logicalDpiX(), mSettings.outputDpi() ),
.arg( mSettings.outputDpi() * mSettings.devicePixelRatio() );
Q_ASSERT_X( qgsDoubleNear( paintDevice->logicalDpiX(), mSettings.outputDpi() * mSettings.devicePixelRatio() ),
"Job::startRender()", errMsg.toLatin1().data() );
#endif

4
src/core/qgsmaprenderersequentialjob.cpp
View File

@ -27,8 +27,8 @@ QgsMapRendererSequentialJob::QgsMapRendererSequentialJob( const QgsMapSettings &
mImage = QImage( mSettings.deviceOutputSize(), mSettings.outputImageFormat() );
mImage.setDevicePixelRatio( mSettings.devicePixelRatio() );
mImage.setDotsPerMeterX( 1000 * settings.outputDpi() / 25.4 );
mImage.setDotsPerMeterY( 1000 * settings.outputDpi() / 25.4 );
mImage.setDotsPerMeterX( mSettings.devicePixelRatio() * 1000 * settings.outputDpi() / 25.4 );
mImage.setDotsPerMeterY( mSettings.devicePixelRatio() * 1000 * settings.outputDpi() / 25.4 );
mImage.fill( Qt::transparent );
}

7
src/core/qgsmapsettings.cpp
View File

@ -146,8 +146,8 @@ void QgsMapSettings::updateDerived()
}
}
double myHeight = mSize.height() * mDevicePixelRatio;
double myWidth = mSize.width() * mDevicePixelRatio;
double myHeight = mSize.height();
double myWidth = mSize.width();
if ( !myWidth || !myHeight )
{
@ -180,7 +180,7 @@ void QgsMapSettings::updateDerived()
mVisibleExtent.set( dxmin, dymin, dxmax, dymax );
// update the scale
mScaleCalculator.setDpi( mDpi );
mScaleCalculator.setDpi( mDpi * mDevicePixelRatio );
mScale = mScaleCalculator.calculate( mVisibleExtent, mSize.width() );
mMapToPixel.setParameters( mapUnitsPerPixel(),
@ -238,6 +238,7 @@ float QgsMapSettings::devicePixelRatio() const
void QgsMapSettings::setDevicePixelRatio( float dpr )
{
mDevicePixelRatio = dpr;
updateDerived();
}
QSize QgsMapSettings::deviceOutputSize() const