sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[composer] Always update filename when atlas feature changes, otherwise exporting to images when 'single file' checkbox is ticked results in no output

Browse Source
This commit is contained in:
Nyall Dawson 2014-05-29 21:46:17 +10:00
parent d104045f2f
commit 88b8369acf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/composer/qgsatlascomposition.cpp
View File

@ -451,7 +451,7 @@ void QgsAtlasComposition::prepareMap( QgsComposerMap* map )
break;
}
if ( map->atlasScalingMode() == QgsComposerMap::Fixed || isPointLayer )
if ( map->atlasScalingMode() == QgsComposerMap::Fixed || isPointLayer )
{
// only translate, keep the original scale (i.e. width x height)
@ -683,7 +683,7 @@ void QgsAtlasComposition::updateFilenameExpression()
const QgsFields& fields = mCoverageLayer->pendingFields();
if ( !mSingleFile && mFilenamePattern.size() > 0 )
if ( mFilenamePattern.size() > 0 )
{
mFilenameExpr = std::auto_ptr<QgsExpression>( new QgsExpression( mFilenamePattern ) );
// expression used to evaluate each filename
@ -708,7 +708,7 @@ void QgsAtlasComposition::updateFilenameExpression()
void QgsAtlasComposition::evalFeatureFilename()
{
//generate filename for current atlas feature
if ( !mSingleFile && mFilenamePattern.size() > 0 )
if ( mFilenamePattern.size() > 0 )
{
QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature, mCoverageLayer->pendingFields() );
if ( mFilenameExpr->hasEvalError() )