More changes to use QgsMapSettings instead of QgsMapRenderer

wonder-sk · wonder-sk · commit 2d12aca3570e · 2013-11-11T18:03:35.000+07:00
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -891,11 +891,7 @@ void QgsComposerLegendWidget::updateLegend()
     QgsMapCanvas* canvas = app->mapCanvas();
     if ( canvas )
     {
-      QgsMapRenderer* renderer = canvas->mapRenderer();
-      if ( renderer )
-      {
-        layerIdList = renderer->layerSet();
-      }
+      layerIdList = canvas->mapSettings().layers();
     }
 
     //and also group info
diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -116,7 +116,7 @@ void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLa
   connect( mVlayer, SIGNAL( beforeRollBack() ), this, SLOT( beforeRollBack() ) );
 
   // projection or extents changed
-  connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( updateVertexMarkersPosition() ) );
+  connect( canvas, SIGNAL( destinationSrsChanged() ), this, SLOT( updateVertexMarkersPosition() ) );
   connect( canvas, SIGNAL( extentsChanged() ), this, SLOT( updateVertexMarkersPosition() ) );
 
   // geometry was changed
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -29,7 +29,7 @@ QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas* canvas ): QgsMapTo
 {
   mSnapper.setMapCanvas( canvas );
 
-  connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),
+  connect( canvas, SIGNAL( destinationSrsChanged() ),
            this, SLOT( updateSettings() ) );
 }
 
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -57,8 +57,7 @@ void QgsMapToolOffsetCurve::canvasPressEvent( QMouseEvent* e )
   }
 
 
-  QgsMapRenderer* renderer = mCanvas->mapRenderer();
-  QgsSnapper snapper( renderer );
+  QgsSnapper snapper( mCanvas->mapSettings() );
   configureSnapper( snapper );
   QList<QgsSnappingResult> snapResults;
   snapper.snapPoint( e->pos(), snapResults );
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -47,7 +47,7 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )
   mDialog = new QgsMeasureDialog( this, Qt::WindowStaysOnTopHint );
   mSnapper.setMapCanvas( canvas );
 
-  connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),
+  connect( canvas, SIGNAL( destinationSrsChanged() ),
            this, SLOT( updateSettings() ) );
 }
 
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1718,12 +1718,12 @@ void QgsRasterLayerProperties::toggleBuildPyramidsButton()
 
 void QgsRasterLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()
 {
-  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );
 }
 
 void QgsRasterLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()
 {
-  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );
 }
 
 void QgsRasterLayerProperties::on_mResetColorRenderingBtn_clicked()
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1060,10 +1060,10 @@ void QgsVectorLayerProperties::enableLabelOptions( bool theFlag )
 
 void QgsVectorLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()
 {
-  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );
 }
 
 void QgsVectorLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()
 {
-  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );
 }
diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -85,7 +85,7 @@ void CoordinateCapture::initGui()
 {
   mCrs.createFromSrsId( GEOCRS_ID ); // initialize the CRS object
 
-  connect( mQGisIface->mapCanvas()->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setSourceCrs() ) );
+  connect( mQGisIface->mapCanvas(), SIGNAL( destinationSrsChanged() ), this, SLOT( setSourceCrs() ) );
   connect( mQGisIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );
 
   setSourceCrs(); //set up the source CRS
@@ -188,8 +188,8 @@ void CoordinateCapture::setCRS()
 
 void CoordinateCapture::setSourceCrs()
 {
-  mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs() );
-  mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs().mapUnits() == QGis::Degrees ) ? 5 : 3; // for the map canvas coordinate display
+  mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapSettings().destinationCrs() );
+  mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == QGis::Degrees ) ? 5 : 3; // for the map canvas coordinate display
 }
 
 void CoordinateCapture::mouseClicked( QgsPoint thePoint )
diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
@@ -186,9 +186,7 @@ double QgsGCPCanvasItem::residualToScreenFactor() const
   double mapUnitsPerScreenPixel = mMapCanvas->mapUnitsPerPixel();
   double mapUnitsPerRasterPixel = 1.0;
 
