Merge pull request #736 from Oslandia/issue7441

fix issue7441
qgis · Jul 16, 2013 · 13c71d4 · 13c71d4
2 parents 29a4bc0 + be7a026
commit 13c71d4
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -834,8 +834,11 @@ void QgsProjectProperties::on_cbxProjectionEnabled_toggled( bool onFlyEnabled )
     btnGrpMapUnits->setTitle( unitsOnFlyState.arg( tr( "ON" ) ) );
   }
 
+  setMapUnitsToCurrentProjection();
+
   // Enable/Disable selector and update tool-tip
-  updateEllipsoidUI( mEllipsoidIndex );
+  updateEllipsoidUI( mEllipsoidIndex ); // maybe already done by setMapUnitsToCurrentProjection
+
 }
 
 void QgsProjectProperties::cbxWFSPubliedStateChanged( int aIdx )
@@ -906,6 +909,20 @@ void QgsProjectProperties::setMapUnitsToCurrentProjection()
     radMeters->setChecked( units == QGis::Meters );
     radFeet->setChecked( units == QGis::Feet );
     radDegrees->setChecked( units == QGis::Degrees );
+
+    // attempt to reset the projection ellipsoid according to the srs
+    {
+      int myIndex = 0;
+      for ( int i = 0; i < mEllipsoidList.length(); i++ )
+      {
+        if ( mEllipsoidList[ i ].description  == srs.description() )
+        {
+          myIndex = i;
+          break;
+        }
+      }
+      if ( myIndex ) updateEllipsoidUI( myIndex );
+    }
   }
 }