Disable degree / minute / second format if map units are not degrees

qgis · Aug 9, 2012 · 5821e2b · 5821e2b
1 parent d0b4fc1
commit 5821e2b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1989,11 +1989,18 @@ void QgsComposerMap::createDefaultOverviewFrameSymbol()
 void QgsComposerMap::initGridAnnotationFormatFromProject()
 {
   QString format = QgsProject::instance()->readEntry( "PositionPrecision", "/DegreeFormat", "D" );
-  if ( format == "DM" )
+
+  bool degreeUnits = true;
+  if ( mMapRenderer )
+  {
+    degreeUnits = ( mMapRenderer->mapUnits() == QGis::Degrees );
+  }
+
+  if ( format == "DM" && degreeUnits )
   {
     mGridAnnotationFormat = DegreeMinute;
   }
-  else if ( format == "DMS" )
+  else if ( format == "DMS" && degreeUnits )
   {
     mGridAnnotationFormat = DegreeMinuteSecond;
   }