-  if ( mMapCanvas->mapRenderer() )
-  {
-    QStringList canvasLayers = mMapCanvas->mapRenderer()->layerSet();
+    QStringList canvasLayers = mMapCanvas->mapSettings().layers();
     if ( canvasLayers.size() > 0 )
     {
       QString layerId = canvasLayers.at( 0 );
@@ -202,7 +200,6 @@ double QgsGCPCanvasItem::residualToScreenFactor() const
         }
       }
     }
-  }
 
   return 1.0 / ( mapUnitsPerScreenPixel * mapUnitsPerRasterPixel );
 }
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1443,12 +1443,6 @@ bool QgsGeorefPluginGui::writePDFMapFile( const QString& fileName, const QgsGeor
     return false;
   }
 
-  QgsMapRenderer* canvasRenderer = mCanvas->mapRenderer();
-  if ( !canvasRenderer )
-  {
-    return false;
-  }
-
   QgsRasterLayer *rlayer = ( QgsRasterLayer* ) mCanvas->layer( 0 );
   if ( !rlayer )
   {
@@ -1487,7 +1481,7 @@ bool QgsGeorefPluginGui::writePDFMapFile( const QString& fileName, const QgsGeor
   QgsComposerMap* composerMap = new QgsComposerMap( composition, leftMargin, topMargin, contentWidth, contentHeight );
   composerMap->setKeepLayerSet( true );
   QStringList list;
-  list.append( canvasRenderer->layerSet()[0] );
+  list.append( mCanvas->mapSettings().layers()[0] );
   composerMap->setLayerSet( list );
 
   double xcenter = rlayer->extent().center().x();
@@ -1547,12 +1541,6 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
     return false;
   }
 
-  QgsMapRenderer* canvasRenderer = mCanvas->mapRenderer();
-  if ( !canvasRenderer )
-  {
-    return false;
-  }
-
   QPrinter printer;
   printer.setOutputFormat( QPrinter::PdfFormat );
   printer.setOutputFileName( fileName );
@@ -1605,7 +1593,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
   }
 
   QgsComposerMap* composerMap = new QgsComposerMap( composition, leftMargin, titleLabel->rect().bottom() + titleLabel->transform().dy(), mapWidthMM, mapHeightMM );
