Show fields in "default value" expression editor

m-kuhn · m-kuhn · commit b642c3ff5ede · 2016-10-05T13:41:03.000+02:00
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -69,6 +69,8 @@ QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx
     isFieldEditableCheckBox->setEnabled( false );
   }
 
+  mExpressionWidget->setLayer( vl );
+
   connect( mExpressionWidget, SIGNAL( expressionChanged( QString ) ), this, SLOT( defaultExpressionChanged() ) );
 
   QSettings settings;
diff --git a/src/gui/qgsexpressionlineedit.cpp b/src/gui/qgsexpressionlineedit.cpp
@@ -20,6 +20,7 @@
 #include "qgsexpressionbuilderdialog.h"
 #include "qgsexpressioncontextgenerator.h"
 #include "qgscodeeditorsql.h"
+#include "qgsvectorlayer.h"
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QToolButton>
@@ -113,6 +114,8 @@ void QgsExpressionLineEdit::setGeomCalculator( const QgsDistanceArea &da )
 
 void QgsExpressionLineEdit::setLayer( QgsVectorLayer* layer )
 {
+  if ( !mExpressionContextGenerator || mExpressionContextGenerator == mLayer )
+    mExpressionContextGenerator = layer;
   mLayer = layer;
 }
 
diff --git a/src/gui/qgsexpressionlineedit.h b/src/gui/qgsexpressionlineedit.h
@@ -54,35 +54,44 @@ class GUI_EXPORT QgsExpressionLineEdit : public QWidget
      */
     explicit QgsExpressionLineEdit( QWidget *parent = nullptr );
 
-    /** Sets the title used in the expression builder dialog
+    /**
+     * Sets the title used in the expression builder dialog
      * @param title dialog title
      * @see expressionDialogTitle()
      */
     void setExpressionDialogTitle( const QString& title );
 
-    /** Returns the title used for the expression dialog.
+    /**
+     * Returns the title used for the expression dialog.
      * @see setExpressionDialogTitle()
      */
     QString expressionDialogTitle() const { return mExpressionDialogTitle; }
 
-    /** Sets whether the widget should show a multiline text editor.
+    /**
+     * Sets whether the widget should show a multiline text editor.
      * @param multiLine set to true to show multiline editor, or false
      * to show single line editor (the default).
      */
     void setMultiLine( bool multiLine );
 
-    /** Set the geometry calculator used in the expression dialog.
+    /**
+     * Set the geometry calculator used in the expression dialog.
      * @param distanceArea calculator
      */
     void setGeomCalculator( const QgsDistanceArea &distanceArea );
 
-    /** Sets a layer associated with the widget. Required in order to get the fields and values
-      * from the layer.
-      * @param layer vector layer
-      */
+    /**
+     * Sets a layer associated with the widget. Required in order to get the fields and values
+     * from the layer.
+     * This will also automatically register the layer as expression context generator if
+     * no generator has been set before or the previous layer has been used as generator.
+     *
+     * @see registerExpressionContextGenerator
+     */
     void setLayer( QgsVectorLayer* layer );
 
-    /** Returns the current expression shown in the widget.
+    /**
+     * Returns the current expression shown in the widget.
      * @see setExpression()
      */
     QString expression() const;
@@ -110,16 +119,19 @@ class GUI_EXPORT QgsExpressionLineEdit : public QWidget
 
   public slots:
 
-    /** Sets the current expression to show in the widget.
+    /**
+     * Sets the current expression to show in the widget.
      * @param expression expression string
      * @see expression()
      */
     void setExpression( const QString& expression );
 
   protected:
+
     void changeEvent( QEvent* event ) override;
 
   private slots:
+
     //! When the expression is edited by the user in the line edit, it will be checked for validity
     void expressionEdited( const QString& expression );
     void expressionEdited();

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx`
`69`	`69`	`isFieldEditableCheckBox->setEnabled( false );`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ mExpressionWidget->setLayer( vl );`
	`73`	`+`
`72`	`74`	`connect( mExpressionWidget, SIGNAL( expressionChanged( QString ) ), this, SLOT( defaultExpressionChanged() ) );`
`73`	`75`
`74`	`76`	`QSettings settings;`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "qgsexpressionbuilderdialog.h"`
`21`	`21`	`#include "qgsexpressioncontextgenerator.h"`
`22`	`22`	`#include "qgscodeeditorsql.h"`
	`23`	`+#include "qgsvectorlayer.h"`
`23`	`24`	`#include <QHBoxLayout>`
`24`	`25`	`#include <QVBoxLayout>`
`25`	`26`	`#include <QToolButton>`
`@@ -113,6 +114,8 @@ void QgsExpressionLineEdit::setGeomCalculator( const QgsDistanceArea &da )`
`113`	`114`
`114`	`115`	`void QgsExpressionLineEdit::setLayer( QgsVectorLayer* layer )`
`115`	`116`	`{`
	`117`	`+ if ( !mExpressionContextGenerator \|\| mExpressionContextGenerator == mLayer )`
	`118`	`+ mExpressionContextGenerator = layer;`
`116`	`119`	`mLayer = layer;`
`117`	`120`	`}`
`118`	`121`