sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix scale list (#52414)

Browse Source 
* fix scale list

fixes #52383

* add test

* Update qgsscalecombobox.cpp
This commit is contained in:
Denis Rouzaud 2023-03-28 11:47:21 +02:00 committed by GitHub
parent 346abae549
commit 0a387cc213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/qgsscalecombobox.cpp
View File

@ -44,7 +44,7 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
if ( scales.isEmpty() ) if ( scales.isEmpty() )
{ {
const QStringList scales = QgsSettingsRegistryCore::settingsMapScales->value(); myScalesList = QgsSettingsRegistryCore::settingsMapScales->value();
} }
else else
{ {

9
tests/src/gui/testqgsscalecombobox.cpp
View File

@ -18,6 +18,7 @@
#include "qgsapplication.h" #include "qgsapplication.h"
#include "qgslogger.h" #include "qgslogger.h"
#include "qgsscalecombobox.h" #include "qgsscalecombobox.h"
#include "qgssettingsregistrycore.h"
#include <QObject> #include <QObject>
#include <QLineEdit> #include <QLineEdit>
#include <QComboBox> #include <QComboBox>
@ -70,6 +71,14 @@ void TestQgsScaleComboBox::init()
void TestQgsScaleComboBox::basic() 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". // Testing conversion from "1:nnn".
enterScale( QStringLiteral( "1:2345" ) ); enterScale( QStringLiteral( "1:2345" ) );
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale().toString( 2345 ) ) ); QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale().toString( 2345 ) ) );