qgsDoubleToString: Don't remove trailing zeros when integer

m-kuhn · m-kuhn · commit ac38b2138029 · 2015-06-12T14:02:43.000+02:00
+ added testcase Fix #12947
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -338,7 +338,10 @@ inline void ( *cast_to_fptr( void *p ) )()
 //
 inline QString qgsDoubleToString( const double &a, const int &precision = 17 )
 {
-  return QString::number( a, 'f', precision ).remove( QRegExp( "\\.?0+$" ) );
+  if ( precision )
+    return QString::number( a, 'f', precision ).remove( QRegExp( "\\.?0+$" ) );
+  else
+    return QString::number( a, 'f', precision );
 }
 
 //
diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp
@@ -35,6 +35,7 @@ class TestQGis : public QObject
 
     void permissiveToDouble();
     void permissiveToInt();
+    void doubleToString();
 
   private:
     QString mReport;
@@ -119,5 +120,14 @@ void TestQGis::permissiveToInt()
   QCOMPARE( result, 1000 );
 }
 
+void TestQGis::doubleToString()
+{
+  QString result = qgsDoubleToString( 5.6783212, 5 );
+  QVERIFY( result == "5.67832" );
+  result = qgsDoubleToString( 5.3456789, 5 );
+  QVERIFY( result == "5.34568" );
+  result = qgsDoubleToString( 12000, 0 );
+  QVERIFY( result == "12000" );
+}
 QTEST_MAIN( TestQGis )
 #include "testqgis.moc"

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,10 @@ inline void ( cast_to_fptr( void p ) )()`
`338`	`338`	`//`
`339`	`339`	`inline QString qgsDoubleToString( const double &a, const int &precision = 17 )`
`340`	`340`	`{`
`341`		`- return QString::number( a, 'f', precision ).remove( QRegExp( "\\.?0+$" ) );`
	`341`	`+ if ( precision )`
	`342`	`+ return QString::number( a, 'f', precision ).remove( QRegExp( "\\.?0+$" ) );`
	`343`	`+ else`
	`344`	`+ return QString::number( a, 'f', precision );`
`342`	`345`	`}`
`343`	`346`
`344`	`347`	`//`