Use coordinate transform cache in maprenderer

Author: mhugent

python/core/qgsmaprenderer.sip

@@ -228,12 +228,6 @@ class QgsMapRenderer : QObject
     //! called by signal from layer current being drawn
     void onDrawingProgress( int current, int total );
 
-    //! invalidate cached layer CRS
-    void invalidateCachedLayerCrs();
-
-    //! cached layer was destroyed
-    void cachedLayerDestroyed();
-
   protected:
 
     //! adjust extent to fit the pixmap size

python/core/qgsrendercontext.sip

@@ -38,8 +38,8 @@ class QgsRenderContext
 
     //setters
 
-    /**Sets coordinate transformation. QgsRenderContext takes ownership and deletes if necessary*/
-    void setCoordinateTransform( QgsCoordinateTransform* t /Transfer/ );
+    /**Sets coordinate transformation. QgsRenderContext does not take ownership*/
+    void setCoordinateTransform( const QgsCoordinateTransform* t );
     void setMapToPixel( const QgsMapToPixel& mtp );
     void setExtent( const QgsRectangle& extent );
     void setDrawEditingInformation( bool b );

src/core/qgsmaprenderer.cpp

@@ -17,6 +17,7 @@
 #include <cfloat>
 
 #include "qgscoordinatetransform.h"
+#include "qgscrscache.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
 #include "qgsmaprenderer.h"
@@ -46,8 +47,6 @@ QgsMapRenderer::QgsMapRenderer()
   mScale = 1.0;
   mScaleCalculator = new QgsScaleCalculator;
   mDistArea = new QgsDistanceArea;
-  mCachedTrForLayer = 0;
-  mCachedTr = 0;
 
   mDrawing = false;
   mOverview = false;
@@ -71,7 +70,6 @@ QgsMapRenderer::~QgsMapRenderer()
   delete mDistArea;
   delete mDestCRS;
   delete mLabelingEngine;
-  delete mCachedTr;
 }
 
 QgsRectangle QgsMapRenderer::extent() const
@@ -266,7 +264,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale )
 
   mDrawing = true;
 
-  QgsCoordinateTransform* ct;
+  const QgsCoordinateTransform* ct;
 
 #ifdef QGISDEBUG
   QgsDebugMsg( "Starting to render layer stack." );
