[QGIS Commit] r8709 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-07-04 03:13:08 -0400 (Fri, 04 Jul 2008)
New Revision: 8709

Modified:
   trunk/qgis/src/core/qgsdistancearea.cpp
   trunk/qgis/src/core/qgsdistancearea.h
Log:
Fix for bug #1136 measure tools show wrong values

Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp	2008-07-03 21:04:39 UTC (rev 8708)
+++ trunk/qgis/src/core/qgsdistancearea.cpp	2008-07-04 07:13:08 UTC (rev 8709)
@@ -43,7 +43,7 @@
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceSRS(EPSGID); // WGS 84
+  setSourceEPSG(EPSGID); // WGS 84
   setEllipsoid("WGS84");
 }
 
@@ -59,8 +59,14 @@
   mProjectionsEnabled = flag;
 }
 
+void QgsDistanceArea::setSourceSRS(long srsid)
+{
+  QgsSpatialRefSys srcSRS;
+  srcSRS.createFromSrsId(srsid);
+  mCoordTransform->setSourceSRS(srcSRS);
+}
 
-void QgsDistanceArea::setSourceSRS(long epsgId)
+void QgsDistanceArea::setSourceEPSG(long epsgId)
 {
   QgsSpatialRefSys srcSRS;
   srcSRS.createFromEpsg(epsgId);

Modified: trunk/qgis/src/core/qgsdistancearea.h
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.h	2008-07-03 21:04:39 UTC (rev 8708)
+++ trunk/qgis/src/core/qgsdistancearea.h	2008-07-04 07:13:08 UTC (rev 8709)
@@ -50,7 +50,10 @@
     bool projectionsEnabled() { return mProjectionsEnabled; }
     
     //! sets source spatial reference system (by QGIS SRS)
-    void setSourceSRS(long epsgId);
+    void setSourceSRS(long srsid);
+
+    //! sets source spatial reference system (by EPSG)
+    void setSourceEPSG(long epsgId);
     
     //! returns source spatial reference system
     long sourceSRS() { return mSourceRefSys; }