Have QgsRasterDrawer::draw check for interrupted rendering, reduce ra…

…ster block tile dimensions, to greatly enhance responsiveness when dealing with reprojected raster layers
qgis · Jun 6, 2016 · d984148 · d984148
1 parent 1e8abb1
commit d984148
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/python/core/raster/qgsrasterdrawer.sip b/python/core/raster/qgsrasterdrawer.sip
@@ -9,7 +9,13 @@ class QgsRasterDrawer
   public:
     QgsRasterDrawer( QgsRasterIterator *iterator );
 
-    void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
+    /** Draws raster data.
+     * @param p destination QPainter
+     * @param viewPort viewport to render
+     * @param theQgsMapToPixel map to pixel convertor
+     * @param ctx render context
+     */
+    void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel, const QgsRenderContext *ctx = nullptr );
 
   protected:
     /** Draws raster part

diff --git a/src/core/raster/qgsrasterdrawer.cpp b/src/core/raster/qgsrasterdrawer.cpp
@@ -20,6 +20,7 @@
 #include "qgsrasteriterator.h"
 #include "qgsrasterviewport.h"
 #include "qgsmaptopixel.h"
+#include "qgsrendercontext.h"
 #include <QImage>
 #include <QPainter>
 #include <QPrinter>
@@ -28,7 +29,7 @@ QgsRasterDrawer::QgsRasterDrawer( QgsRasterIterator* iterator ): mIterator( iter
 {
 }
 
-void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel )
+void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel, const QgsRenderContext* ctx )
 {
   QgsDebugMsgLevel( "Entered", 4 );
   if ( !p || !mIterator || !viewPort || !theQgsMapToPixel )
@@ -88,6 +89,8 @@ void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsM
     drawImage( p, viewPort, img, topLeftCol, topLeftRow, theQgsMapToPixel );
 
     delete block;
+    if ( ctx && ctx->renderingStopped() )
+      break;
   }
 }
 

diff --git a/src/core/raster/qgsrasterdrawer.h b/src/core/raster/qgsrasterdrawer.h
@@ -24,6 +24,7 @@
 class QPainter;
 class QImage;
 class QgsMapToPixel;
+class QgsRenderContext;
 struct QgsRasterViewPort;
 class QgsRasterIterator;
 
@@ -35,7 +36,13 @@ class CORE_EXPORT QgsRasterDrawer
   public:
     QgsRasterDrawer( QgsRasterIterator *iterator );
 
-    void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
+    /** Draws raster data.
+     * @param p destination QPainter
+     * @param viewPort viewport to render
+     * @param theQgsMapToPixel map to pixel convertor
+     * @param ctx render context
+     */
+    void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel, const QgsRenderContext *ctx = nullptr );
 
   protected:
     /** Draws raster part

diff --git a/src/core/raster/qgsrasteriterator.cpp b/src/core/raster/qgsrasteriterator.cpp
@@ -18,7 +18,7 @@
 #include "qgsrasterviewport.h"
 
 QgsRasterIterator::QgsRasterIterator( QgsRasterInterface* input ): mInput( input ),
-    mMaximumTileWidth( 2000 ), mMaximumTileHeight( 2000 )
+    mMaximumTileWidth( 256 ), mMaximumTileHeight( 256 )
 {
 }
 

diff --git a/src/core/raster/qgsrasterlayerrenderer.cpp b/src/core/raster/qgsrasterlayerrenderer.cpp
@@ -25,6 +25,7 @@ QgsRasterLayerRenderer::QgsRasterLayerRenderer( QgsRasterLayer* layer, QgsRender
     : QgsMapLayerRenderer( layer->id() )
     , mRasterViewPort( nullptr )
     , mPipe( nullptr )
+    , mContext( rendererContext )
 {
 
   mPainter = rendererContext.painter();
@@ -209,7 +210,7 @@ bool QgsRasterLayerRenderer::render()
   // Drawer to pipe?
   QgsRasterIterator iterator( mPipe->last() );
   QgsRasterDrawer drawer( &iterator );
-  drawer.draw( mPainter, mRasterViewPort, mMapToPixel );
+  drawer.draw( mPainter, mRasterViewPort, mMapToPixel, &mContext );
 
   QgsDebugMsgLevel( QString( "total raster draw time (ms):     %1" ).arg( time.elapsed(), 5 ), 4 );
 

diff --git a/src/core/raster/qgsrasterlayerrenderer.h b/src/core/raster/qgsrasterlayerrenderer.h
@@ -47,6 +47,7 @@ class QgsRasterLayerRenderer : public QgsMapLayerRenderer
     QgsRasterViewPort* mRasterViewPort;
 
     QgsRasterPipe* mPipe;
+    QgsRenderContext& mContext;
 };
 
 #endif // QGSRASTERLAYERRENDERER_H