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

Fix failing atlas tests

Browse Source
This commit is contained in:
Nyall Dawson 2014-09-21 21:00:44 +10:00
parent 3af68f4888
commit 6138131366
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/src/core/testqgsatlascomposition.cpp
View File

@ -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;

BIN
tests/testdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 43 KiB

BIN
tests/testdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 47 KiB