Skip to content

Commit fb344ff

Browse files
author
Sandro Santilli
committed
Use a simpler image for testing composer map rotation and overview
Update expected results and configuration of new image Add rendering anomalies, as determined by travis ubuntu 12.02
1 parent 32ab967 commit fb344ff

File tree

14 files changed

+31
-39
lines changed

14 files changed

+31
-39
lines changed

‎tests/src/core/testqgscomposermapoverview.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ void TestQgsComposerMapOverview::initTestCase()
5757
QgsApplication::initQgis();
5858

5959
//create maplayers from testdata and add to layer registry
60-
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "landsat.tif" );
60+
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "rgb256x256.png" );
6161
mRasterLayer = new QgsRasterLayer( rasterFileInfo.filePath(),
6262
rasterFileInfo.completeBaseName() );
63-
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 2, 3, 4 );
63+
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 1, 2, 3 );
6464
mRasterLayer->setRenderer( rasterRenderer );
6565

6666
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
@@ -103,11 +103,11 @@ void TestQgsComposerMapOverview::cleanup()
103103

104104
void TestQgsComposerMapOverview::overviewMap()
105105
{
106-
QgsComposerMap* overviewMap = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
106+
QgsComposerMap* overviewMap = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
107107
overviewMap->setFrameEnabled( true );
108108
mComposition->addComposerMap( overviewMap );
109-
mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
110-
overviewMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
109+
mComposerMap->setNewExtent( QgsRectangle( 96, -152, 160, -120 ) ); //zoom in
110+
overviewMap->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
111111
overviewMap->overview()->setFrameMap( mComposerMap->id() );
112112
QgsCompositionChecker checker( "composermap_overview", mComposition );
113113

@@ -121,9 +121,9 @@ void TestQgsComposerMapOverview::overviewMapRotated()
121121
QgsComposerMap* overviewMap = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
122122
overviewMap->setFrameEnabled( true );
123123
mComposition->addComposerMap( overviewMap );
124-
mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
124+
mComposerMap->setNewExtent( QgsRectangle( 96, -144, 160, -112 ) ); //zoom in
125125
mComposerMap->setMapRotation( 30 );
126-
overviewMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
126+
overviewMap->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
127127
overviewMap->overview()->setFrameMap( mComposerMap->id() );
128128
QgsCompositionChecker checker( "composermap_overview_rotated", mComposition );
129129

@@ -138,9 +138,9 @@ void TestQgsComposerMapOverview::overviewMapRotated2()
138138
QgsComposerMap* overviewMap = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
139139
overviewMap->setFrameEnabled( true );
140140
mComposition->addComposerMap( overviewMap );
141-
mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
141+
mComposerMap->setNewExtent( QgsRectangle( 96, -152, 160, -120 ) ); //zoom in
142142
overviewMap->setMapRotation( 30 );
143-
overviewMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
143+
overviewMap->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
144144
overviewMap->overview()->setFrameMap( mComposerMap->id() );
145145
QgsCompositionChecker checker( "composermap_overview_rotated2", mComposition );
146146

@@ -154,8 +154,8 @@ void TestQgsComposerMapOverview::overviewMapBlending()
154154
QgsComposerMap* overviewMapBlend = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
155155
overviewMapBlend->setFrameEnabled( true );
156156
mComposition->addComposerMap( overviewMapBlend );
157-
mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
158-
overviewMapBlend->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
157+
mComposerMap->setNewExtent( QgsRectangle( 96, -152, 160, -120 ) ); //zoom in
158+
overviewMapBlend->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
159159
overviewMapBlend->overview()->setFrameMap( mComposerMap->id() );
160160
overviewMapBlend->overview()->setBlendMode( QPainter::CompositionMode_Multiply );
161161

@@ -171,8 +171,8 @@ void TestQgsComposerMapOverview::overviewMapInvert()
171171
QgsComposerMap* overviewMapInvert = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
172172
overviewMapInvert->setFrameEnabled( true );
173173
mComposition->addComposerMap( overviewMapInvert );
174-
mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
175-
overviewMapInvert->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
174+
mComposerMap->setNewExtent( QgsRectangle( 96, -152, 160, -120 ) ); //zoom in
175+
overviewMapInvert->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
176176
overviewMapInvert->overview()->setFrameMap( mComposerMap->id() );
177177
overviewMapInvert->overview()->setInverted( true );
178178

@@ -188,8 +188,8 @@ void TestQgsComposerMapOverview::overviewMapCenter()
188188
QgsComposerMap* overviewMapCenter = new QgsComposerMap( mComposition, 20, 130, 70, 70 );
189189
overviewMapCenter->setFrameEnabled( true );
190190
mComposition->addComposerMap( overviewMapCenter );
191-
mComposerMap->setNewExtent( QgsRectangle( 785462.375 + 5000, 3341423.125, 789262.375 + 5000, 3343323.125 ) ); //zoom in
192-
overviewMapCenter->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3350923.125 ) );
191+
mComposerMap->setNewExtent( QgsRectangle( 192, -288, 320, -224 ) );
192+
overviewMapCenter->setNewExtent( QgsRectangle( 0, -256, 256, 0 ) );
193193
overviewMapCenter->overview()->setFrameMap( mComposerMap->id() );
194194
overviewMapCenter->overview()->setCentered( true );
195195

