@@ -215,12 +215,12 @@ void QgsMapRender::render(QPainter* painter)
215215
216216 QPaintDevice* thePaintDevice = painter->device ();
217217 if (!thePaintDevice)
218- {
219- return ;
220- }
221-
218+ {
219+ return ;
220+ }
221+
222222 mDrawing = true ;
223-
223+
224224 QgsCoordinateTransform* ct;
225225
226226#ifdef QGISDEBUG
@@ -250,13 +250,13 @@ void QgsMapRender::render(QPainter* painter)
250250 li.toBack ();
251251
252252 QgsRect r1, r2;
253-
253+
254254 while (li.hasPrevious ())
255255 {
256256 if (mRenderContext .renderingStopped ())
257- {
258- break ;
259- }
257+ {
258+ break ;
259+ }
260260
261261 QString layerId = li.previous ();
262262
@@ -278,8 +278,8 @@ void QgsMapRender::render(QPainter* painter)
278278 QgsLogger::warning (" Layer not found in registry!" );
279279 continue ;
280280 }
281-
282- QgsDebugMsg (" Rendering layer " + ml->name ());
281+
282+ QgsDebugMsg (" Rendering layer " + ml->name ());
283283 QgsDebugMsg (" Layer minscale " + QString (" %1" ).arg (ml->minScale ()) );
284284 QgsDebugMsg (" Layer maxscale " + QString (" %1" ).arg (ml->maxScale ()) );
285285 QgsDebugMsg (" Scale dep. visibility enabled? " + QString (" %1" ).arg (ml->scaleBasedVisibility ()) );
@@ -289,20 +289,20 @@ void QgsMapRender::render(QPainter* painter)
289289 || (!ml->scaleBasedVisibility ()))
290290 {
291291 connect (ml, SIGNAL (drawingProgress (int ,int )), this , SLOT (onDrawingProgress (int ,int )));
292-
292+
293293 //
294- // Now do the call to the layer that actually does
295- // the rendering work!
294+ // Now do the call to the layer that actually does
295+ // the rendering work!
296296 //
297297
298298 bool split = false ;
299-
299+
300300 if (projectionsEnabled ())
301301 {
302- r1 = mExtent ;
303- split = splitLayersExtent (ml, r1, r2);
302+ r1 = mExtent ;
303+ split = splitLayersExtent (ml, r1, r2);
304304 ct = new QgsCoordinateTransform (ml->srs (), *mDestSRS );
305- mRenderContext .setExtent (r1);
305+ mRenderContext .setExtent (r1);
306306 }
307307 else
308308 {
@@ -318,53 +318,53 @@ void QgsMapRender::render(QPainter* painter)
318318 QgsMapToPixel bk_mapToPixel;
319319 double debug = fabs (rasterScaleFactor - 1.0 );
320320 if (ml->type () == QgsMapLayer::RASTER && fabs (rasterScaleFactor - 1.0 ) > 0.000001 )
321- {
322- scaleRaster = true ;
323- }
321+ {
322+ scaleRaster = true ;
323+ }
324324
325325
326326 if (scaleRaster)
327- {
328- bk_mapToPixel = mRenderContext .mapToPixel ();
329- rasterMapToPixel = mRenderContext .mapToPixel ();
330- rasterMapToPixel.setMapUnitsPerPixel (mRenderContext .mapToPixel ().mapUnitsPerPixel () / rasterScaleFactor);
331- rasterMapToPixel.setYmax (mSize .height () * rasterScaleFactor);
332- mRenderContext .setMapToPixel (rasterMapToPixel);
333- mRenderContext .painter ()->save ();
334- mRenderContext .painter ()->scale (1.0 /rasterScaleFactor, 1.0 /rasterScaleFactor);
335- }
327+ {
328+ bk_mapToPixel = mRenderContext .mapToPixel ();
329+ rasterMapToPixel = mRenderContext .mapToPixel ();
330+ rasterMapToPixel.setMapUnitsPerPixel (mRenderContext .mapToPixel ().mapUnitsPerPixel () / rasterScaleFactor);
331+ rasterMapToPixel.setYmax (mSize .height () * rasterScaleFactor);
332+ mRenderContext .setMapToPixel (rasterMapToPixel);
333+ mRenderContext .painter ()->save ();
334+ mRenderContext .painter ()->scale (1.0 /rasterScaleFactor, 1.0 /rasterScaleFactor);
335+ }
336336
337337 if (!ml->draw (mRenderContext ))
338- {
339- emit drawError (ml);
340- }
341-
338+ {
339+ emit drawError (ml);
340+ }
341+
342342 if (split)
343343 {
344- mRenderContext .setExtent (r2);
344+ mRenderContext .setExtent (r2);
345345 if (!ml->draw (mRenderContext ))
346- {
347- emit drawError (ml);
348- }
346+ {
347+ emit drawError (ml);
348+ }
349349 }
350350
351351 if (scaleRaster)
352- {
353- mRenderContext .setMapToPixel (bk_mapToPixel);
354- mRenderContext .painter ()->restore ();
355- }
356-
352+ {
353+ mRenderContext .setMapToPixel (bk_mapToPixel);
354+ mRenderContext .painter ()->restore ();
355+ }
356+
357357 disconnect (ml, SIGNAL (drawingProgress (int ,int )), this , SLOT (onDrawingProgress (int ,int )));
358358 }
359359 else
360360 {
361361 QgsDebugMsg (" Layer not rendered because it is not within the defined "
362- " visibility scale range" );
362+ " visibility scale range" );
363363 }
364364
365365 } // while (li.hasPrevious())
366-
367- QgsDebugMsg (" Done rendering map layers" );
366+
367+ QgsDebugMsg (" Done rendering map layers" );
368368
369369 if (!mOverview )
370370 {
@@ -373,15 +373,15 @@ void QgsMapRender::render(QPainter* painter)
373373 while (li.hasPrevious ())
374374 {
375375 if (mRenderContext .renderingStopped ())
376- {
377- break ;
378- }
376+ {
377+ break ;
378+ }
379379
380380 QString layerId = li.previous ();
381381
382382 // TODO: emit drawingProgress((myRenderCounter++),zOrder.size());
383383 QgsMapLayer *ml = QgsMapLayerRegistry::instance ()->mapLayer (layerId);
384-
384+
385385 if (ml && (ml->type () != QgsMapLayer::RASTER))
386386 {
387387 // only make labels if the layer is visible
@@ -393,32 +393,32 @@ void QgsMapRender::render(QPainter* painter)
393393
394394 if (projectionsEnabled ())
395395 {
396- QgsRect r1 = mExtent ;
397- split = splitLayersExtent (ml, r1, r2);
396+ QgsRect r1 = mExtent ;
397+ split = splitLayersExtent (ml, r1, r2);
398398 ct = new QgsCoordinateTransform (ml->srs (), *mDestSRS );
399- mRenderContext .setExtent (r1);
399+ mRenderContext .setExtent (r1);
400400 }
401401 else
402402 {
403403 ct = NULL ;
404404 }
405-
406- mRenderContext .setCoordTransform (ct);
407-
408- ml->drawLabels (mRenderContext );
405+
406+ mRenderContext .setCoordTransform (ct);
407+
408+ ml->drawLabels (mRenderContext );
409409 if (split)
410- {
411- mRenderContext .setExtent (r2);
412- ml->drawLabels (mRenderContext );
413- }
410+ {
411+ mRenderContext .setExtent (r2);
412+ ml->drawLabels (mRenderContext );
413+ }
414414 }
415415 }
416416 }
417417 } // if (!mOverview)
418418
419419 // make sure progress bar arrives at 100%!
420420 emit drawingProgress (1 ,1 );
421-
421+
422422#ifdef QGISDEBUG
423423 QgsDebugMsg (" Rendering done in (seconds): " + QString (" %1" ).arg (renderTime.elapsed () / 1000.0 ) );
424424#endif
0 commit comments