Address review

qgis · May 3, 2021 · 8299547 · 8299547
1 parent 8d1371f
commit 8299547
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 16 deletions.
diff --git a/python/core/auto_generated/qgsmapsettings.sip.in b/python/core/auto_generated/qgsmapsettings.sip.in
@@ -199,14 +199,18 @@ Returns the target DPI (dots per inch) to be taken into consideration when rende
 
 The default value is -1, which states no DPI target is provided.
 
-.. seealso:: :py:func:`setDpiTarger`
+.. seealso:: :py:func:`setDpiTarget`
+
+.. versionadded:: 3.20
 %End
 
     void setDpiTarget( double dpi );
 %Docstring
 Sets the target ``dpi`` (dots per inch) to be taken into consideration when rendering.
 
 .. seealso:: :py:func:`dpiTarget`
+
+.. versionadded:: 3.20
 %End
 
     void setMagnificationFactor( double factor, const QgsPointXY *center = 0 );

diff --git a/python/core/auto_generated/qgsrendercontext.sip.in b/python/core/auto_generated/qgsrendercontext.sip.in
@@ -283,7 +283,6 @@ per millimeter.
     double dpiTarget() const;
 %Docstring
 Returns the targeted DPI for rendering.
-scale.
 
 .. seealso:: :py:func:`setDpiTarget`
 

diff --git a/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in b/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in
@@ -78,7 +78,7 @@ Base class for raster data providers.
       ProviderHintBenefitsFromResampling,
       ProviderHintCanPerformProviderResampling,
       ReloadData,
-      PixelDependentRendering,
+      DpiDependentData,
     };
 
     typedef QFlags<QgsRasterDataProvider::ProviderCapability> ProviderCapabilities;

diff --git a/python/core/auto_generated/raster/qgsrasterdrawer.sip.in b/python/core/auto_generated/raster/qgsrasterdrawer.sip.in
@@ -20,7 +20,14 @@ The drawing pipe for raster layers.
 #include "qgsrasterdrawer.h"
 %End
   public:
+
     QgsRasterDrawer( QgsRasterIterator *iterator, double dpiTarget = -1.0 );
+%Docstring
+The QgsRasterDrawer constructor.
+
+:param iterator: the raster iterator to fetch data from
+:param dpiTarget: the target ``dpi`` (dots per inch) to be taken into consideration when rendering
+%End
 
     void draw( QPainter *p, QgsRasterViewPort *viewPort, const QgsMapToPixel *qgsMapToPixel, QgsRasterBlockFeedback *feedback = 0 );
 %Docstring

diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
@@ -209,14 +209,16 @@ class CORE_EXPORT QgsMapSettings : public QgsTemporalRangeObject
      *
      * The default value is -1, which states no DPI target is provided.
      *
-     * \see setDpiTarger()
+     * \see setDpiTarget()
+     * \since QGIS 3.20
      */
     double dpiTarget() const;
 
     /**
      * Sets the target \a dpi (dots per inch) to be taken into consideration when rendering.
      *
      * \see dpiTarget()
+     * \since QGIS 3.20
      */
     void setDpiTarget( double dpi );
 

diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h
@@ -335,7 +335,6 @@ class CORE_EXPORT QgsRenderContext : public QgsTemporalRangeObject
 
     /**
      * Returns the targeted DPI for rendering.
-     * scale.
      *
      * \see setDpiTarget()
      * \since QGIS 3.20

diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
@@ -103,7 +103,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
       ProviderHintBenefitsFromResampling = 1 << 3, //!< Provider benefits from resampling and should apply user default resampling settings (since QGIS 3.10)
       ProviderHintCanPerformProviderResampling = 1 << 4, //!< Provider can perform resampling (to be opposed to post rendering resampling) (since QGIS 3.16)
       ReloadData = 1 << 5, //!< Is able to force reload data / clear local caches. Since QGIS 3.18, see QgsDataProvider::reloadProviderData()
-      PixelDependentRendering = 1 << 6, //! Provider's rendering is dependent on requested pixel size of the viewport
+      DpiDependentData = 1 << 6, //! Provider's rendering is dependent on requested pixel size of the viewport (since QGIS 3.20)
     };
 
     //! Provider capabilities

diff --git a/src/core/raster/qgsrasterdrawer.cpp b/src/core/raster/qgsrasterdrawer.cpp
@@ -117,7 +117,6 @@ void QgsRasterDrawer::draw( QPainter *p, QgsRasterViewPort *viewPort, const QgsM
   }
 }
 
-#include <QDebug>
 void QgsRasterDrawer::drawImage( QPainter *p, QgsRasterViewPort *viewPort, const QImage &img, int topLeftCol, int topLeftRow, const QgsMapToPixel *qgsMapToPixel ) const
 {
   if ( !p || !viewPort )
@@ -127,7 +126,7 @@ void QgsRasterDrawer::drawImage( QPainter *p, QgsRasterViewPort *viewPort, const
 
   const double dpiScaleFactor = mDpiTarget >= 0.0 ? mDpiTarget / p->device()->logicalDpiX() : 1.0;
   //top left position in device coords
-  QPoint tlPoint = QPoint( viewPort->mTopLeftPoint.x() + topLeftCol / dpiScaleFactor, viewPort->mTopLeftPoint.y() + topLeftRow / dpiScaleFactor );
+  QPoint tlPoint = QPoint( viewPort->mTopLeftPoint.x() + std::floor( topLeftCol / dpiScaleFactor ), viewPort->mTopLeftPoint.y() + std::floor( topLeftRow / dpiScaleFactor ) );
 
   QgsScopedQPainterState painterState( p );
   p->setRenderHint( QPainter::Antialiasing, false );
@@ -136,11 +135,11 @@ void QgsRasterDrawer::drawImage( QPainter *p, QgsRasterViewPort *viewPort, const
   // in #7766, it seems to be a bug in Qt, setting a brush with alpha 255 is a workaround
   // which should not harm anything
   p->setBrush( QBrush( QColor( Qt::white ), Qt::NoBrush ) );
-  int w = qgsMapToPixel->mapWidth();
-  int h = qgsMapToPixel->mapHeight();
   if ( qgsMapToPixel )
   {
-    double rotation = qgsMapToPixel->mapRotation();
+    const int w = qgsMapToPixel->mapWidth();
+    const int h = qgsMapToPixel->mapHeight();
+    const double rotation = qgsMapToPixel->mapRotation();
     if ( rotation )
     {
       // both viewPort and image sizes are dependent on scale
@@ -152,7 +151,7 @@ void QgsRasterDrawer::drawImage( QPainter *p, QgsRasterViewPort *viewPort, const
     }
   }
 
-  p->drawImage( tlPoint, dpiScaleFactor != 1.0 ? img.scaledToWidth( img.width() / dpiScaleFactor ) : img );
+  p->drawImage( tlPoint, dpiScaleFactor != 1.0 ? img.scaledToHeight( std::ceil( img.height() / dpiScaleFactor ) ) : img );
 
 #if 0
   // For debugging:

diff --git a/src/core/raster/qgsrasterdrawer.h b/src/core/raster/qgsrasterdrawer.h
@@ -37,6 +37,12 @@ class QgsRasterIterator;
 class CORE_EXPORT QgsRasterDrawer
 {
   public:
+
+    /**
+     * The QgsRasterDrawer constructor.
+     * \param iterator the raster iterator to fetch data from
+     * \param dpiTarget the target \a dpi (dots per inch) to be taken into consideration when rendering
+     */
     QgsRasterDrawer( QgsRasterIterator *iterator, double dpiTarget = -1.0 );
 
     /**

diff --git a/src/core/raster/qgsrasterlayerrenderer.cpp b/src/core/raster/qgsrasterlayerrenderer.cpp
@@ -202,7 +202,7 @@ QgsRasterLayerRenderer::QgsRasterLayerRenderer( QgsRasterLayer *layer, QgsRender
   mRasterViewPort->mHeight = static_cast<qgssize>( std::abs( mRasterViewPort->mBottomRightPoint.y() - mRasterViewPort->mTopLeftPoint.y() ) );
 
 
-  if ( mProviderCapabilities & QgsRasterDataProvider::PixelDependentRendering
+  if ( mProviderCapabilities & QgsRasterDataProvider::DpiDependentData
        && rendererContext.dpiTarget() >= 0.0 )
   {
     const double dpiScaleFactor = rendererContext.dpiTarget() / rendererContext.painter()->device()->logicalDpiX();

diff --git a/src/gui/layout/qgslayoutpropertieswidget.cpp b/src/gui/layout/qgslayoutpropertieswidget.cpp
@@ -227,6 +227,8 @@ void QgsLayoutPropertiesWidget::dpiChanged( int value )
   mLayout->undoStack()->beginCommand( mLayout, tr( "Set Default DPI" ), QgsLayout::UndoLayoutDpi );
   mLayout->renderContext().setDpi( value );
   mLayout->undoStack()->endCommand();
+
+  mLayout->refresh();
 }
 
 void QgsLayoutPropertiesWidget::worldFileToggled()

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -2024,9 +2024,9 @@ int QgsWmsProvider::capabilities() const
     // capability |= Capability::Prefetch;
   }
 
-  if ( mSettings.mTiled && mSettings.mXyz )
+  if ( mSettings.mTiled || mSettings.mXyz )
   {
-    capability |= PixelDependentRendering;
+    capability |= DpiDependentData;
   }
 
   QgsDebugMsgLevel( QStringLiteral( "capability = %1" ).arg( capability ), 2 );

diff --git a/tests/src/python/test_qgslayoutmap.py b/tests/src/python/test_qgslayoutmap.py
@@ -14,7 +14,7 @@
 
 import os
 
-from qgis.PyQt.QtCore import QFileInfo, QRectF, QDir, QCoreApplication, QEvent
+from qgis.PyQt.QtCore import QFileInfo, QRectF, QDir, QCoreApplication, QEvent, QSizeF
 from qgis.PyQt.QtXml import QDomDocument
 from qgis.PyQt.QtGui import QPainter, QColor
 from qgis.PyQt.QtTest import QSignalSpy
@@ -860,6 +860,17 @@ def testCrsChanged(self):
         map.refresh()
         self.assertEqual(len(spy), 7)
 
+    def testCrsChanged(self):
+        """
+        Test that the CRS changed signal is emitted in the right circumstances
+        """
+        p = QgsProject()
+        layout = QgsLayout(p)
+        layout.renderContext().setDpi(111.1)
+        map = QgsLayoutItemMap(layout)
+        ms = map.mapSettings(QgsRectangle(0, 0, 1, 1), QSizeF(10, 10), 96, False)
+        self.assertEqual(ms.dpiTarget(), 111.1)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/src/python/test_qgsrendercontext.py b/tests/src/python/test_qgsrendercontext.py
@@ -163,6 +163,10 @@ def testFromMapSettings(self):
         self.assertEqual(rc.temporalRange(),
                          QgsDateTimeRange(QDateTime(2020, 1, 1, 0, 0), QDateTime(2010, 12, 31, 23, 59)))
 
+        ms.setDpiTarget(111.1)
+        rc = QgsRenderContext.fromMapSettings(ms)
+        self.assertEqual(rc.dpiTarget(), 111.1)
+
     def testVectorSimplification(self):
         """
         Test vector simplification hints, ensure they are copied correctly from map settings