sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

use localized representation of scales in scale combobox, improved patch

Browse Source 
from Alvaro Huarte (fix #8733)
This commit is contained in:
Alexander Bruy 2013-10-19 14:50:09 +03:00
parent bdc02a2369
commit 82e6451671
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/qgsscalecombobox.cpp
View File

@ -63,6 +63,19 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
}
}
QStringList parts;
double denominator;
bool ok;
for ( int i = 0; i < myScalesList.size(); ++i )
{
parts = myScalesList[ i ] .split( ':' );
denominator = QLocale::system().toDouble( parts[1], &ok );
if ( ok )
{
myScalesList[ i ] = toString( 1.0 / denominator );
}
}
blockSignals( true );
clear();
addItems( myScalesList );
@ -180,11 +193,11 @@ QString QgsScaleComboBox::toString( double scale )
{
if ( scale > 1 )
{
return QString( "%1:1" ).arg( qRound( scale ) );
return QString( "%1:1" ).arg( QLocale::system().toString( qRound( scale ) ) );
}
else
{
return QString( "1:%1" ).arg( qRound( 1.0 / scale ) );
return QString( "1:%1" ).arg( QLocale::system().toString( qRound( 1.0 / scale ) ) );
}
}