Remove no longer required hack to get composer maps to render

nyalldawson · nyalldawson · commit f4877ce8a89c · 2017-03-13T14:03:53.000+10:00
canvas layers
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -934,23 +934,6 @@ bool QgsComposer::loadFromTemplate( const QDomDocument &templateDoc, bool clearE
   return result;
 }
 
-void QgsComposer::onCanvasLayersChanged( const QList<QgsMapLayer *> &layers )
-{
-  if ( !mComposition )
-    return;
-
-  QList< QgsComposerMap * > maps;
-  mComposition->composerItems( maps );
-
-  Q_FOREACH ( QgsComposerMap *map, maps )
-  {
-    if ( map->keepLayerSet() )
-      continue;
-
-    map->setLayers( layers );
-  }
-}
-
 void QgsComposer::updateStatusCursorPos( QPointF cursorPosition )
 {
   if ( !mComposition )
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -114,16 +114,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
      */
     bool loadFromTemplate( const QDomDocument &templateDoc, bool clearExisting );
 
-  public slots:
-
-    /**
-     * Should be called whenever the app's canvas layers change (or layer order
-     * changes). Required to update composer maps which are synced to the canvas
-     * layer set with the new canvas layer set.
-     * @note added in QGIS 3.0
-     */
-    void onCanvasLayersChanged( const QList< QgsMapLayer * > &layers );
-
   protected:
     //! Move event
     virtual void moveEvent( QMoveEvent * ) override;
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6828,7 +6828,6 @@ QgsComposer *QgisApp::createNewComposer( QString title )
   connect( newComposerObject, &QgsComposer::composerAdded, this, &QgisApp::composerAdded );
   connect( newComposerObject, &QgsComposer::composerWillBeRemoved, this, &QgisApp::composerWillBeRemoved );
   connect( newComposerObject, &QgsComposer::atlasPreviewFeatureChanged, this, &QgisApp::refreshMapCanvas );
-  connect( mLayerTreeCanvasBridge, &QgsLayerTreeMapCanvasBridge::canvasLayersChanged, newComposerObject, &QgsComposer::onCanvasLayersChanged );
 
   markDirty();
   return newComposerObject;
@@ -6932,7 +6931,6 @@ bool QgisApp::loadComposersFromProject( const QDomDocument &doc )
     connect( composer, &QgsComposer::composerAdded, this, &QgisApp::composerAdded );
     connect( composer, &QgsComposer::composerWillBeRemoved, this, &QgisApp::composerWillBeRemoved );
     connect( composer, &QgsComposer::atlasPreviewFeatureChanged, this, &QgisApp::refreshMapCanvas );
-    connect( mLayerTreeCanvasBridge, &QgsLayerTreeMapCanvasBridge::canvasLayersChanged, composer, &QgsComposer::onCanvasLayersChanged );
 
     QgsDebugMsg( QString( "Loaded composer %1: %2ms" ).arg( title ).arg( t.elapsed() ) );
   }
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -475,12 +475,16 @@ QList<QgsMapLayer *> QgsComposerMap::layersToRender( const QgsExpressionContext
     if ( mComposition->project()->mapThemeCollection()->hasMapTheme( presetName ) )
       renderLayers = mComposition->project()->mapThemeCollection()->mapThemeVisibleLayers( presetName );
     else  // fallback to using map canvas layers
-      renderLayers = layers();
+      renderLayers =  mComposition->project()->mapThemeCollection()->masterVisibleLayers();
   }
-  else
+  else if ( mKeepLayerSet )
   {
     renderLayers = layers();
   }
+  else
+  {
+    renderLayers =  mComposition->project()->mapThemeCollection()->masterVisibleLayers();
+  }
 
   bool ok = false;
   QString ddLayers = mDataDefinedProperties.valueAsString( QgsComposerObject::MapLayers, *evalContext, QString(), &ok );

Original file line number	Diff line number	Diff line change
`@@ -475,12 +475,16 @@ QList<QgsMapLayer *> QgsComposerMap::layersToRender( const QgsExpressionContext`
`475`	`475`	`if ( mComposition->project()->mapThemeCollection()->hasMapTheme( presetName ) )`
`476`	`476`	`renderLayers = mComposition->project()->mapThemeCollection()->mapThemeVisibleLayers( presetName );`
`477`	`477`	`else // fallback to using map canvas layers`
`478`		`- renderLayers = layers();`
	`478`	`+ renderLayers = mComposition->project()->mapThemeCollection()->masterVisibleLayers();`
`479`	`479`	`}`
`480`		`- else`
	`480`	`+ else if ( mKeepLayerSet )`
`481`	`481`	`{`
`482`	`482`	`renderLayers = layers();`
`483`	`483`	`}`
	`484`	`+ else`
	`485`	`+ {`
	`486`	`+ renderLayers = mComposition->project()->mapThemeCollection()->masterVisibleLayers();`
	`487`	`+ }`
`484`	`488`
`485`	`489`	`bool ok = false;`
`486`	`490`	`QString ddLayers = mDataDefinedProperties.valueAsString( QgsComposerObject::MapLayers, *evalContext, QString(), &ok );`