[QGIS Commit] r9002 - in trunk/qgis: python/gui src/gui
src/plugins/grass src/plugins/north_arrow
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Aug 6 08:42:25 EDT 2008
Author: timlinux
Date: 2008-08-06 08:42:23 -0400 (Wed, 06 Aug 2008)
New Revision: 9002
Modified:
trunk/qgis/python/gui/qgsmapcanvas.sip
trunk/qgis/src/gui/qgsmapcanvas.cpp
trunk/qgis/src/gui/qgsmapcanvas.h
trunk/qgis/src/gui/qgsmapcanvasmap.cpp
trunk/qgis/src/gui/qgsmapcanvassnapper.cpp
trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
trunk/qgis/src/gui/qgsmaptool.cpp
trunk/qgis/src/gui/qgsquickprint.cpp
trunk/qgis/src/gui/qgsrubberband.cpp
trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
trunk/qgis/src/plugins/north_arrow/plugin.cpp
Log:
Use mapRenderer() instead of mapRender() for the QgsMapCanvas map renderer accessor.
Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip 2008-08-06 12:42:23 UTC (rev 9002)
@@ -62,7 +62,7 @@
QgsMapCanvasMap* map();
- QgsMapRenderer* mapRender();
+ QgsMapRenderer* mapRenderer();
//! Accessor for the canvas pixmap
QPixmap& canvasPixmap();
Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -167,7 +167,7 @@
return mMap;
}
-QgsMapRenderer* QgsMapCanvas::mapRender()
+QgsMapRenderer* QgsMapCanvas::mapRenderer()
{
return mMapRenderer;
}
Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmapcanvas.h 2008-08-06 12:42:23 UTC (rev 9002)
@@ -113,7 +113,7 @@
QgsMapCanvasMap* map();
- QgsMapRenderer* mapRender();
+ QgsMapRenderer* mapRenderer();
//! Accessor for the canvas pixmap
QPixmap& canvasPixmap();
Modified: trunk/qgis/src/gui/qgsmapcanvasmap.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvasmap.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmapcanvasmap.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -49,7 +49,7 @@
void QgsMapCanvasMap::resize(QSize size)
{
mPixmap = QPixmap(size);
- mCanvas->mapRender()->setOutputSize(size, mPixmap.logicalDpiX());
+ mCanvas->mapRenderer()->setOutputSize(size, mPixmap.logicalDpiX());
}
void QgsMapCanvasMap::setPanningOffset(const QPoint& point)
@@ -81,7 +81,7 @@
if (mAntiAliasing)
paint.setRenderHint(QPainter::Antialiasing);
- mCanvas->mapRender()->render(&paint);
+ mCanvas->mapRenderer()->render(&paint);
paint.end();
@@ -95,7 +95,7 @@
paint.begin(&mPixmap);
// Clip our drawing to the QPixmap
paint.setClipRect(mPixmap.rect());
- mCanvas->mapRender()->render(&paint);
+ mCanvas->mapRenderer()->render(&paint);
paint.end();
}
update();
Modified: trunk/qgis/src/gui/qgsmapcanvassnapper.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvassnapper.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmapcanvassnapper.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -27,7 +27,7 @@
{
if(canvas)
{
- QgsMapRenderer* canvasRender = canvas->mapRender();
+ QgsMapRenderer* canvasRender = canvas->mapRenderer();
if(canvasRender)
{
mSnapper = new QgsSnapper(canvasRender);
@@ -50,7 +50,7 @@
mMapCanvas = canvas;
if(mMapCanvas)
{
- mSnapper = new QgsSnapper(canvas->mapRender());
+ mSnapper = new QgsSnapper(canvas->mapRenderer());
}
else
{
Modified: trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -284,7 +284,7 @@
void QgsMapOverviewCanvas::destinationSrsChanged()
{
- const QgsSpatialRefSys& srs = mMapCanvas->mapRender()->destinationSrs();
+ const QgsSpatialRefSys& srs = mMapCanvas->mapRenderer()->destinationSrs();
mMapRenderer->setDestinationSrs(srs);
}
Modified: trunk/qgis/src/gui/qgsmaptool.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmaptool.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsmaptool.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -48,17 +48,17 @@
QgsPoint QgsMapTool::toLayerCoords(QgsMapLayer* layer, const QgsPoint& point)
{
- return mCanvas->mapRender()->outputCoordsToLayerCoords(layer, point);
+ return mCanvas->mapRenderer()->outputCoordsToLayerCoords(layer, point);
}
QgsPoint QgsMapTool::toMapCoords(QgsMapLayer* layer, const QgsPoint& point)
{
- return mCanvas->mapRender()->layerCoordsToOutputCoords(layer, point);
+ return mCanvas->mapRenderer()->layerCoordsToOutputCoords(layer, point);
}
QgsRect QgsMapTool::toLayerCoords(QgsMapLayer* layer, const QgsRect& rect)
{
- return mCanvas->mapRender()->outputCoordsToLayerCoords(layer, rect);
+ return mCanvas->mapRenderer()->outputCoordsToLayerCoords(layer, rect);
}
QPoint QgsMapTool::toCanvasCoords(const QgsPoint& point)
Modified: trunk/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsquickprint.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -96,7 +96,7 @@
}
void QgsQuickPrint::setMapCanvas(QgsMapCanvas * thepMapCanvas)
{
- mpMapRenderer=thepMapCanvas->mapRender();
+ mpMapRenderer=thepMapCanvas->mapRenderer();
mMapBackgroundColour = thepMapCanvas->canvasColor();
}
void QgsQuickPrint::setMapRenderer(QgsMapRenderer * thepMapRenderer)
Modified: trunk/qgis/src/gui/qgsrubberband.cpp
===================================================================
--- trunk/qgis/src/gui/qgsrubberband.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/gui/qgsrubberband.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -160,7 +160,7 @@
}
//maprender object of canvas
- QgsMapRenderer* mr = mMapCanvas->mapRender();
+ QgsMapRenderer* mr = mMapCanvas->mapRenderer();
if(!mr)
{
return;
Modified: trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -1117,8 +1117,8 @@
{
try
{
- p1 = mCanvas->mapRender()->outputCoordsToLayerCoords(mLayer, p1);
- p2 = mCanvas->mapRender()->outputCoordsToLayerCoords(mLayer, p2);
+ p1 = mCanvas->mapRenderer()->outputCoordsToLayerCoords(mLayer, p1);
+ p2 = mCanvas->mapRenderer()->outputCoordsToLayerCoords(mLayer, p2);
}
catch(QgsCsException& cse)
{
@@ -1755,13 +1755,13 @@
QgsPoint QgsGrassEdit::transformLayerToCanvas ( QgsPoint point)
{
- point = mCanvas->mapRender()->layerCoordsToOutputCoords(mLayer, point);
+ point = mCanvas->mapRenderer()->layerCoordsToOutputCoords(mLayer, point);
return mTransform->transform(point);
}
QgsPoint QgsGrassEdit::transformLayerToMap ( QgsPoint point)
{
- return mCanvas->mapRender()->layerCoordsToOutputCoords(mLayer, point);
+ return mCanvas->mapRenderer()->layerCoordsToOutputCoords(mLayer, point);
}
void QgsGrassEdit::displayIcon ( double x, double y, const QPen & pen,
Modified: trunk/qgis/src/plugins/north_arrow/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/north_arrow/plugin.cpp 2008-08-06 11:59:03 UTC (rev 9001)
+++ trunk/qgis/src/plugins/north_arrow/plugin.cpp 2008-08-06 12:42:23 UTC (rev 9002)
@@ -297,7 +297,7 @@
if (mapCanvas.layerCount() > 0)
{
- QgsSpatialRefSys outputSRS = mapCanvas.mapRender()->destinationSrs();
+ QgsSpatialRefSys outputSRS = mapCanvas.mapRenderer()->destinationSrs();
if (outputSRS.isValid() && !outputSRS.geographicFlag())
{
More information about the QGIS-commit
mailing list