diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp index f5063be9079d..484f5ad2663c 100644 --- a/src/app/qgslabeldialog.cpp +++ b/src/app/qgslabeldialog.cpp @@ -14,15 +14,19 @@ * * ***************************************************************************/ /* $Id$ */ + +#include + #include "qgslabeldialog.h" #include "qgsfield.h" #include "qgslabel.h" #include "qgslabelattributes.h" +#include "qgslogger.h" #include #include #include -#include "qgslogger.h" +#include const int PIXMAP_WIDTH = 200; @@ -146,8 +150,10 @@ void QgsLabelDialog::init( ) // set up the scale based layer visibility stuff.... chkUseScaleDependentRendering->setChecked( mLabel->scaleBasedVisibility() ); - spinMinimumScale->setValue(( int )mLabel->minScale() ); - spinMaximumScale->setValue(( int )mLabel->maxScale() ); + leMinimumScale->setText( QString::number( mLabel->minScale(), 'f' ) ); + leMinimumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); + leMaximumScale->setText( QString::number( mLabel->maxScale(), 'f' ) ); + leMaximumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); // //set the non-databound fields up now @@ -438,8 +444,8 @@ void QgsLabelDialog::apply() // set up the scale based layer visibility stuff.... mLabel->setScaleBasedVisibility( chkUseScaleDependentRendering->isChecked() ); - mLabel->setMinScale( spinMinimumScale->value() ); - mLabel->setMaxScale( spinMaximumScale->value() ); + mLabel->setMinScale( leMinimumScale->text().toFloat() ); + mLabel->setMaxScale( leMaximumScale->text().toFloat() ); } int QgsLabelDialog::fieldIndexFromName( QString name ) diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index df6a65f3dfc8..30e7594cff4f 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include "qgslogger.h" #include "qgsapplication.h" @@ -98,8 +98,10 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p // set up the scale based layer visibility stuff.... chkUseScaleDependentRendering->setChecked( lyr->hasScaleBasedVisibility() ); - spinMinimumScale->setValue(( int )lyr->minimumScale() ); - spinMaximumScale->setValue(( int )lyr->maximumScale() ); + leMinimumScale->setText( QString::number( lyr->minimumScale(), 'f' ) ); + leMinimumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); + leMaximumScale->setText( QString::number( lyr->maximumScale(), 'f' ) ); + leMaximumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); // build GUI components cboxColorMap->addItem( tr( "Grayscale" ) ); @@ -1446,8 +1448,8 @@ void QgsRasterLayerProperties::apply() // set up the scale based layer visibility stuff.... mRasterLayer->toggleScaleBasedVisibility( chkUseScaleDependentRendering->isChecked() ); - mRasterLayer->setMinimumScale( spinMinimumScale->value() ); - mRasterLayer->setMaximumScale( spinMaximumScale->value() ); + mRasterLayer->setMinimumScale( leMinimumScale->text().toFloat() ); + mRasterLayer->setMaximumScale( leMaximumScale->text().toFloat() ); //update the legend pixmap pixmapLegend->setPixmap( mRasterLayer->legendAsPixmap() ); diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index f682a9a2f32a..dff90fd26a30 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -18,6 +18,7 @@ /* $Id$ */ #include +#include #include "qgisapp.h" #include "qgsapplication.h" @@ -476,8 +477,10 @@ void QgsVectorLayerProperties::reset( void ) // set up the scale based layer visibility stuff.... chkUseScaleDependentRendering->setChecked( layer->hasScaleBasedVisibility() ); - spinMinimumScale->setValue(( int )layer->minimumScale() ); - spinMaximumScale->setValue(( int )layer->maximumScale() ); + leMinimumScale->setText( QString::number( layer->minimumScale(), 'f' ) ); + leMinimumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); + leMaximumScale->setText( QString::number( layer->maximumScale(), 'f' ) ); + leMaximumScale->setValidator( new QDoubleValidator( 0, std::numeric_limits::max(), 1000, this ) ); // symbology initialization if ( legendtypecombobox->count() == 0 ) @@ -570,8 +573,8 @@ void QgsVectorLayerProperties::apply() // set up the scale based layer visibility stuff.... layer->toggleScaleBasedVisibility( chkUseScaleDependentRendering->isChecked() ); - layer->setMinimumScale( spinMinimumScale->value() ); - layer->setMaximumScale( spinMaximumScale->value() ); + layer->setMinimumScale( leMinimumScale->text().toFloat() ); + layer->setMaximumScale( leMaximumScale->text().toFloat() ); // update the display field layer->setDisplayField( displayFieldComboBox->currentText() ); diff --git a/src/ui/qgslabeldialogbase.ui b/src/ui/qgslabeldialogbase.ui index 910de58765b6..1f7903b7ba06 100644 --- a/src/ui/qgslabeldialogbase.ui +++ b/src/ui/qgslabeldialogbase.ui @@ -304,9 +304,6 @@ Maximum - - spinMaximumScale - @@ -314,36 +311,13 @@ Minimum - - spinMinimumScale - - - - Minimum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - + - - - Maximum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - + @@ -947,8 +921,8 @@ radioBelowLeft radioBelow radioBelowRight - spinMinimumScale - spinMaximumScale + leMinimumScale + leMaximumScale pbnDefaultBufferColor_2 spinBufferSize radioBufferUnitsPoints diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui index e08300548aec..a4ef999c4912 100644 --- a/src/ui/qgsrasterlayerpropertiesbase.ui +++ b/src/ui/qgsrasterlayerpropertiesbase.ui @@ -1569,46 +1569,32 @@ 11 - - - - Maximum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - - + + Qt::RightToLeft + Maximum - - - - Minimum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - - + + Qt::RightToLeft + Minimum + + + + + + @@ -1824,8 +1810,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> @@ -2114,8 +2100,8 @@ p, li { white-space: pre-wrap; } tableTransparency leDisplayName leLayerSource - spinMinimumScale - spinMaximumScale + leMinimumScale + leMaximumScale leSpatialRefSys pbnChangeSpatialRefSys tePyramidDescription diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui index 6304711444b7..6621976fc54e 100644 --- a/src/ui/qgsvectorlayerpropertiesbase.ui +++ b/src/ui/qgsvectorlayerpropertiesbase.ui @@ -142,7 +142,7 @@ - 0 + 3 @@ -423,8 +423,8 @@ 0 0 - 401 - 425 + 514 + 428 @@ -548,9 +548,6 @@ Maximum - - spinMaximumScale - @@ -558,36 +555,13 @@ Minimum - - spinMinimumScale - - - - Minimum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - + - - - Maximum scale at which this layer will be displayed. - - - 1 - - - 100000000 - - + @@ -732,8 +706,8 @@ displayFieldComboBox leSpatialRefSys pbnIndex - spinMinimumScale - spinMaximumScale + leMinimumScale + leMaximumScale txtSubsetSQL pbnQueryBuilder buttonBox