Skip to content
Permalink
Browse files

Fix failing atlas tests

  • Loading branch information
nyalldawson committed Sep 21, 2014
1 parent 3af68f4 commit 6138131366a1816a1758d07788d80c489a5350e3
@@ -243,16 +243,17 @@ void TestQgsAtlasComposition::autoscale_render_2_0_api()
}
mAtlas->endRender();
Q_NOWARN_DEPRECATED_PUSH
mAtlas->setComposerMap( 0 );
mAtlas->setFixedScale( false );
mAtlas->setMargin( 0 );
mAtlas->setComposerMap( 0 );
mAtlasMap->setAtlasDriven( false );
Q_NOWARN_DEPRECATED_POP
}

void TestQgsAtlasComposition::fixedscale_render()
{
mAtlasMap->setAtlasDriven( true );
mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
mAtlasMap->setAtlasDriven( true );
mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );

mAtlas->beginRender();
@@ -289,15 +290,17 @@ void TestQgsAtlasComposition::fixedscale_render_2_0_api()
}
mAtlas->endRender();
Q_NOWARN_DEPRECATED_PUSH
mAtlas->setComposerMap( 0 );
mAtlas->setFixedScale( false );
mAtlas->setComposerMap( 0 );
mAtlasMap->setAtlasDriven( false );

Q_NOWARN_DEPRECATED_POP
}

void TestQgsAtlasComposition::predefinedscales_render()
{
mAtlasMap->setAtlasDriven( true );
mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
mAtlasMap->setAtlasDriven( true );
mAtlasMap->setAtlasScalingMode( QgsComposerMap::Predefined );

QVector<double> scales;
Binary file not shown.
Binary file not shown.

0 comments on commit 6138131

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