raise field precision limit to 15

qgis · Apr 21, 2012 · d9bc7f3 · d9bc7f3
1 parent fe53a39
commit d9bc7f3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -39,7 +39,7 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
   connect( builder, SIGNAL( expressionParsed( bool ) ), this, SLOT( setOkButtonState() ) );
 
   //default values for field width and precision
-  mOuputFieldWidthSpinBox->setValue( 10 );
+  mOutputFieldWidthSpinBox->setValue( 10 );
   mOutputFieldPrecisionSpinBox->setValue( 3 );
 
   // disable creation of new fields if not supported by data provider
@@ -93,7 +93,7 @@ void QgsFieldCalculator::accept()
     QgsField newField( mOutputFieldNameLineEdit->text(),
                        ( QVariant::Type ) mOutputFieldTypeComboBox->itemData( mOutputFieldTypeComboBox->currentIndex(), Qt::UserRole ).toInt(),
                        mOutputFieldTypeComboBox->itemData( mOutputFieldTypeComboBox->currentIndex(), Qt::UserRole + 1 ).toString(),
-                       mOuputFieldWidthSpinBox->value(),
+                       mOutputFieldWidthSpinBox->value(),
                        mOutputFieldPrecisionSpinBox->value() );
 
     if ( !mVectorLayer->addAttribute( newField ) )
@@ -231,13 +231,13 @@ void QgsFieldCalculator::on_mOutputFieldNameLineEdit_textChanged( const QString
 
 void QgsFieldCalculator::on_mOutputFieldTypeComboBox_activated( int index )
 {
-  mOuputFieldWidthSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 2 ).toInt() );
-  mOuputFieldWidthSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 3 ).toInt() );
-  mOuputFieldWidthSpinBox->setEnabled( mOuputFieldWidthSpinBox->minimum() < mOuputFieldWidthSpinBox->maximum() );
-  if ( mOuputFieldWidthSpinBox->value() < mOuputFieldWidthSpinBox->minimum() )
-    mOuputFieldWidthSpinBox->setValue( mOuputFieldWidthSpinBox->minimum() );
-  if ( mOuputFieldWidthSpinBox->value() > mOuputFieldWidthSpinBox->maximum() )
-    mOuputFieldWidthSpinBox->setValue( mOuputFieldWidthSpinBox->maximum() );
+  mOutputFieldWidthSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 2 ).toInt() );
+  mOutputFieldWidthSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 3 ).toInt() );
+  mOutputFieldWidthSpinBox->setEnabled( mOutputFieldWidthSpinBox->minimum() < mOutputFieldWidthSpinBox->maximum() );
+  if ( mOutputFieldWidthSpinBox->value() < mOutputFieldWidthSpinBox->minimum() )
+    mOutputFieldWidthSpinBox->setValue( mOutputFieldWidthSpinBox->minimum() );
+  if ( mOutputFieldWidthSpinBox->value() > mOutputFieldWidthSpinBox->maximum() )
+    mOutputFieldWidthSpinBox->setValue( mOutputFieldWidthSpinBox->maximum() );
 
   mOutputFieldPrecisionSpinBox->setMinimum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 4 ).toInt() );
   mOutputFieldPrecisionSpinBox->setMaximum( mOutputFieldTypeComboBox->itemData( index, Qt::UserRole + 5 ).toInt() );

diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -46,7 +46,7 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WFlags fl
   mTypeBox->addItem( tr( "Decimal number" ), "Real" );
 
   mWidth->setValidator( new QIntValidator( 1, 255, this ) );
-  mPrecision->setValidator( new QIntValidator( 0, 5, this ) );
+  mPrecision->setValidator( new QIntValidator( 0, 15, this ) );
 
   mPointRadioButton->setChecked( true );
   mFileFormatComboBox->addItem( tr( "ESRI Shapefile" ), "ESRI Shapefile" );

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -340,7 +340,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
   // FIXME: sync with app/qgsnewvectorlayerdialog.cpp
   mNativeTypes
   << QgsVectorDataProvider::NativeType( tr( "Whole number (integer)" ), "integer", QVariant::Int, 1, 10 )
-  << QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), "double", QVariant::Double, 1, 20, 0, 5 )
+  << QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), "double", QVariant::Double, 1, 20, 0, 15 )
   << QgsVectorDataProvider::NativeType( tr( "Text (string)" ), "string", QVariant::String, 1, 255 )
   ;
 }

diff --git a/src/ui/qgsfieldcalculatorbase.ui b/src/ui/qgsfieldcalculatorbase.ui
@@ -92,20 +92,20 @@
          <string>Output field width</string>
         </property>
         <property name="buddy">
-         <cstring>mOuputFieldWidthSpinBox</cstring>
+         <cstring>mOutputFieldWidthSpinBox</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QSpinBox" name="mOuputFieldWidthSpinBox">
+       <widget class="QSpinBox" name="mOutputFieldWidthSpinBox">
         <property name="toolTip">
          <string>Width of complete output. For example 123,456 means 6 as field width.</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="value">
-         <number>5</number>
+         <number>15</number>
         </property>
        </widget>
       </item>
@@ -186,7 +186,7 @@
  <tabstops>
   <tabstop>mOutputFieldNameLineEdit</tabstop>
   <tabstop>mOutputFieldTypeComboBox</tabstop>
-  <tabstop>mOuputFieldWidthSpinBox</tabstop>
+  <tabstop>mOutputFieldWidthSpinBox</tabstop>
   <tabstop>mOutputFieldPrecisionSpinBox</tabstop>
   <tabstop>mButtonBox</tabstop>
  </tabstops>