fix scale list (#52414)

* fix scale list fixes #52383 * add test * Update qgsscalecombobox.cpp
qgis · Mar 28, 2023 · 0a387cc · 0a387cc
1 parent 346abae
commit 0a387cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -44,7 +44,7 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
 
   if ( scales.isEmpty() )
   {
-    const QStringList scales = QgsSettingsRegistryCore::settingsMapScales->value();
+    myScalesList = QgsSettingsRegistryCore::settingsMapScales->value();
   }
   else
   {

diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
@@ -18,6 +18,7 @@
 #include "qgsapplication.h"
 #include "qgslogger.h"
 #include "qgsscalecombobox.h"
+#include "qgssettingsregistrycore.h"
 #include <QObject>
 #include <QLineEdit>
 #include <QComboBox>
@@ -70,6 +71,14 @@ void TestQgsScaleComboBox::init()
 
 void TestQgsScaleComboBox::basic()
 {
+  const QStringList scales = QgsSettingsRegistryCore::settingsMapScales->value();
+  QCOMPARE( scales.count(), s->count() );
+  for ( int i = 0; i < s->count(); i++ )
+  {
+    int denominator = QLocale().toInt( scales[i].split( ':' )[1] );
+    QCOMPARE( s->itemText( i ), QString( "1:%1" ).arg( QLocale().toString( denominator ) ) );
+  }
+
   // Testing conversion from "1:nnn".
   enterScale( QStringLiteral( "1:2345" ) );
   QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale().toString( 2345 ) ) );