[composer] Remove a bunch of duplicate render calls to map items during atlas previews

nyalldawson · nyalldawson · commit 6d850ad51a41 · 2014-10-06T23:03:46.000+11:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -970,6 +970,11 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )
   mActionAtlasNext->setEnabled( checked );
   mActionAtlasPrev->setEnabled( checked );
 
+  if ( checked )
+  {
+    loadAtlasPredefinedScalesFromProject();
+  }
+
   bool previewEnabled = mComposition->setAtlasMode( checked ? QgsComposition::PreviewAtlas : QgsComposition::AtlasOff );
   if ( !previewEnabled )
   {
@@ -991,8 +996,6 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )
 
   if ( checked )
   {
-    loadAtlasPredefinedScalesFromProject();
-    atlasMap->firstFeature();
     emit( atlasPreviewFeatureChanged() );
   }
   else
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -351,13 +351,19 @@ void QgsComposerMapWidget::updateMapForAtlas()
     return;
   }
 
-  //update atlas based extent for map
-  QgsAtlasComposition* atlas = &composition->atlasComposition();
-  atlas->prepareMap( mComposerMap );
-
-  //redraw map
-  mComposerMap->cache();
-  mComposerMap->update();
+  if ( mComposerMap->atlasDriven() )
+  {
+    //update atlas based extent for map
+    QgsAtlasComposition* atlas = &composition->atlasComposition();
+    //prepareMap causes a redraw
+    atlas->prepareMap( mComposerMap );
+  }
+  else
+  {
+    //redraw map
+    mComposerMap->cache();
+    mComposerMap->update();
+  }
 }
 
 void QgsComposerMapWidget::on_mAtlasMarginRadio_toggled( bool checked )
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -1032,6 +1032,11 @@ void QgsComposerItem::refreshRotation( const bool updateItem , const bool adjust
     }
   }
 
+  if ( rotation == mEvaluatedItemRotation )
+  {
+    return;
+  }
+
   if ( adjustPosition )
   {
     //adjustPosition set, so shift the position of the item so that rotation occurs around item center
@@ -1297,8 +1302,12 @@ void QgsComposerItem::refreshDataDefinedProperty( const QgsComposerObject::DataD
        property == QgsComposerObject::ItemWidth || property == QgsComposerObject::ItemHeight ||
        property == QgsComposerObject::AllProperties )
   {
-    QRectF evaluatedRect = evalItemRect( QRectF( pos().x(), pos().y(), rect().width(), rect().height() ) );
-    setSceneRect( evaluatedRect );
+    QRectF beforeRect = QRectF( pos().x(), pos().y(), rect().width(), rect().height() );
+    QRectF evaluatedRect = evalItemRect( beforeRect );
+    if ( evaluatedRect != beforeRect )
+    {
+      setSceneRect( evaluatedRect );
+    }
   }
   if ( property == QgsComposerObject::ItemRotation || property == QgsComposerObject::AllProperties )
   {
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -817,15 +817,6 @@ void QgsComposerMap::setNewAtlasFeatureExtent( const QgsRectangle& extent )
   emit extentChanged();
 }
 
-void QgsComposerMap::toggleAtlasPreview()
-{
-  //atlas preview has been toggled, so update item and extents
-  mCacheUpdated = false;
-  updateItem();
-  emit itemChanged();
-  emit extentChanged();
-}
-
 QgsRectangle* QgsComposerMap::currentMapExtent()
 {
   //non-const version
@@ -1093,7 +1084,7 @@ void QgsComposerMap::updateItem()
     return;
   }
 
-  if ( mPreviewMode != QgsComposerMap::Rectangle &&  !mCacheUpdated )
+  if ( mPreviewMode != QgsComposerMap::Rectangle && !mCacheUpdated )
   {
     cache();
   }
@@ -2033,13 +2024,17 @@ void QgsComposerMap::refreshDataDefinedProperty( const QgsComposerObject::DataDe
        property == QgsComposerObject::MapAtlasMargin ||
        property == QgsComposerObject::AllProperties )
   {
+    QgsRectangle beforeExtent = *currentMapExtent();
     refreshMapExtents();
     emit itemChanged();
-    emit extentChanged();
+    if ( *currentMapExtent() != beforeExtent )
+    {
+      emit extentChanged();
+    }
   }
 
   //force redraw
-  cache();
+  mCacheUpdated = false;
 
   QgsComposerItem::refreshDataDefinedProperty( property );
 }
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -217,8 +217,10 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     */
     void setNewAtlasFeatureExtent( const QgsRectangle& extent );
 
