also accept first ellipsoid (followup be7a026)

qgis · Jul 16, 2013 · bbd257f · bbd257f
1 parent f86b7af
commit bbd257f
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -137,6 +137,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
       break;
     }
   }
+
   // Update paramaters if present.
   if ( mySplitEllipsoid.length() >= 3 )
   {
@@ -900,30 +901,23 @@ void QgsProjectProperties::cbxWFSDeleteStateChanged( int aIdx )
 void QgsProjectProperties::setMapUnitsToCurrentProjection()
 {
   long myCRSID = projectionSelector->selectedCrsId();
-  if ( isProjected() && myCRSID )
-  {
-    QgsCoordinateReferenceSystem srs( myCRSID, QgsCoordinateReferenceSystem::InternalCrsId );
-    //set radio button to crs map unit type
-    QGis::UnitType units = srs.mapUnits();
+  if ( !isProjected() || !myCRSID )
+    return;
 
-    radMeters->setChecked( units == QGis::Meters );
-    radFeet->setChecked( units == QGis::Feet );
-    radDegrees->setChecked( units == QGis::Degrees );
+  QgsCoordinateReferenceSystem srs( myCRSID, QgsCoordinateReferenceSystem::InternalCrsId );
+  //set radio button to crs map unit type
+  QGis::UnitType units = srs.mapUnits();
 
-    // 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 );
-    }
-  }
+  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 i;
+  for ( i = 0; i < mEllipsoidList.length() && mEllipsoidList[ i ].description != srs.description(); i++ )
+    ;
+  if ( i < mEllipsoidList.length() )
+    updateEllipsoidUI( i );
 }
 
 /*!