Modify testqgsscalecombobox to match modified behaviour of QgsScaleComboBox

mhugent · mhugent · commit e65f208f36c6 · 2013-03-07T08:27:07.000+01:00
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -157,7 +157,7 @@ void QgsScaleComboBox::fixupScale()
   if ( ok && ( newScale != oldScale ) )
   {
     // if a user types scale = 2345, we transform to 1:2345
-    if ( userSetScale )
+    if ( userSetScale && newScale >= 1.0 )
     {
       mScale = 1 / newScale;
     }
diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
@@ -75,12 +75,12 @@ void TestQgsScaleComboBox::basic()
   QCOMPARE( s->scaleString(), QString( "1:50" ) );
   QCOMPARE( s->scale(), ( double ) 0.02 );
 
-  // Testing conversion from number to "x:1"
+  // Testing conversion from number to "1:x"
   l->setText( "" );
   QTest::keyClicks( l, QLocale::system().toString( 42 ) );
   QTest::keyClick( l, Qt::Key_Return );
-  QCOMPARE( s->scaleString(), QString( "42:1" ) );
-  QCOMPARE( s->scale(), ( double ) 42 );
+  QCOMPARE( s->scaleString(), QString( "1:42" ) );
+  QCOMPARE( s->scale(), ( double ) 1.0 / ( double ) 42.0 );
 
   // Testing rounding and conversion from illegal
 

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void QgsScaleComboBox::fixupScale()`
`157`	`157`	`if ( ok && ( newScale != oldScale ) )`
`158`	`158`	`{`
`159`	`159`	`// if a user types scale = 2345, we transform to 1:2345`
`160`		`- if ( userSetScale )`
	`160`	`+ if ( userSetScale && newScale >= 1.0 )`
`161`	`161`	`{`
`162`	`162`	`mScale = 1 / newScale;`
`163`	`163`	`}`