-  composerMap->setLayerSet( canvasRenderer->layerSet() );
+  composerMap->setLayerSet( mCanvas->mapSettings().layers() );
   composerMap->setNewExtent( mCanvas->extent() );
   composerMap->setMapCanvas( mCanvas );
   composition->addItem( composerMap );
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -1022,7 +1022,7 @@ bool QgsGrassModuleStandardOptions::inputRegion( struct Cell_head *window, QgsCo
     // TODO: warn if outside region
     if ( mCanvas->hasCrsTransformEnabled() )
     {
-      crs = mCanvas->mapRenderer()->destinationCrs();
+      crs = mCanvas->mapSettings().destinationCrs();
     }
     else
     {
@@ -1035,8 +1035,8 @@ bool QgsGrassModuleStandardOptions::inputRegion( struct Cell_head *window, QgsCo
     window->south = rect.yMinimum();
     window->east = rect.xMaximum();
     window->north = rect.yMaximum();
-    window->rows = ( int ) mCanvas->mapRenderer()->outputSize().height();
-    window->cols = ( int ) mCanvas->mapRenderer()->outputSize().width();
+    window->rows = ( int ) mCanvas->mapSettings().outputSize().height();
+    window->cols = ( int ) mCanvas->mapSettings().outputSize().width();
 
     char* err = G_adjust_Cell_head( window, 1, 1 );
     if ( err )
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -122,7 +122,7 @@ void QgsGrassPlugin::initGui()
   mCanvas = qGisInterface->mapCanvas();
   QWidget* qgis = qGisInterface->mainWindow();
 
-  connect( mCanvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
+  connect( mCanvas, SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
 
   // Connect project
   connect( qgis, SIGNAL( projectRead() ), this, SLOT( projectRead() ) );
@@ -924,12 +924,12 @@ QIcon QgsGrassPlugin::getThemeIcon( const QString theName )
 
 void QgsGrassPlugin::setTransform()
 {
-  if ( mCrs.isValid() && mCanvas->mapRenderer()->destinationCrs().isValid() )
+  if ( mCrs.isValid() && mCanvas->mapSettings().destinationCrs().isValid() )
   {
     QgsDebugMsg( "srcCrs: " + mCrs.toWkt() );
-    QgsDebugMsg( "destCrs " + mCanvas->mapRenderer()->destinationCrs().toWkt() );
+    QgsDebugMsg( "destCrs " + mCanvas->mapSettings().destinationCrs().toWkt() );
     mCoordinateTransform.setSourceCrs( mCrs );
-    mCoordinateTransform.setDestCRS( mCanvas->mapRenderer()->destinationCrs() );
+    mCoordinateTransform.setDestCRS( mCanvas->mapSettings().destinationCrs() );
   }
 }
 
diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
@@ -45,7 +45,7 @@ QgsGrassRegionEdit::QgsGrassRegionEdit( QgsMapCanvas* canvas )
   mCrs = QgsGrass::crs( gisdbase, location );
   QgsDebugMsg( "mCrs: " + mCrs.toWkt() );
   setTransform();
-  connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
+  connect( canvas, SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
 }
 
 QgsGrassRegionEdit::~QgsGrassRegionEdit()
@@ -111,21 +111,21 @@ void QgsGrassRegionEdit::calcSrcRegion()
 {
   mSrcRectangle.set( mStartPoint, mEndPoint );
 
-  if ( mCanvas->mapRenderer()->hasCrsTransformEnabled() && mCrs.isValid() && mCanvas->mapRenderer()->destinationCrs().isValid() )
+  if ( mCanvas->hasCrsTransformEnabled() && mCrs.isValid() && mCanvas->mapSettings().destinationCrs().isValid() )
   {
     QgsCoordinateTransform coordinateTransform;
-    coordinateTransform.setSourceCrs( mCanvas->mapRenderer()->destinationCrs() );
+    coordinateTransform.setSourceCrs( mCanvas->mapSettings().destinationCrs() );
     coordinateTransform.setDestCRS( mCrs );
     mSrcRectangle = coordinateTransform.transformBoundingBox( mSrcRectangle );
   }
 }
 
 void QgsGrassRegionEdit::setTransform()
 {
-  if ( mCrs.isValid() && canvas()->mapRenderer()->destinationCrs().isValid() )
+  if ( mCrs.isValid() && canvas()->mapSettings().destinationCrs().isValid() )
   {
     mCoordinateTransform.setSourceCrs( mCrs );
-    mCoordinateTransform.setDestCRS( canvas()->mapRenderer()->destinationCrs() );
+    mCoordinateTransform.setDestCRS( canvas()->mapSettings().destinationCrs() );
   }
 }
 
@@ -134,7 +134,7 @@ void QgsGrassRegionEdit::transform( QgsMapCanvas *canvas, QVector<QgsPoint> &poi
   QgsDebugMsg( "Entered" );
 
   /** Coordinate transform */
-  if ( canvas->mapRenderer()->hasCrsTransformEnabled() )
+  if ( canvas->hasCrsTransformEnabled() )
   {
     //QgsDebugMsg ( "srcCrs = " +  coordinateTransform->sourceCrs().toWkt() );
     //QgsDebugMsg ( "destCrs = " +  coordinateTransform->destCRS().toWkt() );
diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp
@@ -239,8 +239,8 @@ QgsGraph* RgShortestPathWidget::getPath( QgsPoint& p1, QgsPoint& p2 )
   }
 
   QgsGraphBuilder builder(
-    mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),
-    mPlugin->iface()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled(),
+    mPlugin->iface()->mapCanvas()->mapSettings().destinationCrs(),
+    mPlugin->iface()->mapCanvas()->mapSettings().hasCrsTransformEnabled(),
     mPlugin->topologyToleranceFactor() );
   {
     const QgsGraphDirector *director = mPlugin->director();
@@ -371,7 +371,7 @@ void RgShortestPathWidget::exportPath()
   if ( path == NULL )
     return;
 
-  QgsCoordinateTransform ct( mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),
+  QgsCoordinateTransform ct( mPlugin->iface()->mapCanvas()->mapSettings().destinationCrs(),
                              vl->crs() );
 
   int startVertexIdx = path->findVertex( p1 );
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -683,13 +683,13 @@ void QgsSpatialQueryDialog::zoomFeature( QgsVectorLayer* lyr, QgsFeatureId fid )
   }
   // Set system reference
   QgsCoordinateReferenceSystem srsSource = lyr->dataProvider()->crs();
-  QgsCoordinateReferenceSystem srcMapcanvas = mIface->mapCanvas()->mapRenderer()->destinationCrs();
+  QgsCoordinateReferenceSystem srcMapcanvas = mIface->mapCanvas()->mapSettings().destinationCrs();
   if ( ! srsSource.isValid() )
   {
     if ( hasMsg )
     {
       QString crsMapcanvas = srcMapcanvas.authid();
-      bool isFly = mIface->mapCanvas()->mapRenderer()->hasCrsTransformEnabled();
+      bool isFly = mIface->mapCanvas()->mapSettings().hasCrsTransformEnabled();
       QString msgFly = tr( "Map \"%1\" \"on the fly\" transformation." ).arg( isFly ? tr( "enable" ) : tr( "disable" ) );
       QString msg = tr( "Coordinate reference system(CRS) of\n\"%1\" is invalid(see CRS of provider)." ).arg( lyr->name() );
       msg.append( tr( "\n\nCRS of map is %1.\n%2." ).arg( crsMapcanvas ).arg( msgFly ) );
diff --git a/tests/src/gui/testprojectionissues.cpp b/tests/src/gui/testprojectionissues.cpp
@@ -73,8 +73,8 @@ void TestProjectionIssues::initTestCase()
   //reproject to SWEDREF 99 TM
   QgsCoordinateReferenceSystem destCRS;
   destCRS.createFromId( 3006, QgsCoordinateReferenceSystem::EpsgCrsId );
-  mMapCanvas->mapRenderer()->setDestinationCrs( destCRS );
-  mMapCanvas->mapRenderer()->setProjectionsEnabled( true );
+  mMapCanvas->setDestinationCrs( destCRS );
+  mMapCanvas->setCrsTransformEnabled( true );
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -891,11 +891,7 @@ void QgsComposerLegendWidget::updateLegend()`
`891`	`891`	`QgsMapCanvas* canvas = app->mapCanvas();`
`892`	`892`	`if ( canvas )`
`893`	`893`	`{`
`894`		`- QgsMapRenderer* renderer = canvas->mapRenderer();`
`895`		`- if ( renderer )`
`896`		`- {`
`897`		`- layerIdList = renderer->layerSet();`
`898`		`- }`
	`894`	`+ layerIdList = canvas->mapSettings().layers();`
`899`	`895`	`}`
`900`	`896`
`901`	`897`	`//and also group info`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas* canvas ): QgsMapTo`
`29`	`29`	`{`
`30`	`30`	`mSnapper.setMapCanvas( canvas );`
`31`	`31`
`32`		`- connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),`
	`32`	`+ connect( canvas, SIGNAL( destinationSrsChanged() ),`
`33`	`33`	`this, SLOT( updateSettings() ) );`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ void QgsMapToolOffsetCurve::canvasPressEvent( QMouseEvent* e )`
`57`	`57`	`}`
`58`	`58`
`59`	`59`
`60`		`- QgsMapRenderer* renderer = mCanvas->mapRenderer();`
`61`		`- QgsSnapper snapper( renderer );`
	`60`	`+ QgsSnapper snapper( mCanvas->mapSettings() );`
`62`	`61`	`configureSnapper( snapper );`
`63`	`62`	`QList<QgsSnappingResult> snapResults;`
`64`	`63`	`snapper.snapPoint( e->pos(), snapResults );`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )`
`47`	`47`	`mDialog = new QgsMeasureDialog( this, Qt::WindowStaysOnTopHint );`
`48`	`48`	`mSnapper.setMapCanvas( canvas );`
`49`	`49`
`50`		`- connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),`
	`50`	`+ connect( canvas, SIGNAL( destinationSrsChanged() ),`
`51`	`51`	`this, SLOT( updateSettings() ) );`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -1718,12 +1718,12 @@ void QgsRasterLayerProperties::toggleBuildPyramidsButton()`
`1718`	`1718`
`1719`	`1719`	`void QgsRasterLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()`
`1720`	`1720`	`{`
`1721`		`- cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );`
	`1721`	`+ cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );`
`1722`	`1722`	`}`
`1723`	`1723`
`1724`	`1724`	`void QgsRasterLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()`
`1725`	`1725`	`{`
`1726`		`- cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );`
	`1726`	`+ cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );`
`1727`	`1727`	`}`
`1728`	`1728`
`1729`	`1729`	`void QgsRasterLayerProperties::on_mResetColorRenderingBtn_clicked()`
Original file line number	Diff line number	Diff line change
`@@ -1060,10 +1060,10 @@ void QgsVectorLayerProperties::enableLabelOptions( bool theFlag )`
`1060`	`1060`
`1061`	`1061`	`void QgsVectorLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()`
`1062`	`1062`	`{`
`1063`		`- cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );`
	`1063`	`+ cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );`
`1064`	`1064`	`}`
`1065`	`1065`
`1066`	`1066`	`void QgsVectorLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()`
`1067`	`1067`	`{`
`1068`		`- cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );`
	`1068`	`+ cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapSettings().scale() );`
`1069`	`1069`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void CoordinateCapture::initGui()`
`85`	`85`	`{`
`86`	`86`	`mCrs.createFromSrsId( GEOCRS_ID ); // initialize the CRS object`
`87`	`87`
`88`		`- connect( mQGisIface->mapCanvas()->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setSourceCrs() ) );`
	`88`	`+ connect( mQGisIface->mapCanvas(), SIGNAL( destinationSrsChanged() ), this, SLOT( setSourceCrs() ) );`