@@ -402,7 +400,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale )
       {
         r1 = mExtent;
         split = splitLayersExtent( ml, r1, r2 );
-        ct = new QgsCoordinateTransform( ml->crs(), *mDestCRS );
+        ct = QgsCoordinateTransformCache::instance()->transform( ml->crs().authid(), mDestCRS->authid() );
         mRenderContext.setExtent( r1 );
         QgsDebugMsg( "  extent 1: " + r1.toString() );
         QgsDebugMsg( "  extent 2: " + r2.toString() );
@@ -692,7 +690,6 @@ void QgsMapRenderer::setDestinationCrs( const QgsCoordinateReferenceSystem& crs
       rect = transform.transformBoundingBox( mExtent );
     }
 
-    invalidateCachedLayerCrs();
     QgsDebugMsg( "Setting DistArea CRS to " + QString::number( crs.srsid() ) );
     mDistArea->setSourceCrs( crs.srsid() );
     *mDestCRS = crs;
@@ -734,7 +731,7 @@ bool QgsMapRenderer::splitLayersExtent( QgsMapLayer* layer, QgsRectangle& extent
       // extent separately.
       static const double splitCoord = 180.0;
 
-      if ( mCachedTr->sourceCrs().geographicFlag() )
+      if ( layer->crs().geographicFlag() )
       {
         // Note: ll = lower left point
         //   and ur = upper right point
@@ -1138,35 +1135,13 @@ void QgsMapRenderer::setLabelingEngine( QgsLabelingEngineInterface* iface )
   mLabelingEngine = iface;
 }
 
-QgsCoordinateTransform *QgsMapRenderer::tr( QgsMapLayer *layer )
+const QgsCoordinateTransform* QgsMapRenderer::tr( QgsMapLayer *layer )
 {
-  if ( mCachedTrForLayer != layer )
+  if ( !layer || !mDestCRS )
   {
-    invalidateCachedLayerCrs();
-
-    delete mCachedTr;
-    mCachedTr = new QgsCoordinateTransform( layer->crs(), *mDestCRS );
-    mCachedTrForLayer = layer;
-
-    connect( layer, SIGNAL( layerCrsChanged() ), this, SLOT( invalidateCachedLayerCrs() ) );
-    connect( layer, SIGNAL( destroyed() ), this, SLOT( cachedLayerDestroyed() ) );
+    return 0;
   }
-
-  return mCachedTr;
-}
-
-void QgsMapRenderer::cachedLayerDestroyed()
-{
-  if ( mCachedTrForLayer == sender() )
-    mCachedTrForLayer = 0;
-}
-
-void QgsMapRenderer::invalidateCachedLayerCrs()
-{
-  if ( mCachedTrForLayer )
-    disconnect( mCachedTrForLayer, SIGNAL( layerCrsChanged() ), this, SLOT( invalidateCachedLayerCrs() ) );
-
-  mCachedTrForLayer = 0;
+  return QgsCoordinateTransformCache::instance()->transform( layer->crs().authid(), mDestCRS->authid() );
 }
 
 bool QgsMapRenderer::mDrawing = false;

src/core/qgsmaprenderer.h

@@ -265,12 +265,6 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     //! called by signal from layer current being drawn
     void onDrawingProgress( int current, int total );
 
-    //! invalidate cached layer CRS
-    void invalidateCachedLayerCrs();
-
-    //! cached layer was destroyed
-    void cachedLayerDestroyed();
-
   protected:
 
     //! adjust extent to fit the pixmap size
@@ -343,9 +337,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     QMutex mRenderMutex;
 
   private:
-    QgsCoordinateTransform *tr( QgsMapLayer *layer );
-    QgsCoordinateTransform *mCachedTr;
-    QgsMapLayer *mCachedTrForLayer;
+    const QgsCoordinateTransform* tr( QgsMapLayer *layer );
 };
 
 #endif

src/core/qgsrendercontext.cpp

@@ -34,12 +34,10 @@ QgsRenderContext::QgsRenderContext()
 
 QgsRenderContext::~QgsRenderContext()
 {
-  delete mCoordTransform;
 }
 
-void QgsRenderContext::setCoordinateTransform( QgsCoordinateTransform* t )
+void QgsRenderContext::setCoordinateTransform( const QgsCoordinateTransform* t )
 {
-  delete mCoordTransform;
   mCoordTransform = t;
 }
 

src/core/qgsrendercontext.h

@@ -66,8 +66,8 @@ class CORE_EXPORT QgsRenderContext
 
     //setters
 
-    /**Sets coordinate transformation. QgsRenderContext takes ownership and deletes if necessary*/
-    void setCoordinateTransform( QgsCoordinateTransform* t );
+    /**Sets coordinate transformation. QgsRenderContext does not take ownership*/
+    void setCoordinateTransform( const QgsCoordinateTransform* t );
     void setMapToPixel( const QgsMapToPixel& mtp ) {mMapToPixel = mtp;}
     void setExtent( const QgsRectangle& extent ) {mExtent = extent;}
     void setDrawEditingInformation( bool b ) {mDrawEditingInformation = b;}
@@ -87,7 +87,7 @@ class CORE_EXPORT QgsRenderContext
     QPainter* mPainter;
 
     /**For transformation between coordinate systems. Can be 0 if on-the-fly reprojection is not used*/
-    QgsCoordinateTransform* mCoordTransform;
+    const QgsCoordinateTransform* mCoordTransform;
 
     /**True if vertex markers for editing should be drawn*/
     bool mDrawEditingInformation;