[composer] Refresh attribute table filter when atlas feature changes (fix #10651)

nyalldawson · nyalldawson · commit 787f1a60d077 · 2014-06-23T23:13:53.000+10:00
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -121,6 +121,9 @@ QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* compositio
   {
     //refresh table attributes when composition is refreshed
     connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( refreshAttributes() ) );
+
+    //connect to atlas feature changes to update table rows
+    connect( &mComposition->atlasComposition(), SIGNAL( featureChanged( QgsFeature* ) ), this, SLOT( refreshAttributes() ) );
   }
 }
 
@@ -405,7 +408,7 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
   if ( !selectionRect.isEmpty() )
     req.setFilterRect( selectionRect );
 
-  req.setFlags( mShowOnlyVisibleFeatures ? QgsFeatureRequest::ExactIntersect : QgsFeatureRequest::NoGeometry );
+  req.setFlags( mShowOnlyVisibleFeatures ? QgsFeatureRequest::ExactIntersect : QgsFeatureRequest::NoFlags );
 
   QgsFeature f;
   int counter = 0;

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* compositio`
`121`	`121`	`{`
`122`	`122`	`//refresh table attributes when composition is refreshed`
`123`	`123`	`connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( refreshAttributes() ) );`
	`124`	`+`
	`125`	`+ //connect to atlas feature changes to update table rows`
	`126`	`+ connect( &mComposition->atlasComposition(), SIGNAL( featureChanged( QgsFeature* ) ), this, SLOT( refreshAttributes() ) );`
`124`	`127`	`}`
`125`	`128`	`}`
`126`	`129`
`@@ -405,7 +408,7 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at`
`405`	`408`	`if ( !selectionRect.isEmpty() )`
`406`	`409`	`req.setFilterRect( selectionRect );`
`407`	`410`
`408`		`- req.setFlags( mShowOnlyVisibleFeatures ? QgsFeatureRequest::ExactIntersect : QgsFeatureRequest::NoGeometry );`
	`411`	`+ req.setFlags( mShowOnlyVisibleFeatures ? QgsFeatureRequest::ExactIntersect : QgsFeatureRequest::NoFlags );`
`409`	`412`
`410`	`413`	`QgsFeature f;`
`411`	`414`	`int counter = 0;`