Merge pull request #1104 from leyan/projectCRS

mhugent · mhugent · commit 00680cd78b45 · 2014-01-28T11:33:18.000-08:00
Consistent management of project CRS properties in project file
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3299,7 +3299,9 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
   srs.createFromOgcWmsCrs( defCrs );
   myRenderer->setDestinationCrs( srs );
   // write the projections _proj string_ to project settings
-  prj->writeEntry( "SpatialRefSys", "/ProjectCrs", defCrs );
+  prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", srs.toProj4() );
+  prj->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
+  prj->writeEntry( "SpatialRefSys", "/ProjectCRSID", (int) srs.srsid() );
   prj->dirty( false );
   if ( srs.mapUnits() != QGis::UnknownUnit )
   {
@@ -8086,9 +8088,6 @@ void QgisApp::updateCRSStatusBar()
 
 void QgisApp::destinationSrsChanged()
 {
-  // save this information to project
-  long srsid = mMapCanvas->mapRenderer()->destinationCrs().srsid();
-  QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int )srsid );
   updateCRSStatusBar();
 }
 
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -589,6 +589,8 @@ void QgsProjectProperties::apply()
     // write the currently selected projections _proj string_ to project settings
     QgsDebugMsg( QString( "SpatialRefSys/ProjectCRSProj4String: %1" ).arg( projectionSelector->selectedProj4String() ) );
     QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projectionSelector->selectedProj4String() );
+    QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", (int) projectionSelector->selectedCrsId() );
+    QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", projectionSelector->selectedAuthId() );
 
     // Set the map units to the projected coordinates if we are projecting
     if ( isProjected() )

Original file line number	Diff line number	Diff line change
`@@ -3299,7 +3299,9 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )`
`3299`	`3299`	`srs.createFromOgcWmsCrs( defCrs );`
`3300`	`3300`	`myRenderer->setDestinationCrs( srs );`
`3301`	`3301`	`// write the projections _proj string_ to project settings`
`3302`		`- prj->writeEntry( "SpatialRefSys", "/ProjectCrs", defCrs );`
	`3302`	`+ prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", srs.toProj4() );`
	`3303`	`+ prj->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );`
	`3304`	`+ prj->writeEntry( "SpatialRefSys", "/ProjectCRSID", (int) srs.srsid() );`
`3303`	`3305`	`prj->dirty( false );`
`3304`	`3306`	`if ( srs.mapUnits() != QGis::UnknownUnit )`
`3305`	`3307`	`{`
`@@ -8086,9 +8088,6 @@ void QgisApp::updateCRSStatusBar()`
`8086`	`8088`
`8087`	`8089`	`void QgisApp::destinationSrsChanged()`
`8088`	`8090`	`{`
`8089`		`- // save this information to project`
`8090`		`- long srsid = mMapCanvas->mapRenderer()->destinationCrs().srsid();`
`8091`		`- QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int )srsid );`
`8092`	`8091`	`updateCRSStatusBar();`
`8093`	`8092`	`}`
`8094`	`8093`