‎tests/src/core/testqgscomposerrotation.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ void TestQgsComposerRotation::initTestCase()
6565
QgsApplication::initQgis();
6666

6767
//create maplayers from testdata and add to layer registry
68-
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "landsat.tif" );
68+
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "rgb256x256.png" );
6969
mRasterLayer = new QgsRasterLayer( rasterFileInfo.filePath(),
7070
rasterFileInfo.completeBaseName() );
71-
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 2, 3, 4 );
71+
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 1, 2, 3 );
7272
mRasterLayer->setRenderer( rasterRenderer );
7373

7474
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
@@ -180,10 +180,10 @@ void TestQgsComposerRotation::oldLabelRotationApi()
180180
void TestQgsComposerRotation::mapRotation()
181181
{
182182
//test map rotation
183-
QgsComposerMap* composerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
183+
QgsComposerMap* composerMap = new QgsComposerMap( mComposition, 20, 20, 100, 50 );
184184
composerMap->setFrameEnabled( true );
185185
mComposition->addItem( composerMap );
186-
composerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
186+
composerMap->setNewExtent( QgsRectangle( 0, -192, 256, -64 ) );
187187
composerMap->setMapRotation( 90 );
188188

189189
QgsCompositionChecker checker( "composerrotation_maprotation", mComposition );
@@ -196,10 +196,10 @@ void TestQgsComposerRotation::mapRotation()
196196
void TestQgsComposerRotation::mapItemRotation()
197197
{
198198
//test map item rotation
199-
QgsComposerMap* composerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
199+
QgsComposerMap* composerMap = new QgsComposerMap( mComposition, 20, 50, 100, 50 );
200200
composerMap->setFrameEnabled( true );
201201
mComposition->addItem( composerMap );
202-
composerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
202+
composerMap->setNewExtent( QgsRectangle( 0, -192, 256, -64 ) );
203203
composerMap->setItemRotation( 90, true );
204204

205205
QgsCompositionChecker checker( "composerrotation_mapitemrotation", mComposition );

‎tests/src/python/test_qgscomposermap.py‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class TestQgsComposerMap(TestCase):
4545
def __init__(self, methodName):
4646
"""Run once on class initialisation."""
4747
unittest.TestCase.__init__(self, methodName)
48-
myPath = os.path.join(TEST_DATA_DIR, 'landsat.tif')
48+
myPath = os.path.join(TEST_DATA_DIR, 'rgb256x256.png')
4949
rasterFileInfo = QFileInfo(myPath)
5050
mRasterLayer = QgsRasterLayer(rasterFileInfo.filePath(),
5151
rasterFileInfo.completeBaseName())
5252
rasterRenderer = QgsMultiBandColorRenderer(
53-
mRasterLayer.dataProvider(), 2, 3, 4)
53+
mRasterLayer.dataProvider(), 1, 2, 3)
5454
mRasterLayer.setRenderer(rasterRenderer)
5555
#pipe = mRasterLayer.pipe()
5656
#assert pipe.set(rasterRenderer), 'Cannot set pipe renderer'
@@ -73,11 +73,9 @@ def testOverviewMap(self):
7373
overviewMap.setFrameEnabled(True)
7474
self.mComposition.addComposerMap(overviewMap)
7575
# zoom in
76-
myRectangle = QgsRectangle(785462.375, 3341423.125,
77-
789262.375, 3343323.125)
76+
myRectangle = QgsRectangle(96, -152, 160, -120)
7877
self.mComposerMap.setNewExtent(myRectangle)
79-
myRectangle2 = QgsRectangle(781662.375, 3339523.125,
80-
793062.375, 3350923.125)
78+
myRectangle2 = QgsRectangle(0, -256, 256, 0)
8179
overviewMap.setNewExtent(myRectangle2)
8280
overviewMap.setOverviewFrameMap(self.mComposerMap.id())
8381
checker = QgsCompositionChecker('composermap_overview', self.mComposition)
@@ -90,11 +88,9 @@ def testOverviewMapBlend(self):
9088
overviewMap.setFrameEnabled(True)
9189
self.mComposition.addComposerMap(overviewMap)
9290
# zoom in
93-
myRectangle = QgsRectangle(785462.375, 3341423.125,
94-
789262.375, 3343323.125)
91+
myRectangle = QgsRectangle(96, -152, 160, -120)
9592
self.mComposerMap.setNewExtent(myRectangle)
96-
myRectangle2 = QgsRectangle(781662.375, 3339523.125,
97-
793062.375, 3350923.125)
93+
myRectangle2 = QgsRectangle(0, -256, 256, 0)
9894
overviewMap.setNewExtent(myRectangle2)
9995
overviewMap.setOverviewFrameMap(self.mComposerMap.id())
10096
overviewMap.setOverviewBlendMode(QPainter.CompositionMode_Multiply)
@@ -108,11 +104,9 @@ def testOverviewMapInvert(self):
108104
overviewMap.setFrameEnabled(True)
109105
self.mComposition.addComposerMap(overviewMap)
110106
# zoom in
111-
myRectangle = QgsRectangle(785462.375, 3341423.125,
112-
789262.375, 3343323.125)
107+
myRectangle = QgsRectangle(96, -152, 160, -120)
113108
self.mComposerMap.setNewExtent(myRectangle)
114-
myRectangle2 = QgsRectangle(781662.375, 3339523.125,
115-
793062.375, 3350923.125)
109+
myRectangle2 = QgsRectangle(0, -256, 256, 0)
116110
overviewMap.setNewExtent(myRectangle2)
117111
overviewMap.setOverviewFrameMap(self.mComposerMap.id())
118112
overviewMap.setOverviewInverted(True)
@@ -126,11 +120,9 @@ def testOverviewMapCenter(self):
126120
overviewMap.setFrameEnabled(True)
127121
self.mComposition.addComposerMap(overviewMap)
128122
# zoom in
129-
myRectangle = QgsRectangle(785462.375+5000, 3341423.125,
130-
789262.375+5000, 3343323.125)
123+
myRectangle = QgsRectangle(192, -288, 320, -224)
131124
self.mComposerMap.setNewExtent(myRectangle)
132-
myRectangle2 = QgsRectangle(781662.375, 3339523.125,
133-
793062.375, 3350923.125)
125+
myRectangle2 = QgsRectangle(0, -256, 256, 0)
134126
overviewMap.setNewExtent(myRectangle2)
135127
overviewMap.setOverviewFrameMap(self.mComposerMap.id())
136128
overviewMap.setOverviewInverted(False)

‎tests/testdata/control_images/expected_composermap_overview/expected_composermap_overview.png‎

-86.3 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_blending/expected_composermap_overview_blending.png‎

-86.3 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_center/expected_composermap_overview_center.png‎

-40.3 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_invert/expected_composermap_overview_invert.png‎

-80.2 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_rotated/expected_composermap_overview_rotated.png‎

-164 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_rotated/travis_ubuntu_12.04_anomaly.png‎

1.73 KB
Loading

‎tests/testdata/control_images/expected_composermap_overview_rotated2/expected_composermap_overview_rotated2.png‎

-94.3 KB
Loading

0 commit comments

Comments
 (0)