[composer] Add missing degree symbol for 'Decimal with suffix' format when using

nyalldawson · nyalldawson · commit ecedeb8b7b91 · 2014-10-05T22:26:55.000+11:00
a geographic crs
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -1265,7 +1265,15 @@ QString QgsComposerMapGrid::gridAnnotationString( double value, QgsComposerMapGr
         hemisphere = value < 0 ? QObject::tr( "S" ) : QObject::tr( "N" );
       }
     }
-    return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + hemisphere;
+    if ( geographic )
+    {
+      //insert degree symbol for geographic coordinates
+      return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + QChar( 176 ) + hemisphere;
+    }
+    else
+    {
+      return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + hemisphere;
+    }
   }
 
   QgsPoint p;
diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp
@@ -475,23 +475,23 @@ void TestQgsComposerMapGrid::annotationFormats()
   gridProjected.setAnnotationPrecision( 1 );
 
   //normal e/w
-  QCOMPARE( gridGeographic.gridAnnotationString( 90, QgsComposerMapGrid::Longitude ), QString( "90.0E" ) );
+  QCOMPARE( gridGeographic.gridAnnotationString( 90, QgsComposerMapGrid::Longitude ), QString( "90.0" ) + QChar( 176 ) + QString( "E" ) );
   QCOMPARE( gridProjected.gridAnnotationString( 90, QgsComposerMapGrid::Longitude ), QString( "90.0E" ) );
 
   //0 degrees
-  QCOMPARE( gridGeographic.gridAnnotationString( 0, QgsComposerMapGrid::Longitude ), QString( "0.0" ) );
+  QCOMPARE( gridGeographic.gridAnnotationString( 0, QgsComposerMapGrid::Longitude ), QString( "0.0" ) + QChar( 176 ) );
   QCOMPARE( gridProjected.gridAnnotationString( 0, QgsComposerMapGrid::Longitude ), QString( "0.0E" ) );
 
   //180 degrees
-  QCOMPARE( gridGeographic.gridAnnotationString( 180, QgsComposerMapGrid::Longitude ), QString( "180.0" ) );
+  QCOMPARE( gridGeographic.gridAnnotationString( 180, QgsComposerMapGrid::Longitude ), QString( "180.0" ) + QChar( 176 ) );
   QCOMPARE( gridProjected.gridAnnotationString( 180, QgsComposerMapGrid::Longitude ), QString( "180.0E" ) );
 
   //normal n/s
-  QCOMPARE( gridGeographic.gridAnnotationString( 45, QgsComposerMapGrid::Latitude ), QString( "45.0N" ) );
+  QCOMPARE( gridGeographic.gridAnnotationString( 45, QgsComposerMapGrid::Latitude ), QString( "45.0" ) + QChar( 176 ) + QString( "N" ) );
   QCOMPARE( gridProjected.gridAnnotationString( 45, QgsComposerMapGrid::Latitude ), QString( "45.0N" ) );
 
   //0 north/south
-  QCOMPARE( gridGeographic.gridAnnotationString( 0, QgsComposerMapGrid::Latitude ), QString( "0.0" ) );
+  QCOMPARE( gridGeographic.gridAnnotationString( 0, QgsComposerMapGrid::Latitude ), QString( "0.0" ) + QChar( 176 ) );
   QCOMPARE( gridProjected.gridAnnotationString( 0, QgsComposerMapGrid::Latitude ), QString( "0.0N" ) );
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,15 @@ QString QgsComposerMapGrid::gridAnnotationString( double value, QgsComposerMapGr`
`1265`	`1265`	`hemisphere = value < 0 ? QObject::tr( "S" ) : QObject::tr( "N" );`
`1266`	`1266`	`}`
`1267`	`1267`	`}`
`1268`		`- return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + hemisphere;`
	`1268`	`+ if ( geographic )`
	`1269`	`+ {`
	`1270`	`+ //insert degree symbol for geographic coordinates`
	`1271`	`+ return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + QChar( 176 ) + hemisphere;`
	`1272`	`+ }`
	`1273`	`+ else`
	`1274`	`+ {`
	`1275`	`+ return QString::number( qAbs( value ), 'f', mGridAnnotationPrecision ) + hemisphere;`
	`1276`	`+ }`
`1269`	`1277`	`}`
`1270`	`1278`
`1271`	`1279`	`QgsPoint p;`