From 8b612893cace3e4502493dfebbcc65eee66fb21c Mon Sep 17 00:00:00 2001 From: gsherman Date: Mon, 11 Apr 2005 17:09:00 +0000 Subject: [PATCH] Fixed default projection (WGS 84) so it is now selected when the project properties dialog is opened and no projection has been set. git-svn-id: http://svn.osgeo.org/qgis/trunk@3126 c8812cc2-4d05-0410-92ff-de0c093fc19c --- ChangeLog | 3 +++ src/qgsprojectproperties.cpp | 2 +- src/qgsvectorlayer.cpp | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aae3477b562..62c88456b07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ ------------------------------------------------------------------------------ Version 0.6 'Simon' .... development version QGIS Change Log +2005-04-11 [ges] +** Fixed default projection (WGS 84) so it is now selected when the + project properties dialog is opened and no projection has been set. 2005-04-10 [timlinux] ** Added custom projection maker dialog to main app menu. Dialog is still under construction. diff --git a/src/qgsprojectproperties.cpp b/src/qgsprojectproperties.cpp index 579aa60e101..c60fcb57b5c 100644 --- a/src/qgsprojectproperties.cpp +++ b/src/qgsprojectproperties.cpp @@ -78,7 +78,7 @@ // set the default wkt to WGS 84 // QString defaultWkt = QgsSpatialReferences::instance()->getSrsBySrid(defaultWktKey)->srText(); // the /selectedWKT entry stores the wkt entry selected in the list of projections - QString srsWkt = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84"); + QString srsWkt = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84"); projectionSelector->setSelectedWKT(srsWkt); diff --git a/src/qgsvectorlayer.cpp b/src/qgsvectorlayer.cpp index cf50b7a05c4..c6a01e35fcf 100644 --- a/src/qgsvectorlayer.cpp +++ b/src/qgsvectorlayer.cpp @@ -2549,7 +2549,7 @@ void QgsVectorLayer::setCoordinateSystem() #endif QApplication::restoreOverrideCursor(); mCoordinateTransform = new QgsCoordinateTransform("", ""); - dataProvider->setWKT(QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84")); + dataProvider->setWKT(QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84")); return; } else @@ -2569,7 +2569,7 @@ void QgsVectorLayer::setCoordinateSystem() //it in the ctor of the layer projection selector QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(); QString srsWkt = - QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84"); + QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84"); mySelector->setSelectedWKT(srsWkt); if(mySelector->exec()) { @@ -2593,7 +2593,7 @@ void QgsVectorLayer::setCoordinateSystem() } else if (myDefaultProjectionOption=="useProject") { - mySourceWKT = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84"); + mySourceWKT = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84"); } else ///qgis/projections/defaultBehaviour==useDefault {