Set combo box maximum for precision <= type length

mhugent · mhugent · commit 69c656e5f9c2 · 2013-03-14T14:31:07.000+01:00
diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp
@@ -63,14 +63,25 @@ void QgsAddAttrDialog::on_mTypeBox_currentIndexChanged( int idx )
     mLength->setValue( mLength->minimum() );
   if ( mLength->value() > mLength->maximum() )
     mLength->setValue( mLength->maximum() );
+  setPrecisionMinMax();
+}
+
+void QgsAddAttrDialog::on_mLength_editingFinished()
+{
+  setPrecisionMinMax();
+}
 
-  mPrec->setMinimum( mTypeBox->itemData( idx, Qt::UserRole + 4 ).toInt() );
-  mPrec->setMaximum( mTypeBox->itemData( idx, Qt::UserRole + 5 ).toInt() );
-  mPrec->setVisible( mPrec->minimum() < mPrec->maximum() );
-  if ( mPrec->value() < mPrec->minimum() )
-    mPrec->setValue( mPrec->minimum() );
-  if ( mPrec->value() > mPrec->maximum() )
-    mPrec->setValue( mPrec->maximum() );
+void QgsAddAttrDialog::setPrecisionMinMax()
+{
+  int idx = mTypeBox->currentIndex();
+  int minPrecType = mTypeBox->itemData( idx, Qt::UserRole + 4 ).toInt();
+  int maxPrecType = mTypeBox->itemData( idx, Qt::UserRole + 5 ).toInt();
+  mPrec->setVisible( minPrecType < maxPrecType );
+  if ( mPrec->isVisible() )
+  {
+    mPrec->setMinimum( minPrecType );
+    mPrec->setMaximum( qMin( maxPrecType, mLength->value() ) );
+  }
 }
 
 void QgsAddAttrDialog::accept()
diff --git a/src/app/qgsaddattrdialog.h b/src/app/qgsaddattrdialog.h
@@ -37,11 +37,13 @@ class QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogBase
 
   public slots:
     void on_mTypeBox_currentIndexChanged( int idx );
+    void on_mLength_editingFinished();
     void accept();
 
   private:
     QString mLayerType;
 
+    void setPrecisionMinMax();
 };
 
 #endif
