fix map units per pixel in HiDPI

qgis · Oct 23, 2018 · c868e62 · c868e62
1 parent 2d1b539
commit c868e62
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -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
 

diff --git a/src/core/qgsmaprenderersequentialjob.cpp b/src/core/qgsmaprenderersequentialjob.cpp
@@ -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 );
 }
 

diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -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