Fix qgsatlascomposition constructor and related Atlas unit tests

qgis · Apr 11, 2013 · f0dd138 · f0dd138
1 parent f59e21c
commit f0dd138
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -32,7 +32,8 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) :
     mComposerMap( 0 ),
     mHideCoverage( false ), mFixedScale( false ), mMargin( 0.10 ), mFilenamePattern( "'output_'||$feature" ),
     mCoverageLayer( 0 ), mSingleFile( false ),
-    mSortFeatures( false ), mSortAscending( true ), mFeatureFilter( "" )
+    mSortFeatures( false ), mSortAscending( true ),
+    mFilterFeatures( false ), mFeatureFilter( "" )
 {
 
   // declare special columns with a default value

diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -261,6 +261,7 @@ void TestQgsAtlasComposition::filtering_render()
 
   mAtlas->setSortFeatures( false );
 
+  mAtlas->setFilterFeatures( true );
   mAtlas->setFeatureFilter( "substr(NAME_1,1,1)='P'" ); // select only 'Pays de la Loire'
 
   mAtlas->beginRender();

diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
@@ -195,6 +195,7 @@ def filtering_render_test( self ):
 
         self.mAtlas.setSortFeatures( False )
 
+        self.mAtlas.setFilterFeatures( True )
         self.mAtlas.setFeatureFilter( "substr(NAME_1,1,1)='P'" ) # select only 'Pays de la loire'
 
         self.mAtlas.beginRender()