`89`	`89`	`connect( mQGisIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );`
`90`	`90`
`91`	`91`	`setSourceCrs(); //set up the source CRS`
`@@ -188,8 +188,8 @@ void CoordinateCapture::setCRS()`
`188`	`188`
`189`	`189`	`void CoordinateCapture::setSourceCrs()`
`190`	`190`	`{`
`191`		`- mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs() );`
`192`		`- mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs().mapUnits() == QGis::Degrees ) ? 5 : 3; // for the map canvas coordinate display`
	`191`	`+ mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapSettings().destinationCrs() );`
	`192`	`+ mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == QGis::Degrees ) ? 5 : 3; // for the map canvas coordinate display`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`void CoordinateCapture::mouseClicked( QgsPoint thePoint )`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,7 @@ double QgsGCPCanvasItem::residualToScreenFactor() const`
`186`	`186`	`double mapUnitsPerScreenPixel = mMapCanvas->mapUnitsPerPixel();`
`187`	`187`	`double mapUnitsPerRasterPixel = 1.0;`
`188`	`188`
`189`		`- if ( mMapCanvas->mapRenderer() )`
`190`		`- {`
`191`		`- QStringList canvasLayers = mMapCanvas->mapRenderer()->layerSet();`
	`189`	`+ QStringList canvasLayers = mMapCanvas->mapSettings().layers();`
`192`	`190`	`if ( canvasLayers.size() > 0 )`
`193`	`191`	`{`
`194`	`192`	`QString layerId = canvasLayers.at( 0 );`
`@@ -202,7 +200,6 @@ double QgsGCPCanvasItem::residualToScreenFactor() const`
`202`	`200`	`}`
`203`	`201`	`}`
`204`	`202`	`}`
`205`		`- }`
`206`	`203`
`207`	`204`	`return 1.0 / ( mapUnitsPerScreenPixel * mapUnitsPerRasterPixel );`
`208`	`205`	`}`