Skip to content
Permalink
Browse files

Merge pull request #7210 from elpaso/bugfix-18656-layout-map-extent

[bugfix] Use locale representation for extent
  • Loading branch information
elpaso committed Jun 9, 2018
2 parents 2327728 + 615d7a0 commit f4ecbbfed0f018852440c43334e320a3d150dd5b
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/app/layout/qgslayoutmapwidget.cpp
@@ -607,25 +607,25 @@ void QgsLayoutMapWidget::updateGuiElements()
if ( scale >= 10 )
{
//round scale to integer if it's greater than 10
mScaleLineEdit->setText( QString::number( mMapItem->scale(), 'f', 0 ) );
mScaleLineEdit->setText( QLocale().toString( mMapItem->scale(), 'f', 0 ) );
}
else if ( scale >= 1 )
{
//don't round scale if it's less than 10, instead use 4 decimal places
mScaleLineEdit->setText( QString::number( mMapItem->scale(), 'f', 4 ) );
mScaleLineEdit->setText( QLocale().toString( mMapItem->scale(), 'f', 4 ) );
}
else
{
//if scale < 1 then use 10 decimal places
mScaleLineEdit->setText( QString::number( mMapItem->scale(), 'f', 10 ) );
mScaleLineEdit->setText( QLocale().toString( mMapItem->scale(), 'f', 10 ) );
}

//composer map extent
QgsRectangle composerMapExtent = mMapItem->extent();
mXMinLineEdit->setText( QString::number( composerMapExtent.xMinimum(), 'f', 3 ) );
mXMaxLineEdit->setText( QString::number( composerMapExtent.xMaximum(), 'f', 3 ) );
mYMinLineEdit->setText( QString::number( composerMapExtent.yMinimum(), 'f', 3 ) );
mYMaxLineEdit->setText( QString::number( composerMapExtent.yMaximum(), 'f', 3 ) );
mXMinLineEdit->setText( QLocale().toString( composerMapExtent.xMinimum(), 'f', 3 ) );
mXMaxLineEdit->setText( QLocale().toString( composerMapExtent.xMaximum(), 'f', 3 ) );
mYMinLineEdit->setText( QLocale().toString( composerMapExtent.yMinimum(), 'f', 3 ) );
mYMaxLineEdit->setText( QLocale().toString( composerMapExtent.yMaximum(), 'f', 3 ) );

mMapRotationSpinBox->setValue( mMapItem->mapRotation( QgsLayoutObject::OriginalValue ) );

0 comments on commit f4ecbbf

Please sign in to comment.
You can’t perform that action at this time.