Skip to content

Commit d9bc7f3

Browse files
jef-njef-n
committedApr 21, 2012
raise field precision limit to 15
·
ltr-3_40Before-merge-new_vector_api
1 parent fe53a39 commit d9bc7f3

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed
 

‎src/app/qgsfieldcalculator.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
3939
connect( builder, SIGNAL( expressionParsed( bool ) ), this, SLOT( setOkButtonState() ) );
4040

4141
//default values for field width and precision
42-
mOuputFieldWidthSpinBox->setValue( 10 );
42+
mOutputFieldWidthSpinBox->setValue( 10 );
4343
mOutputFieldPrecisionSpinBox->setValue( 3 );
4444

4545
// disable creation of new fields if not supported by data provider
@@ -93,7 +93,7 @@ void QgsFieldCalculator::accept()
9393
QgsField newField( mOutputFieldNameLineEdit->text(),
9494
( QVariant::Type ) mOutputFieldTypeComboBox->itemData( mOutputFieldTypeComboBox->currentIndex(), Qt::UserRole ).toInt(),
9595
mOutputFieldTypeComboBox->itemData( mOutputFieldTypeComboBox->currentIndex(), Qt::UserRole + 1 ).toString(),
96-
mOuputFieldWidthSpinBox->value(),
96+
mOutputFieldWidthSpinBox->value(),
9797
mOutputFieldPrecisionSpinBox->value() );
9898

9999
if ( !mVectorLayer->addAttribute( newField ) )
@@ -231,13 +231,13 @@ void QgsFieldCalculator::on_mOutputFieldNameLineEdit_textChanged( const QString
231231

232232
void QgsFieldCalculator::on_mOutputFieldTypeComboBox_activated( int index )
233233
{
234-
mOuputFieldWidthSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 2 ).toInt() );
235-
mOuputFieldWidthSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 3 ).toInt() );
236-
mOuputFieldWidthSpinBox->setEnabled( mOuputFieldWidthSpinBox->minimum() < mOuputFieldWidthSpinBox->maximum() );
237-
if ( mOuputFieldWidthSpinBox->value() < mOuputFieldWidthSpinBox->minimum() )
238-
mOuputFieldWidthSpinBox->setValue( mOuputFieldWidthSpinBox->minimum() );
239-
if ( mOuputFieldWidthSpinBox->value() > mOuputFieldWidthSpinBox->maximum() )
240-
mOuputFieldWidthSpinBox->setValue( mOuputFieldWidthSpinBox->maximum() );
234+
mOutputFieldWidthSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 2 ).toInt() );
235+
mOutputFieldWidthSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 3 ).toInt() );
236+
mOutputFieldWidthSpinBox->setEnabled( mOutputFieldWidthSpinBox->minimum() < mOutputFieldWidthSpinBox->maximum() );
237+
if ( mOutputFieldWidthSpinBox->value() < mOutputFieldWidthSpinBox->minimum() )
238+
mOutputFieldWidthSpinBox->setValue( mOutputFieldWidthSpinBox->minimum() );
239+
if ( mOutputFieldWidthSpinBox->value() > mOutputFieldWidthSpinBox->maximum() )
240+
mOutputFieldWidthSpinBox->setValue( mOutputFieldWidthSpinBox->maximum() );
241241

242242
mOutputFieldPrecisionSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 4 ).toInt() );
243243
mOutputFieldPrecisionSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 5 ).toInt() );

‎src/gui/qgsnewvectorlayerdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WFlags fl
4646
mTypeBox->addItem( tr( "Decimal number" ), "Real" );
4747

4848
mWidth->setValidator( new QIntValidator( 1, 255, this ) );
49-
mPrecision->setValidator( new QIntValidator( 0, 5, this ) );
49+
mPrecision->setValidator( new QIntValidator( 0, 15, this ) );
5050

5151
mPointRadioButton->setChecked( true );
5252
mFileFormatComboBox->addItem( tr( "ESRI Shapefile" ), "ESRI Shapefile" );

‎src/providers/ogr/qgsogrprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
340340
// FIXME: sync with app/qgsnewvectorlayerdialog.cpp
341341
mNativeTypes
342342
<< QgsVectorDataProvider::NativeType( tr( "Whole number (integer)" ), "integer", QVariant::Int, 1, 10 )
343-
<< QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), "double", QVariant::Double, 1, 20, 0, 5 )
343+
<< QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), "double", QVariant::Double, 1, 20, 0, 15 )
344344
<< QgsVectorDataProvider::NativeType( tr( "Text (string)" ), "string", QVariant::String, 1, 255 )
345345
;
346346
}

‎src/ui/qgsfieldcalculatorbase.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,20 @@
9292
<string>Output field width</string>
9393
</property>
9494
<property name="buddy">
95-
<cstring>mOuputFieldWidthSpinBox</cstring>
95+
<cstring>mOutputFieldWidthSpinBox</cstring>
9696
</property>
9797
</widget>
9898
</item>
9999
<item row="2" column="1">
100-
<widget class="QSpinBox" name="mOuputFieldWidthSpinBox">
100+
<widget class="QSpinBox" name="mOutputFieldWidthSpinBox">
101101
<property name="toolTip">
102102
<string>Width of complete output. For example 123,456 means 6 as field width.</string>
103103
</property>
104104
<property name="minimum">
105105
<number>0</number>
106106
</property>
107107
<property name="value">
108-
<number>5</number>
108+
<number>15</number>
109109
</property>
110110
</widget>
111111
</item>
@@ -186,7 +186,7 @@
186186
<tabstops>
187187
<tabstop>mOutputFieldNameLineEdit</tabstop>
188188
<tabstop>mOutputFieldTypeComboBox</tabstop>
189-
<tabstop>mOuputFieldWidthSpinBox</tabstop>
189+
<tabstop>mOutputFieldWidthSpinBox</tabstop>
190190
<tabstop>mOutputFieldPrecisionSpinBox</tabstop>
191191
<tabstop>mButtonBox</tabstop>
192192
</tabstops>

0 commit comments

Comments
 (0)
Please sign in to comment.