Skip to content

Commit

Permalink
[composer] Fix failing QgsAtlasComposition python test
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Sep 21, 2014
1 parent 7904c10 commit a554434
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions tests/src/python/test_qgsatlascomposition.py
Expand Up @@ -78,7 +78,7 @@ def testCase(self):
# set the fill symbol of the overview map
props2 = { "color": "127,0,0,127" }
fillSymbol2 = QgsFillSymbolV2.createSimple( props2 )
mOverview.setOverviewFrameMapSymbol( fillSymbol2 );
mOverview.setOverviewFrameMapSymbol( fillSymbol2 )

# header label
self.mLabel1 = QgsComposerLabel( self.mComposition )
Expand Down Expand Up @@ -158,11 +158,12 @@ def autoscale_render_test_old_api( self ):
self.mAtlas.setFixedScale( True )
self.mAtlas.setMargin( 0 )
self.mAtlas.setComposerMap( None )
self.mAtlasMap.setAtlasDriven( False )

def fixedscale_render_test( self ):
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
self.mAtlasMap.setAtlasDriven( True )
self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Fixed )
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );

self.mAtlas.beginRender()

Expand All @@ -178,7 +179,7 @@ def fixedscale_render_test( self ):

def predefinedscales_render_test( self ):
self.mAtlasMap.setAtlasDriven( True )
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Predefined )

scales = [1800000, 5000000]
Expand All @@ -199,7 +200,7 @@ def predefinedscales_render_test( self ):
self.mAtlas.endRender()

def hidden_render_test( self ):
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Fixed )
self.mAtlas.setHideCoverage( True )

Expand All @@ -216,7 +217,7 @@ def hidden_render_test( self ):
self.mAtlas.endRender()

def sorting_render_test( self ):
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Fixed )
self.mAtlas.setHideCoverage( False )

Expand All @@ -237,7 +238,7 @@ def sorting_render_test( self ):
self.mAtlas.endRender()

def filtering_render_test( self ):
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Fixed )
self.mAtlas.setHideCoverage( False )

Expand Down

0 comments on commit a554434

Please sign in to comment.