Reflect changes in QgsExpressionFieldWidget when source fields change

m-kuhn · 3nids · commit 4ddd1cc529cf · 2016-02-01T03:38:16.000-05:00
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -148,13 +148,17 @@ void QgsFieldExpressionWidget::setLayer( QgsMapLayer *layer )
 
 void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
 {
+  disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
+
   mExpressionContext.reset( new QgsExpressionContext() );
   mExpressionContext->appendScope( QgsExpressionContextUtils::globalScope() );
   mExpressionContext->appendScope( QgsExpressionContextUtils::projectScope() );
   if ( layer )
     mExpressionContext->appendScope( QgsExpressionContextUtils::layerScope( layer ) );
 
   mFieldProxyModel->sourceFieldModel()->setLayer( layer );
+
+  connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
 }
 
 void QgsFieldExpressionWidget::setField( const QString &fieldName )
@@ -231,6 +235,11 @@ void QgsFieldExpressionWidget::changeEvent( QEvent* event )
   }
 }
 
+void QgsFieldExpressionWidget::reloadLayer()
+{
+  setLayer( mFieldProxyModel->sourceFieldModel()->layer() );
+}
+
 void QgsFieldExpressionWidget::currentFieldChanged()
 {
   updateLineEditStyle();
diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -147,6 +147,9 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
   protected:
     void changeEvent( QEvent* event ) override;
 
+  private slots:
+    void reloadLayer();
+
   private:
     QComboBox* mCombo;
     QToolButton* mButton;

Original file line number	Diff line number	Diff line change
`@@ -148,13 +148,17 @@ void QgsFieldExpressionWidget::setLayer( QgsMapLayer *layer )`
`148`	`148`
`149`	`149`	`void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )`
`150`	`150`	`{`
	`151`	`+ disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );`
	`152`	`+`
`151`	`153`	`mExpressionContext.reset( new QgsExpressionContext() );`
`152`	`154`	`mExpressionContext->appendScope( QgsExpressionContextUtils::globalScope() );`
`153`	`155`	`mExpressionContext->appendScope( QgsExpressionContextUtils::projectScope() );`
`154`	`156`	`if ( layer )`
`155`	`157`	`mExpressionContext->appendScope( QgsExpressionContextUtils::layerScope( layer ) );`
`156`	`158`
`157`	`159`	`mFieldProxyModel->sourceFieldModel()->setLayer( layer );`
	`160`	`+`
	`161`	`+ connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );`
`158`	`162`	`}`
`159`	`163`
`160`	`164`	`void QgsFieldExpressionWidget::setField( const QString &fieldName )`
`@@ -231,6 +235,11 @@ void QgsFieldExpressionWidget::changeEvent( QEvent* event )`
`231`	`235`	`}`
`232`	`236`	`}`
`233`	`237`
	`238`	`+void QgsFieldExpressionWidget::reloadLayer()`
	`239`	`+{`
	`240`	`+ setLayer( mFieldProxyModel->sourceFieldModel()->layer() );`
	`241`	`+}`
	`242`	`+`
`234`	`243`	`void QgsFieldExpressionWidget::currentFieldChanged()`
`235`	`244`	`{`
`236`	`245`	`updateLineEditStyle();`