[composer] Update atlas filename expression when the expression actua…

…lly changes
qgis · Jan 1, 2014 · 8b60d8f · 8b60d8f
1 parent 5a91aa7
commit 8b60d8f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -115,21 +115,7 @@ int QgsAtlasComposition::updateFeatures()
   mTransform.setSourceCrs( coverage_crs );
   mTransform.setDestCRS( destination_crs );
 
-  const QgsFields& fields = mCoverageLayer->pendingFields();
-
-  if ( !mSingleFile && mFilenamePattern.size() > 0 )
-  {
-    mFilenameExpr = std::auto_ptr<QgsExpression>( new QgsExpression( mFilenamePattern ) );
-    // expression used to evaluate each filename
-    // test for evaluation errors
-    if ( mFilenameExpr->hasParserError() )
-    {
-      throw std::runtime_error( tr( "Filename parsing error: %1" ).arg( mFilenameExpr->parserErrorString() ).toLocal8Bit().data() );
-    }
-
-    // prepare the filename expression
-    mFilenameExpr->prepare( fields );
-  }
+  updateFilenameExpression();
 
   // select all features with all attributes
   QgsFeatureIterator fit = mCoverageLayer->getFeatures();
@@ -539,4 +525,29 @@ void QgsAtlasComposition::setHideCoverage( bool hide )
 
 }
 
+void QgsAtlasComposition::setFilenamePattern( const QString& pattern )
+{
+  mFilenamePattern = pattern;
+  updateFilenameExpression();
+}
+
+void QgsAtlasComposition::updateFilenameExpression()
+{
+  const QgsFields& fields = mCoverageLayer->pendingFields();
+
+  if ( !mSingleFile && mFilenamePattern.size() > 0 )
+  {
+    mFilenameExpr = std::auto_ptr<QgsExpression>( new QgsExpression( mFilenamePattern ) );
+    // expression used to evaluate each filename
+    // test for evaluation errors
+    if ( mFilenameExpr->hasParserError() )
+    {
+      throw std::runtime_error( tr( "Filename parsing error: %1" ).arg( mFilenameExpr->parserErrorString() ).toLocal8Bit().data() );
+    }
+
+    // prepare the filename expression
+    mFilenameExpr->prepare( fields );
+  }
+}
+
 
diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -58,7 +58,7 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     void setMargin( float margin ) { mMargin = margin; }
 
     QString filenamePattern() const { return mFilenamePattern; }
-    void setFilenamePattern( const QString& pattern ) { mFilenamePattern = pattern; }
+    void setFilenamePattern( const QString& pattern );
 
     QgsVectorLayer* coverageLayer() const { return mCoverageLayer; }
     void setCoverageLayer( QgsVectorLayer* lmap );
@@ -121,6 +121,9 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     void statusMsgChanged( QString message );
 
   private:
+    /**Updates the filename expression*/
+    void updateFilenameExpression();
+
     QgsComposition* mComposition;
 
     bool mEnabled;