[QGIS Commit] r8673 - in trunk/qgis/src: core gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-06-23 07:50:12 -0400 (Mon, 23 Jun 2008)
New Revision: 8673

Modified:
   trunk/qgis/src/core/qgsdistancearea.cpp
   trunk/qgis/src/core/qgsdistancearea.h
   trunk/qgis/src/core/qgsmaprender.cpp
   trunk/qgis/src/core/qgsspatialrefsys.cpp
   trunk/qgis/src/gui/qgsprojectionselector.h
Log:
Replaced some occurences of default srs id with epgs id

Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp	2008-06-23 09:15:03 UTC (rev 8672)
+++ trunk/qgis/src/core/qgsdistancearea.cpp	2008-06-23 11:50:12 UTC (rev 8673)
@@ -43,7 +43,7 @@
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceSRS(GEOSRS_ID); // WGS 84
+  setSourceSRS(EPSGID); // WGS 84
   setEllipsoid("WGS84");
 }
 
@@ -60,10 +60,10 @@
 }
 
 
-void QgsDistanceArea::setSourceSRS(long srsid)
+void QgsDistanceArea::setSourceSRS(long epsgId)
 {
   QgsSpatialRefSys srcSRS;
-  srcSRS.createFromSrsId(srsid);
+  srcSRS.createFromEpsg(epsgId);
   mCoordTransform->setSourceSRS(srcSRS);
 }
 

Modified: trunk/qgis/src/core/qgsdistancearea.h
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.h	2008-06-23 09:15:03 UTC (rev 8672)
+++ trunk/qgis/src/core/qgsdistancearea.h	2008-06-23 11:50:12 UTC (rev 8673)
@@ -50,7 +50,7 @@
     bool projectionsEnabled() { return mProjectionsEnabled; }
     
     //! sets source spatial reference system (by QGIS SRS)
-    void setSourceSRS(long srsid);
+    void setSourceSRS(long epsgId);
     
     //! returns source spatial reference system
     long sourceSRS() { return mSourceRefSys; }

Modified: trunk/qgis/src/core/qgsmaprender.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprender.cpp	2008-06-23 09:15:03 UTC (rev 8672)
+++ trunk/qgis/src/core/qgsmaprender.cpp	2008-06-23 11:50:12 UTC (rev 8673)
@@ -48,8 +48,7 @@
   mSize = QSize(0,0);
   
   mProjectionsEnabled = FALSE;
-  mDestSRS = new QgsSpatialRefSys(GEOSRS_ID, QgsSpatialRefSys::QGIS_SRSID); // WGS 84
-
+  mDestSRS = new QgsSpatialRefSys(EPSGID, QgsSpatialRefSys::EPSG); //WGS 84
 }
 
 QgsMapRender::~QgsMapRender()

Modified: trunk/qgis/src/core/qgsspatialrefsys.cpp
===================================================================
--- trunk/qgis/src/core/qgsspatialrefsys.cpp	2008-06-23 09:15:03 UTC (rev 8672)
+++ trunk/qgis/src/core/qgsspatialrefsys.cpp	2008-06-23 11:50:12 UTC (rev 8673)
@@ -954,7 +954,7 @@
   else
   {
     // Return default SRS if none was found in the XML.
-    createFromSrsId(GEOSRS_ID);
+    createFromEpsg(EPSGID);
   }
   return true;
 }

Modified: trunk/qgis/src/gui/qgsprojectionselector.h
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.h	2008-06-23 09:15:03 UTC (rev 8672)
+++ trunk/qgis/src/gui/qgsprojectionselector.h	2008-06-23 11:50:12 UTC (rev 8673)
@@ -75,6 +75,8 @@
 
       void setSelectedSRSID(long theSRSID);
 
+      //void setSelectedEPSG(long epsg);
+
       QString getCurrentProj4String();
 
       //! Gets the current PostGIS-style projection identifier