Fix for ticket #296 - the layer's coordinates have been projected also with projections disabled.

wonder · wonder · commit e1718bbc29e6 · 2006-10-14T13:23:51.000Z
Grrr... why there are 2 different implementations for zoom to layer extent?! 1. QgisApp 2. QgsLegend git-svn-id: http://svn.osgeo.org/qgis/trunk@5960 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -1702,14 +1702,16 @@ void QgsLegend::zoomToLayerExtent()
       if(theLayer)
 	{
 	  layerExtent = theLayer->extent();
-	  ct = theLayer->coordinateTransform();
-	  if(ct)
-	    {
+	  
+      if (QgsProject::instance()->readNumEntry("SpatialRefSys", "/ProjectionsEnabled",0) != 0
+          && (ct = theLayer->coordinateTransform()))
+      {
 	      //transform layer extent to canvas coordinate system
 	      transformedExtent = ct->transform(layerExtent);
 	    }
 	  else
 	    {
+        // do not transform when projections are not enabled
 	      transformedExtent = layerExtent;
 	    }
 

Original file line number	Diff line number	Diff line change
`@@ -1702,14 +1702,16 @@ void QgsLegend::zoomToLayerExtent()`
`1702`	`1702`	`if(theLayer)`
`1703`	`1703`	`{`
`1704`	`1704`	`layerExtent = theLayer->extent();`
`1705`		`- ct = theLayer->coordinateTransform();`
`1706`		`- if(ct)`
`1707`		`- {`
	`1705`	`+`
	`1706`	`+ if (QgsProject::instance()->readNumEntry("SpatialRefSys", "/ProjectionsEnabled",0) != 0`
	`1707`	`+ && (ct = theLayer->coordinateTransform()))`
	`1708`	`+ {`
`1708`	`1709`	`//transform layer extent to canvas coordinate system`
`1709`	`1710`	`transformedExtent = ct->transform(layerExtent);`
`1710`	`1711`	`}`
`1711`	`1712`	`else`
`1712`	`1713`	`{`
	`1714`	`+ // do not transform when projections are not enabled`
`1713`	`1715`	`transformedExtent = layerExtent;`
`1714`	`1716`	`}`
`1715`	`1717`