Merge pull request #1480 from 3nids/fixew

wonder-sk · wonder-sk · commit a843038e8dba · 2014-06-23T14:27:08.000+07:00
small expression widget changes
diff --git a/python/gui/qgsfieldmodel.sip b/python/gui/qgsfieldmodel.sip
@@ -36,9 +36,8 @@ class QgsFieldModel : QAbstractItemModel
 
     /**
      * @brief setExpression sets a single expression to be added after the fields at the end of the model
-     * @return the model index of the newly added expression
      */
-    QModelIndex setExpression( const QString &expression );
+    void setExpression( const QString &expression );
 
     //! remove expressions from the model
     void removeExpression();
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -152,7 +152,8 @@ void QgsFieldExpressionWidget::setField( const QString &fieldName )
     if ( !idx.isValid() )
     {
       // new expression
-      idx = mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );
+      mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );
+      idx = mFieldProxyModel->sourceFieldModel()->indexFromName( fieldName );
     }
   }
   QModelIndex proxyIndex = mFieldProxyModel->mapFromSource( idx );
@@ -189,7 +190,8 @@ void QgsFieldExpressionWidget::expressionEditingFinished()
 {
   QgsDebugMsg( "Editing finsihed" );
   const QString expression = mCombo->lineEdit()->text();
-  QModelIndex idx = mFieldProxyModel->sourceFieldModel()->setExpression( expression );
+  mFieldProxyModel->sourceFieldModel()->setExpression( expression );
+  QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( expression );
   QModelIndex proxyIndex = mFieldProxyModel->mapFromSource( idx );
   mCombo->setCurrentIndex( proxyIndex.row() );
   currentFieldChanged();
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -110,20 +110,20 @@ void QgsFieldModel::setAllowExpression( bool allowExpression )
   }
 }
 
-QModelIndex QgsFieldModel::setExpression( const QString &expression )
+void QgsFieldModel::setExpression( const QString &expression )
 {
   if ( !mAllowExpression )
-    return QModelIndex();
+    return;
 
   QModelIndex idx = indexFromName( expression );
   if ( idx.isValid() )
-    return idx;
+    return;
 
   beginResetModel();
-  mExpression = QList<QString>() << expression;
+  mExpression = QList<QString>();
+  if ( !expression.isEmpty() )
+    mExpression << expression;
   endResetModel();
-
-  return index( mFields.count() , 0 );
 }
 
 void QgsFieldModel::removeExpression()
diff --git a/src/gui/qgsfieldmodel.h b/src/gui/qgsfieldmodel.h
@@ -58,9 +58,8 @@ class GUI_EXPORT QgsFieldModel : public QAbstractItemModel
 
     /**
      * @brief setExpression sets a single expression to be added after the fields at the end of the model
-     * @return the model index of the newly added expression
      */
-    QModelIndex setExpression( const QString &expression );
+    void setExpression( const QString &expression );
 
     //! remove expressions from the model
     void removeExpression();

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ void QgsFieldExpressionWidget::setField( const QString &fieldName )`
`152`	`152`	`if ( !idx.isValid() )`
`153`	`153`	`{`
`154`	`154`	`// new expression`
`155`		`- idx = mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );`
	`155`	`+ mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );`
	`156`	`+ idx = mFieldProxyModel->sourceFieldModel()->indexFromName( fieldName );`
`156`	`157`	`}`
`157`	`158`	`}`
`158`	`159`	`QModelIndex proxyIndex = mFieldProxyModel->mapFromSource( idx );`
`@@ -189,7 +190,8 @@ void QgsFieldExpressionWidget::expressionEditingFinished()`
`189`	`190`	`{`
`190`	`191`	`QgsDebugMsg( "Editing finsihed" );`
`191`	`192`	`const QString expression = mCombo->lineEdit()->text();`
`192`		`- QModelIndex idx = mFieldProxyModel->sourceFieldModel()->setExpression( expression );`
	`193`	`+ mFieldProxyModel->sourceFieldModel()->setExpression( expression );`
	`194`	`+ QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( expression );`
`193`	`195`	`QModelIndex proxyIndex = mFieldProxyModel->mapFromSource( idx );`
`194`	`196`	`mCombo->setCurrentIndex( proxyIndex.row() );`
`195`	`197`	`currentFieldChanged();`
Original file line number	Diff line number	Diff line change
`@@ -110,20 +110,20 @@ void QgsFieldModel::setAllowExpression( bool allowExpression )`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`-QModelIndex QgsFieldModel::setExpression( const QString &expression )`
	`113`	`+void QgsFieldModel::setExpression( const QString &expression )`
`114`	`114`	`{`
`115`	`115`	`if ( !mAllowExpression )`
`116`		`- return QModelIndex();`
	`116`	`+ return;`
`117`	`117`
`118`	`118`	`QModelIndex idx = indexFromName( expression );`
`119`	`119`	`if ( idx.isValid() )`
`120`		`- return idx;`
	`120`	`+ return;`
`121`	`121`
`122`	`122`	`beginResetModel();`
`123`		`- mExpression = QList<QString>() << expression;`
	`123`	`+ mExpression = QList<QString>();`
	`124`	`+ if ( !expression.isEmpty() )`
	`125`	`+ mExpression << expression;`
`124`	`126`	`endResetModel();`
`125`		`-`
`126`		`- return index( mFields.count() , 0 );`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`void QgsFieldModel::removeExpression()`