Fixed default projection (WGS 84) so it is now selected when the project

gsherman · gsherman · commit 8b612893cace · 2005-04-11T17:09:00.000Z
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
diff --git 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
@@ -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
@@ -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
       {

Original file line number	Diff line number	Diff line change
`@@ -2549,7 +2549,7 @@ void QgsVectorLayer::setCoordinateSystem()`
`2549`	`2549`	`#endif`
`2550`	`2550`	`QApplication::restoreOverrideCursor();`
`2551`	`2551`	`mCoordinateTransform = new QgsCoordinateTransform("", "");`
`2552`		`- dataProvider->setWKT(QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84"));`
	`2552`	`+ dataProvider->setWKT(QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84"));`
`2553`	`2553`	`return;`
`2554`	`2554`	`}`
`2555`	`2555`	`else`
`@@ -2569,7 +2569,7 @@ void QgsVectorLayer::setCoordinateSystem()`
`2569`	`2569`	`//it in the ctor of the layer projection selector`
`2570`	`2570`	`QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector();`
`2571`	`2571`	`QString srsWkt =`
`2572`		`- QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84");`
	`2572`	`+ QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84");`
`2573`	`2573`	`mySelector->setSelectedWKT(srsWkt);`
`2574`	`2574`	`if(mySelector->exec())`
`2575`	`2575`	`{`
`@@ -2593,7 +2593,7 @@ void QgsVectorLayer::setCoordinateSystem()`
`2593`	`2593`	`}`
`2594`	`2594`	`else if (myDefaultProjectionOption=="useProject")`
`2595`	`2595`	`{`
`2596`		`- mySourceWKT = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS84");`
	`2596`	`+ mySourceWKT = QgsProject::instance()->readEntry("SpatialRefSys","/selectedWKT","WGS 84");`
`2597`	`2597`	`}`
`2598`	`2598`	`else ///qgis/projections/defaultBehaviour==useDefault`
`2599`	`2599`	`{`