Skip to content
Permalink
Browse files
Replaced some occurences of default srs id with epgs id
git-svn-id: http://svn.osgeo.org/qgis/trunk@8673 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Jun 23, 2008
1 parent 24e80f1 commit d6ec8ce61207c46317a66a64f0e30bca1ce10c0b
Showing with 8 additions and 7 deletions.
  1. +3 −3 src/core/qgsdistancearea.cpp
  2. +1 −1 src/core/qgsdistancearea.h
  3. +1 −2 src/core/qgsmaprender.cpp
  4. +1 −1 src/core/qgsspatialrefsys.cpp
  5. +2 −0 src/gui/qgsprojectionselector.h
@@ -43,7 +43,7 @@ QgsDistanceArea::QgsDistanceArea()
// 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::setProjectionsEnabled(bool flag)
}


void QgsDistanceArea::setSourceSRS(long srsid)
void QgsDistanceArea::setSourceSRS(long epsgId)
{
QgsSpatialRefSys srcSRS;
srcSRS.createFromSrsId(srsid);
srcSRS.createFromEpsg(epsgId);
mCoordTransform->setSourceSRS(srcSRS);
}

@@ -50,7 +50,7 @@ class CORE_EXPORT QgsDistanceArea
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; }
@@ -48,8 +48,7 @@ QgsMapRender::QgsMapRender()
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()
@@ -954,7 +954,7 @@ bool QgsSpatialRefSys::readXML( QDomNode & theNode )
else
{
// Return default SRS if none was found in the XML.
createFromSrsId(GEOSRS_ID);
createFromEpsg(EPSGID);
}
return true;
}
@@ -75,6 +75,8 @@ class GUI_EXPORT QgsProjectionSelector: public QWidget, private Ui::QgsProjectio

void setSelectedSRSID(long theSRSID);

//void setSelectedEPSG(long epsg);

QString getCurrentProj4String();

//! Gets the current PostGIS-style projection identifier

0 comments on commit d6ec8ce

Please sign in to comment.