@@ -57,10 +57,10 @@ void TestQgsComposerMapOverview::initTestCase()
57
57
QgsApplication::initQgis ();
58
58
59
59
// 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 " );
61
61
mRasterLayer = new QgsRasterLayer ( rasterFileInfo.filePath (),
62
62
rasterFileInfo.completeBaseName () );
63
- QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer ( mRasterLayer ->dataProvider (), 2 , 3 , 4 );
63
+ QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer ( mRasterLayer ->dataProvider (), 1 , 2 , 3 );
64
64
mRasterLayer ->setRenderer ( rasterRenderer );
65
65
66
66
QgsMapLayerRegistry::instance ()->addMapLayers ( QList<QgsMapLayer*>() << mRasterLayer );
@@ -103,11 +103,11 @@ void TestQgsComposerMapOverview::cleanup()
103
103
104
104
void TestQgsComposerMapOverview::overviewMap ()
105
105
{
106
- QgsComposerMap* overviewMap = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
106
+ QgsComposerMap* overviewMap = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
107
107
overviewMap->setFrameEnabled ( true );
108
108
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 ) );
111
111
overviewMap->overview ()->setFrameMap ( mComposerMap ->id () );
112
112
QgsCompositionChecker checker ( " composermap_overview" , mComposition );
113
113
@@ -121,9 +121,9 @@ void TestQgsComposerMapOverview::overviewMapRotated()
121
121
QgsComposerMap* overviewMap = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
122
122
overviewMap->setFrameEnabled ( true );
123
123
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
125
125
mComposerMap ->setMapRotation ( 30 );
126
- overviewMap->setNewExtent ( QgsRectangle ( 781662.375 , 3339523.125 , 793062.375 , 3350923.125 ) );
126
+ overviewMap->setNewExtent ( QgsRectangle ( 0 , - 256 , 256 , 0 ) );
127
127
overviewMap->overview ()->setFrameMap ( mComposerMap ->id () );
128
128
QgsCompositionChecker checker ( " composermap_overview_rotated" , mComposition );
129
129
@@ -138,9 +138,9 @@ void TestQgsComposerMapOverview::overviewMapRotated2()
138
138
QgsComposerMap* overviewMap = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
139
139
overviewMap->setFrameEnabled ( true );
140
140
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
142
142
overviewMap->setMapRotation ( 30 );
143
- overviewMap->setNewExtent ( QgsRectangle ( 781662.375 , 3339523.125 , 793062.375 , 3350923.125 ) );
143
+ overviewMap->setNewExtent ( QgsRectangle ( 0 , - 256 , 256 , 0 ) );
144
144
overviewMap->overview ()->setFrameMap ( mComposerMap ->id () );
145
145
QgsCompositionChecker checker ( " composermap_overview_rotated2" , mComposition );
146
146
@@ -154,8 +154,8 @@ void TestQgsComposerMapOverview::overviewMapBlending()
154
154
QgsComposerMap* overviewMapBlend = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
155
155
overviewMapBlend->setFrameEnabled ( true );
156
156
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 ) );
159
159
overviewMapBlend->overview ()->setFrameMap ( mComposerMap ->id () );
160
160
overviewMapBlend->overview ()->setBlendMode ( QPainter::CompositionMode_Multiply );
161
161
@@ -171,8 +171,8 @@ void TestQgsComposerMapOverview::overviewMapInvert()
171
171
QgsComposerMap* overviewMapInvert = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
172
172
overviewMapInvert->setFrameEnabled ( true );
173
173
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 ) );
176
176
overviewMapInvert->overview ()->setFrameMap ( mComposerMap ->id () );
177
177
overviewMapInvert->overview ()->setInverted ( true );
178
178
@@ -188,8 +188,8 @@ void TestQgsComposerMapOverview::overviewMapCenter()
188
188
QgsComposerMap* overviewMapCenter = new QgsComposerMap ( mComposition , 20 , 130 , 70 , 70 );
189
189
overviewMapCenter->setFrameEnabled ( true );
190
190
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 ) );
193
193
overviewMapCenter->overview ()->setFrameMap ( mComposerMap ->id () );
194
194
overviewMapCenter->overview ()->setCentered ( true );
195
195
0 commit comments