-    /**Called when atlas preview is toggled, to force map item to update its extent and redraw*/
-    void toggleAtlasPreview();
+    /**Called when atlas preview is toggled, to force map item to update its extent and redraw
+     * @deprecated no longer required
+    */
+    Q_DECL_DEPRECATED void toggleAtlasPreview() {}
 
     /**Returns a pointer to the current map extent, which is either the original user specified
      * extent or the temporary atlas-driven feature extent depending on the current atlas state
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -225,6 +225,15 @@ void QgsComposition::updateBounds()
 void QgsComposition::refreshItems()
 {
   emit refreshItemsTriggered();
+  //force a redraw on all maps
+  QList<QgsComposerMap*> maps;
+  composerItems( maps );
+  QList<QgsComposerMap*>::iterator mapIt = maps.begin();
+  for ( ; mapIt != maps.end(); ++mapIt )
+  {
+    ( *mapIt )->cache();
+    ( *mapIt )->update();
+  }
 }
 
 void QgsComposition::setSelectedItem( QgsComposerItem *item )
@@ -295,6 +304,11 @@ QRectF QgsComposition::compositionBounds() const
 
 void QgsComposition::setPaperSize( const double width, const double height )
 {
+  if ( width == mPageWidth && height == mPageHeight )
+  {
+    return;
+  }
+
   //update item positions
   QList<QGraphicsItem *> itemList = items();
   QList<QGraphicsItem *>::iterator itemIt = itemList.begin();
@@ -2825,18 +2839,6 @@ bool QgsComposition::setAtlasMode( const AtlasMode mode )
     }
   }
 
-  QList<QgsComposerMap*> maps;
-  composerItems( maps );
-  for ( QList<QgsComposerMap*>::iterator mit = maps.begin(); mit != maps.end(); ++mit )
-  {
-    QgsComposerMap* currentMap = ( *mit );
-    if ( !currentMap->atlasDriven() )
-    {
-      continue;
-    }
-    currentMap->toggleAtlasPreview();
-  }
-
   update();
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -970,6 +970,11 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )`
`970`	`970`	`mActionAtlasNext->setEnabled( checked );`
`971`	`971`	`mActionAtlasPrev->setEnabled( checked );`
`972`	`972`
	`973`	`+ if ( checked )`
	`974`	`+ {`
	`975`	`+ loadAtlasPredefinedScalesFromProject();`
	`976`	`+ }`
	`977`	`+`
`973`	`978`	`bool previewEnabled = mComposition->setAtlasMode( checked ? QgsComposition::PreviewAtlas : QgsComposition::AtlasOff );`
`974`	`979`	`if ( !previewEnabled )`
`975`	`980`	`{`
`@@ -991,8 +996,6 @@ void QgsComposer::on_mActionAtlasPreview_triggered( bool checked )`
`991`	`996`
`992`	`997`	`if ( checked )`
`993`	`998`	`{`
`994`		`- loadAtlasPredefinedScalesFromProject();`
`995`		`- atlasMap->firstFeature();`
`996`	`999`	`emit( atlasPreviewFeatureChanged() );`
`997`	`1000`	`}`
`998`	`1001`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,11 @@ void QgsComposerItem::refreshRotation( const bool updateItem , const bool adjust`
`1032`	`1032`	`}`
`1033`	`1033`	`}`
`1034`	`1034`
	`1035`	`+ if ( rotation == mEvaluatedItemRotation )`
	`1036`	`+ {`
	`1037`	`+ return;`
	`1038`	`+ }`
	`1039`	`+`
`1035`	`1040`	`if ( adjustPosition )`
`1036`	`1041`	`{`
`1037`	`1042`	`//adjustPosition set, so shift the position of the item so that rotation occurs around item center`
`@@ -1297,8 +1302,12 @@ void QgsComposerItem::refreshDataDefinedProperty( const QgsComposerObject::DataD`
`1297`	`1302`	`property == QgsComposerObject::ItemWidth \|\| property == QgsComposerObject::ItemHeight \|\|`
`1298`	`1303`	`property == QgsComposerObject::AllProperties )`
`1299`	`1304`	`{`
`1300`		`- QRectF evaluatedRect = evalItemRect( QRectF( pos().x(), pos().y(), rect().width(), rect().height() ) );`
`1301`		`- setSceneRect( evaluatedRect );`
	`1305`	`+ QRectF beforeRect = QRectF( pos().x(), pos().y(), rect().width(), rect().height() );`
	`1306`	`+ QRectF evaluatedRect = evalItemRect( beforeRect );`
	`1307`	`+ if ( evaluatedRect != beforeRect )`
	`1308`	`+ {`
	`1309`	`+ setSceneRect( evaluatedRect );`
	`1310`	`+ }`
`1302`	`1311`	`}`
`1303`	`1312`	`if ( property == QgsComposerObject::ItemRotation \|\| property == QgsComposerObject::AllProperties )`
`1304`	`1313`	`{`
Original file line number	Diff line number	Diff line change
`@@ -817,15 +817,6 @@ void QgsComposerMap::setNewAtlasFeatureExtent( const QgsRectangle& extent )`
`817`	`817`	`emit extentChanged();`
`818`	`818`	`}`
`819`	`819`
`820`		`-void QgsComposerMap::toggleAtlasPreview()`
`821`		`-{`
`822`		`- //atlas preview has been toggled, so update item and extents`
`823`		`- mCacheUpdated = false;`
`824`		`- updateItem();`
`825`		`- emit itemChanged();`
`826`		`- emit extentChanged();`
`827`		`-}`
`828`		`-`
`829`	`820`	`QgsRectangle* QgsComposerMap::currentMapExtent()`
`830`	`821`	`{`
`831`	`822`	`//non-const version`
`@@ -1093,7 +1084,7 @@ void QgsComposerMap::updateItem()`
`1093`	`1084`	`return;`
`1094`	`1085`	`}`
`1095`	`1086`
`1096`		`- if ( mPreviewMode != QgsComposerMap::Rectangle && !mCacheUpdated )`
	`1087`	`+ if ( mPreviewMode != QgsComposerMap::Rectangle && !mCacheUpdated )`
`1097`	`1088`	`{`
`1098`	`1089`	`cache();`
`1099`	`1090`	`}`
`@@ -2033,13 +2024,17 @@ void QgsComposerMap::refreshDataDefinedProperty( const QgsComposerObject::DataDe`
`2033`	`2024`	`property == QgsComposerObject::MapAtlasMargin \|\|`
`2034`	`2025`	`property == QgsComposerObject::AllProperties )`
`2035`	`2026`	`{`
	`2027`	`+ QgsRectangle beforeExtent = *currentMapExtent();`
`2036`	`2028`	`refreshMapExtents();`
`2037`	`2029`	`emit itemChanged();`
`2038`		`- emit extentChanged();`
	`2030`	`+ if ( *currentMapExtent() != beforeExtent )`
	`2031`	`+ {`
	`2032`	`+ emit extentChanged();`
	`2033`	`+ }`
`2039`	`2034`	`}`
`2040`	`2035`
`2041`	`2036`	`//force redraw`
`2042`		`- cache();`
	`2037`	`+ mCacheUpdated = false;`
`2043`	`2038`
`2044`	`2039`	`QgsComposerItem::refreshDataDefinedProperty( property );`
`2045`	`2040`	`}`