Tweak API

nyalldawson · nyalldawson · commit 38cca6ca7e3e · 2017-12-05T09:02:40.000+10:00
diff --git a/python/core/qgsmaprendererjob.sip b/python/core/qgsmaprendererjob.sip
@@ -142,12 +142,6 @@ List of errors that happened during the rendering job - available when the rende
  :rtype: int
 %End
 
-    QMap< QString, int > perLayerRenderingTime() const;
-%Docstring
- Returns the render time (in ms) per layer, by layer ID.
-.. versionadded:: 3.0
- :rtype: QMap< str, int >
-%End
 
     const QgsMapSettings &mapSettings() const;
 %Docstring
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -64,6 +64,17 @@ void QgsMapRendererJob::setCache( QgsMapRendererCache *cache )
   mCache = cache;
 }
 
+QHash<QgsMapLayer *, int> QgsMapRendererJob::perLayerRenderingTime() const
+{
+  QHash<QgsMapLayer *, int> result;
+  for ( auto it = mPerLayerRenderingTime.constBegin(); it != mPerLayerRenderingTime.constEnd(); ++it )
+  {
+    if ( it.key() )
+      result.insert( it.key(), it.value() );
+  }
+  return result;
+}
+
 const QgsMapSettings &QgsMapRendererJob::mapSettings() const
 {
   return mSettings;
@@ -414,7 +425,7 @@ void QgsMapRendererJob::cleanupJobs( LayerRenderJobs &jobs )
     }
 
     if ( job.layer )
-      mPerLayerRenderingTime.insert( job.layer->id(), job.renderingTime );
+      mPerLayerRenderingTime.insert( job.layer, job.renderingTime );
   }
 
   jobs.clear();
diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -206,10 +206,11 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
     int renderingTime() const { return mRenderingTime; }
 
     /**
-     * Returns the render time (in ms) per layer, by layer ID.
+     * Returns the render time (in ms) per layer.
+     * \note Not available in Python bindings.
      * \since QGIS 3.0
      */
-    QMap< QString, int > perLayerRenderingTime() const { return mPerLayerRenderingTime; }
+    QHash< QgsMapLayer *, int > perLayerRenderingTime() const SIP_SKIP;
 
     /**
      * Return map settings with which this job was started.
@@ -249,7 +250,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
     int mRenderingTime = 0;
 
     //! Render time (in ms) per layer, by layer ID
-    QMap< QString, int > mPerLayerRenderingTime;
+    QHash< QgsWeakMapLayerPointer, int > mPerLayerRenderingTime;
 
     /**
      * Prepares the cache for storing the result of labeling. Returns false if
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -612,7 +612,12 @@ void QgsMapCanvas::rendererJobFinished()
 
     mMap->setContent( img, imageRect( img, mSettings ) );
 
-    mLastLayerRenderTime = mJob->perLayerRenderingTime();
+    mLastLayerRenderTime.clear();
+    const auto times = mJob->perLayerRenderingTime();
+    for ( auto it = times.constBegin(); it != times.constEnd(); ++it )
+    {
+      mLastLayerRenderTime.insert( it.key()->id(), it.value() );
+    }
     if ( mUsePreviewJobs )
       startPreviewJobs();
   }
@@ -2284,7 +2289,7 @@ void QgsMapCanvas::startPreviewJob( int number )
   context.maxRenderingTimeMs = MAXIMUM_LAYER_PREVIEW_TIME_MS;
   for ( QgsMapLayer *layer : layers )
   {
-    context.lastRenderingTimeMs = mLastLayerRenderTime.value( layer->id() );
+    context.lastRenderingTimeMs = mLastLayerRenderTime.value( layer->id(), 0 );
     if ( !layer->dataProvider()->renderInPreview( context ) )
     {
       QgsDebugMsgLevel( QString( "Layer %1 not rendered because it does not match the renderInPreview criterion %2" ).arg( layer->id() ).arg( mLastLayerRenderTime.value( layer->id() ) ), 3 );
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -1000,7 +1000,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
 
     bool mUsePreviewJobs = false;
 
-    QMap< QString, int > mLastLayerRenderTime;
+    QHash< QString, int > mLastLayerRenderTime;
 
     /**
      * Force a resize of the map canvas item

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,17 @@ void QgsMapRendererJob::setCache( QgsMapRendererCache *cache )`
`64`	`64`	`mCache = cache;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+QHash<QgsMapLayer *, int> QgsMapRendererJob::perLayerRenderingTime() const`
	`68`	`+{`
	`69`	`+ QHash<QgsMapLayer *, int> result;`
	`70`	`+ for ( auto it = mPerLayerRenderingTime.constBegin(); it != mPerLayerRenderingTime.constEnd(); ++it )`
	`71`	`+ {`
	`72`	`+ if ( it.key() )`
	`73`	`+ result.insert( it.key(), it.value() );`
	`74`	`+ }`
	`75`	`+ return result;`
	`76`	`+}`
	`77`	`+`
`67`	`78`	`const QgsMapSettings &QgsMapRendererJob::mapSettings() const`
`68`	`79`	`{`
`69`	`80`	`return mSettings;`
`@@ -414,7 +425,7 @@ void QgsMapRendererJob::cleanupJobs( LayerRenderJobs &jobs )`
`414`	`425`	`}`
`415`	`426`
`416`	`427`	`if ( job.layer )`
`417`		`- mPerLayerRenderingTime.insert( job.layer->id(), job.renderingTime );`
	`428`	`+ mPerLayerRenderingTime.insert( job.layer, job.renderingTime );`
`418`	`429`	`}`
`419`	`430`
`420`	`431`	`jobs.clear();`