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

nyalldawson · nyalldawson · commit dbdbd1579abb · 2017-06-08T10:35:47.000+10:00
Fix #16663 (forward port from ecb4c5a)
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -157,6 +157,7 @@ void QgsComposerLegendWidget::setGuiElements()
   mCheckBoxAutoUpdate->setChecked( mLegend->autoUpdateModel() );
 
   mCheckboxResizeContents->setChecked( mLegend->resizeToContents() );
+  mFilterLegendByAtlasCheckBox->setChecked( mLegend->legendFilterOutAtlas() );
 
   const QgsComposerMap *map = mLegend->composerMap();
   mMapComboBox->setItem( map );
@@ -937,6 +938,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
@@ -406,6 +406,7 @@ bool QgsComposerLegend::writeXml( QDomElement &elem, QDomDocument &doc ) const
   {
     composerLegendElem.setAttribute( QStringLiteral( "legendFilterByMap" ), QStringLiteral( "1" ) );
   }
+  composerLegendElem.setAttribute( QStringLiteral( "legendFilterByAtlas" ), mFilterOutAtlas ? QStringLiteral("1") : QStringLiteral("0") );
 
   return _writeXml( composerLegendElem, doc );
 }
@@ -479,6 +480,7 @@ bool QgsComposerLegend::readXml( const QDomElement &itemElem, const QDomDocument
   {
     setComposerMap( mComposition->getComposerMapById( itemElem.attribute( QStringLiteral( "map" ) ).toInt() ) );
   }
+  mFilterOutAtlas = itemElem.attribute( QStringLiteral("legendFilterByAtlas"), QStringLiteral("0") ).toInt();
 
   // QGIS >= 2.6
   QDomElement layerTreeElem = itemElem.firstChildElement( QStringLiteral( "layer-tree" ) );

Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,7 @@ bool QgsComposerLegend::writeXml( QDomElement &elem, QDomDocument &doc ) const`
`406`	`406`	`{`
`407`	`407`	`composerLegendElem.setAttribute( QStringLiteral( "legendFilterByMap" ), QStringLiteral( "1" ) );`
`408`	`408`	`}`
	`409`	`+ composerLegendElem.setAttribute( QStringLiteral( "legendFilterByAtlas" ), mFilterOutAtlas ? QStringLiteral("1") : QStringLiteral("0") );`
`409`	`410`
`410`	`411`	`return _writeXml( composerLegendElem, doc );`
`411`	`412`	`}`
`@@ -479,6 +480,7 @@ bool QgsComposerLegend::readXml( const QDomElement &itemElem, const QDomDocument`
`479`	`480`	`{`
`480`	`481`	`setComposerMap( mComposition->getComposerMapById( itemElem.attribute( QStringLiteral( "map" ) ).toInt() ) );`
`481`	`482`	`}`
	`483`	`+ mFilterOutAtlas = itemElem.attribute( QStringLiteral("legendFilterByAtlas"), QStringLiteral("0") ).toInt();`
`482`	`484`
`483`	`485`	`// QGIS >= 2.6`
`484`	`486`	`QDomElement layerTreeElem = itemElem.firstChildElement( QStringLiteral( "layer-tree" ) );`