add signal with expression validity

3nids · 3nids · commit 778fb622b9a9 · 2014-05-02T07:56:34.000+02:00
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -147,6 +147,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )
   Q_UNUSED( i );
   bool isExpression;
   QString fieldName = currentField( &isExpression );
+  bool isValid = true;
 
   QFont font = mCombo->lineEdit()->font();
   font.setItalic( isExpression );
@@ -159,7 +160,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )
     QModelIndex idx = mFieldModel->indexFromName( fieldName );
     if ( idx.isValid() )
     {
-      bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
+      isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
       if ( !isValid )
       {
         palette.setColor( QPalette::Text, Qt::red );
@@ -169,4 +170,5 @@ void QgsFieldExpressionWidget::indexChanged( int i )
   mCombo->lineEdit()->setPalette( palette );
 
   emit fieldChanged( fieldName );
+  emit fieldChanged( fieldName, isValid );
 }
diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -57,6 +57,9 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
     //! the signal is emitted when the currently selected field changes
     void fieldChanged( QString fieldName );
 
+    //! fieldChanged signal with indication of the validity of the expression
+    void fieldChanged( QString fieldName, bool isValid );
+
   public slots:
     //! set the layer used to display the fields and expression
     void setLayer( QgsVectorLayer* layer );

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )`
`147`	`147`	`Q_UNUSED( i );`
`148`	`148`	`bool isExpression;`
`149`	`149`	`QString fieldName = currentField( &isExpression );`
	`150`	`+ bool isValid = true;`
`150`	`151`
`151`	`152`	`QFont font = mCombo->lineEdit()->font();`
`152`	`153`	`font.setItalic( isExpression );`
`@@ -159,7 +160,7 @@ void QgsFieldExpressionWidget::indexChanged( int i )`
`159`	`160`	`QModelIndex idx = mFieldModel->indexFromName( fieldName );`
`160`	`161`	`if ( idx.isValid() )`
`161`	`162`	`{`
`162`		`- bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();`
	`163`	`+ isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();`
`163`	`164`	`if ( !isValid )`
`164`	`165`	`{`
`165`	`166`	`palette.setColor( QPalette::Text, Qt::red );`
`@@ -169,4 +170,5 @@ void QgsFieldExpressionWidget::indexChanged( int i )`
`169`	`170`	`mCombo->lineEdit()->setPalette( palette );`
`170`	`171`
`171`	`172`	`emit fieldChanged( fieldName );`
	`173`	`+ emit fieldChanged( fieldName, isValid );`
`172`	`174`	`}`