Skip to content
Permalink
Browse files

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

  • Loading branch information
ahuarte47 committed Nov 7, 2013
2 parents 2cfe27b + bff6fe5 commit f2ca9a194aea5204db769b0f3c723266bd0fce19
Showing with 2 additions and 0 deletions.
  1. +2 −0 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 )
{

0 comments on commit f2ca9a1

Please sign in to comment.
You can’t perform that action at this time.