remove protected slots in sip

3nids · 3nids · commit fe20f7bbfaaf · 2014-05-02T07:56:34.000+02:00
fix signal emitted twice
handle null expression (fix empty row)
coherent color (colored text, not background)
fix wrong slot
diff --git a/python/gui/qgsfieldcombobox.sip b/python/gui/qgsfieldcombobox.sip
@@ -35,7 +35,4 @@ class QgsFieldComboBox : QComboBox
 
     //! setField sets the currently selected field
     void setField( QString fieldName );
-
-  protected slots:
-    void indexChanged( int i );
 };
diff --git a/python/gui/qgsfieldexpressionwidget.sip b/python/gui/qgsfieldexpressionwidget.sip
@@ -36,13 +36,4 @@ class QgsFieldExpressionWidget : QWidget
 
     //! sets the current field or expression in the widget
     void setField( QString fieldName );
-
-  protected slots:
-    //! open the expression dialog to edit the current or add a new expression
-    void editExpression();
-
-    //! when expression is edited by the user in the line edit
-    void expressionEdited( QString expression );
-
-    void indexChanged( int i );
 };
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -98,37 +98,16 @@ void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
 
 void QgsFieldExpressionWidget::setField( QString fieldName )
 {
+  if ( fieldName.isEmpty() )
+    return;
+
   QModelIndex idx = mFieldModel->indexFromName( fieldName );
-  bool isExpression ;
-  if ( idx.isValid() )
-  {
-    isExpression = mFieldModel->data( idx, QgsFieldModel::IsExpressionRole ).toBool();
-  }
-  else
+  if ( !idx.isValid() )
   {
     // new expression
     idx = mFieldModel->setExpression( fieldName );
-    isExpression = true;
   }
   mCombo->setCurrentIndex( idx.row() );
-
-  QFont font;
-  font.setItalic( isExpression );
-  mCombo->lineEdit()->setFont( font );
-
-  QPalette palette;
-  palette.setColor( QPalette::Text, Qt::black );
-  if ( isExpression )
-  {
-    bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
-    if ( !isValid )
-    {
-      palette.setColor( QPalette::Text, Qt::red );
-    }
-  }
-  mCombo->lineEdit()->setPalette( palette );
-
-  emit fieldChanged( currentField() );
 }
 
 void QgsFieldExpressionWidget::editExpression()
@@ -162,6 +141,28 @@ void QgsFieldExpressionWidget::expressionEdited( QString expression )
 void QgsFieldExpressionWidget::indexChanged( int i )
 {
   Q_UNUSED( i );
-  QString name = currentField();
-  emit fieldChanged( name );
+  bool isExpression;
+  QString fieldName = currentField( &isExpression );
+
+  QFont font = mCombo->lineEdit()->font();
+  font.setItalic( isExpression );
+  mCombo->lineEdit()->setFont( font );
+
+  QPalette palette;
+  palette.setColor( QPalette::Text, Qt::black );
+  if ( isExpression )
+  {
+    QModelIndex idx = mFieldModel->indexFromName( fieldName );
+    if ( idx.isValid() )
+    {
+      bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
+      if ( !isValid )
+      {
+        palette.setColor( QPalette::Text, Qt::red );
+      }
+    }
+  }
+  mCombo->lineEdit()->setPalette( palette );
+
+  emit fieldChanged( fieldName );
 }
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -13,6 +13,8 @@
 *                                                                         *
 ***************************************************************************/
 
+#include <QFont>
+
 #include "qgsfieldmodel.h"
 #include "qgsmaplayermodel.h"
 #include "qgsmaplayerproxymodel.h"
@@ -51,7 +53,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )
 {
   if ( mLayer )
   {
-    disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );
+    disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );
     disconnect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );
   }
 
@@ -70,7 +72,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )
   }
 
   mLayer = vl;
-  connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );
+  connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );
   connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );
   updateModel();
 }
@@ -241,7 +243,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       return alias;
     }
 
-    case Qt::BackgroundRole:
+    case Qt::ForegroundRole:
     {
       if ( exprIdx >= 0 )
       {
@@ -253,7 +255,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
           exp.evaluate( &mFeature, mLayer->pendingFields() );
           if ( exp.hasEvalError() )
           {
-            return QBrush( QColor( 240, 60, 60, 180 ) );
+            return QBrush( QColor( Qt::red ) );
           }
         }
       }
@@ -265,7 +267,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       if ( exprIdx >= 0 )
       {
         // if the line is an expression, set it as italic
-        QFont font;
+        QFont font = QFont();
         font.setItalic( true );
         return font;
       }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`* *`
`14`	`14`	`***************************************************************************/`
`15`	`15`
	`16`	`+#include <QFont>`
	`17`	`+`
`16`	`18`	`#include "qgsfieldmodel.h"`
`17`	`19`	`#include "qgsmaplayermodel.h"`
`18`	`20`	`#include "qgsmaplayerproxymodel.h"`
`@@ -51,7 +53,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )`
`51`	`53`	`{`
`52`	`54`	`if ( mLayer )`
`53`	`55`	`{`
`54`		`- disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );`
	`56`	`+ disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );`
`55`	`57`	`disconnect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );`
`56`	`58`	`}`
`57`	`59`
`@@ -70,7 +72,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`mLayer = vl;`
`73`		`- connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );`
	`75`	`+ connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );`
`74`	`76`	`connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );`
`75`	`77`	`updateModel();`
`76`	`78`	`}`
`@@ -241,7 +243,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`241`	`243`	`return alias;`
`242`	`244`	`}`
`243`	`245`
`244`		`- case Qt::BackgroundRole:`
	`246`	`+ case Qt::ForegroundRole:`
`245`	`247`	`{`
`246`	`248`	`if ( exprIdx >= 0 )`
`247`	`249`	`{`
`@@ -253,7 +255,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`253`	`255`	`exp.evaluate( &mFeature, mLayer->pendingFields() );`
`254`	`256`	`if ( exp.hasEvalError() )`
`255`	`257`	`{`
`256`		`- return QBrush( QColor( 240, 60, 60, 180 ) );`
	`258`	`+ return QBrush( QColor( Qt::red ) );`
`257`	`259`	`}`
`258`	`260`	`}`
`259`	`261`	`}`
`@@ -265,7 +267,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`265`	`267`	`if ( exprIdx >= 0 )`
`266`	`268`	`{`
`267`	`269`	`// if the line is an expression, set it as italic`
`268`		`- QFont font;`
	`270`	`+ QFont font = QFont();`
`269`	`271`	`font.setItalic( true );`
`270`	`272`	`return font;`
`271`	`273`	`}`