|
23 | 23 | #include "qgsmaplayer.h"
|
24 | 24 | #include "qgsmaptopixel.h"
|
25 | 25 | #include "qgsproject.h"
|
26 |
| -#include "qgsmaprender.h" |
| 26 | +#include "qgsmaprenderer.h" |
27 | 27 | #include "qgsrendercontext.h"
|
28 | 28 | #include "qgsvectorlayer.h"
|
29 | 29 |
|
@@ -138,27 +138,27 @@ void QgsComposerMap::draw ( QPainter *painter, const QgsRect& extent, const QSiz
|
138 | 138 | return;
|
139 | 139 | }
|
140 | 140 |
|
141 |
| - QgsMapRender* canvasMapRender = mMapCanvas->mapRender(); |
142 |
| - if(!canvasMapRender) |
| 141 | + QgsMapRenderer* canvasMapRenderer = mMapCanvas->mapRender(); |
| 142 | + if(!canvasMapRenderer) |
143 | 143 | {
|
144 | 144 | return;
|
145 | 145 | }
|
146 | 146 |
|
147 |
| - QgsMapRender theMapRender; |
148 |
| - theMapRender.setExtent(extent); |
149 |
| - theMapRender.setOutputSize(size, dpi); |
150 |
| - theMapRender.setLayerSet(canvasMapRender->layerSet()); |
151 |
| - theMapRender.setProjectionsEnabled(canvasMapRender->projectionsEnabled()); |
152 |
| - theMapRender.setDestinationSrs(canvasMapRender->destinationSrs()); |
| 147 | + QgsMapRenderer theMapRenderer; |
| 148 | + theMapRenderer.setExtent(extent); |
| 149 | + theMapRenderer.setOutputSize(size, dpi); |
| 150 | + theMapRenderer.setLayerSet(canvasMapRenderer->layerSet()); |
| 151 | + theMapRenderer.setProjectionsEnabled(canvasMapRenderer->projectionsEnabled()); |
| 152 | + theMapRenderer.setDestinationSrs(canvasMapRenderer->destinationSrs()); |
153 | 153 |
|
154 |
| - QgsRenderContext* theRenderContext = theMapRender.renderContext(); |
| 154 | + QgsRenderContext* theRenderContext = theMapRenderer.renderContext(); |
155 | 155 | if(theRenderContext)
|
156 | 156 | {
|
157 | 157 | theRenderContext->setDrawEditingInformation(false);
|
158 | 158 | theRenderContext->setRenderingStopped(false);
|
159 | 159 | }
|
160 | 160 |
|
161 |
| - theMapRender.render(painter); |
| 161 | + theMapRenderer.render(painter); |
162 | 162 |
|
163 | 163 | mMapCanvas->freeze(false);
|
164 | 164 | }
|
|
0 commit comments