Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR

qgis · Nov 7, 2013 · f2ca9a1 · f2ca9a1
2 parents 2cfe27b + bff6fe5
commit f2ca9a1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -41,6 +41,7 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) :
   QgsExpression::setSpecialColumn( "$feature", QVariant(( int )0 ) );
   QgsExpression::setSpecialColumn( "$numpages", QVariant(( int )1 ) );
   QgsExpression::setSpecialColumn( "$numfeatures", QVariant(( int )0 ) );
+  QgsExpression::setSpecialColumn( "$currentfeature", QVariant(( int )0 ) );
 }
 
 QgsAtlasComposition::~QgsAtlasComposition()
@@ -225,6 +226,7 @@ void QgsAtlasComposition::prepareForFeature( int featureI )
 
   // retrieve the next feature, based on its id
   mCoverageLayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureIds[ featureI ] ) ).nextFeature( mCurrentFeature );
+  QgsExpression::setSpecialColumn( "$currentfeature", mCurrentFeature.id() );
 
   if ( !mSingleFile && mFilenamePattern.size() > 0 )
   {