[composer] Remove QgsComposerMap::storeCurrentLayerSet

This method was used to sync the canvas layers to a composer map. The logic has been moved to app to avoid a dependancy between compositions and the main map canvas
qgis · Jan 16, 2017 · 4941121 · 4941121
1 parent f96364e
commit 4941121
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -569,7 +569,7 @@ and should be accessed using QgsComposerMap::overview() or QgsComposerMap::overv
 instead.
 - atlasFixedScale() and setAtlasFixedScale() were removed. Use atlasScalingMode()
 and setAtlasScalingMode() instead.
-
+- storeCurrentLayerSet() was removed. Use setLayers() instead.
 
 QgsComposerMapGrid        {#qgis_api_break_3_0_QgsComposerMapGrid}
 ------------------

diff --git a/python/core/composer/qgscomposermap.sip b/python/core/composer/qgscomposermap.sip
@@ -139,8 +139,6 @@ class QgsComposerMap : QgsComposerItem
     QList<QgsMapLayer*> layers() const;
     /** Setter for stored layer set that is used if mKeepLayerSet is true */
     void setLayers( const QList<QgsMapLayer*> layers );
-    /** Stores the current layer set of the qgis mapcanvas in mLayerSet*/
-    void storeCurrentLayerSet();
 
     /** Getter for flag that determines if current styles of layers should be overridden by previously stored styles. @note added in 2.8 */
     bool keepLayerStyles() const;

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -828,7 +828,7 @@ void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged( int state )
 
   if ( state == Qt::Checked )
   {
-    mComposerMap->storeCurrentLayerSet();
+    storeCurrentLayerSet();
     mComposerMap->setKeepLayerSet( true );
 
     // mutually exclusive with following a preset
@@ -1450,6 +1450,21 @@ void QgsComposerMapWidget::updateOverviewFrameSymbolMarker( const QgsComposerMap
   }
 }
 
+void QgsComposerMapWidget::storeCurrentLayerSet()
+{
+  if ( !mComposerMap )
+    return;
+
+  QList<QgsMapLayer*> layers = QgisApp::instance()->mapCanvas()->mapSettings().layers();
+  mComposerMap->setLayers( layers );
+
+  if ( mComposerMap->keepLayerStyles() )
+  {
+    // also store styles associated with the layers
+    mComposerMap->storeCurrentLayerStyles();
+  }
+}
+
 QListWidgetItem* QgsComposerMapWidget::addOverviewListItem( const QString& id, const QString& name )
 {
   QListWidgetItem* item = new QListWidgetItem( name, nullptr );

diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -163,6 +163,9 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     void loadOverviewEntries();
 
     void updateOverviewFrameSymbolMarker( const QgsComposerMapOverview* overview );
+
+    void storeCurrentLayerSet();
+
 };
 
 #endif
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1561,17 +1561,6 @@ bool QgsComposerMap::readXml( const QDomElement& itemElem, const QDomDocument& d
   return true;
 }
 
-void QgsComposerMap::storeCurrentLayerSet()
-{
-  mLayers = _qgis_listRawToQPointer( mComposition->mapSettings().layers() );
-
-  if ( mKeepLayerStyles )
-  {
-    // also store styles associated with the layers
-    storeCurrentLayerStyles();
-  }
-}
-
 QList<QgsMapLayer*> QgsComposerMap::layers() const
 {
   return _qgis_listQPointerToRaw( mLayers );

diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -178,8 +178,6 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     QList<QgsMapLayer*> layers() const;
     //! Setter for stored layer set that is used if mKeepLayerSet is true
     void setLayers( const QList<QgsMapLayer*> layers );
-    //! Stores the current layer set of the qgis mapcanvas in mLayerSet
-    void storeCurrentLayerSet();
 
     //! Getter for flag that determines if current styles of layers should be overridden by previously stored styles. @note added in 2.8
     bool keepLayerStyles() const { return mKeepLayerStyles; }