Fix composer legend "Filter by Atlas Feature" does not save

Fix #16663
qgis · Jun 6, 2017 · ecb4c5a6924693b3604706edbbed19439c2b1949 · ecb4c5a
1 parent 008f385
commit ecb4c5a6924693b3604706edbbed19439c2b1949
Unified Split

Showing with 5 additions and 0 deletions.

+2 −0 src/app/composer/qgscomposerlegendwidget.cpp

+3 −0 src/core/composer/qgscomposerlegend.cpp
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -155,6 +155,7 @@ void QgsComposerLegendWidget::setGuiElements()
   mCheckBoxAutoUpdate->setChecked( mLegend->autoUpdateModel() );
 
   mCheckboxResizeContents->setChecked( mLegend->resizeToContents() );
+  mFilterLegendByAtlasCheckBox->setChecked( mLegend->legendFilterOutAtlas() );
 
   const QgsComposerMap* map = mLegend->composerMap();
   mMapComboBox->setItem( map );
@@ -922,6 +923,7 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mWmsLegendHeightSpinBox->blockSignals( b );
   mCheckboxResizeContents->blockSignals( b );
   mTitleSpaceBottomSpinBox->blockSignals( b );
+  mFilterLegendByAtlasCheckBox->blockSignals( b );
 }
 
 void QgsComposerLegendWidget::selectedChanged( const QModelIndex & current, const QModelIndex & previous )

diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -413,6 +413,8 @@ bool QgsComposerLegend::writeXML( QDomElement& elem, QDomDocument & doc ) const
     composerLegendElem.setAttribute( "legendFilterByMap", "1" );
   }
 
+  composerLegendElem.setAttribute( "legendFilterByAtlas", mFilterOutAtlas ? "1" : "0" );
+
   return _writeXML( composerLegendElem, doc );
 }
 
@@ -522,6 +524,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   {
     setComposerMap( mComposition->getComposerMapById( itemElem.attribute( "map" ).toInt() ) );
   }
+  mFilterOutAtlas = itemElem.attribute( "legendFilterByAtlas", "0" ).toInt();
 
   QDomElement oldLegendModelElem = itemElem.firstChildElement( "Model" );
   if ( !oldLegendModelElem.isNull() )