Skip to content
Permalink
Browse files

Update doc and sip binding

  • Loading branch information
pblottiere committed Nov 16, 2017
1 parent 35459c4 commit 4fe001396d618f3b8bee6c2bedc6b888c0891aa9
Showing with 41 additions and 8 deletions.
  1. +9 −4 python/core/qgsactionmanager.sip
  2. +14 −0 python/gui/qgsactionmenu.sip
  3. +14 −0 python/gui/qgsidentifymenu.sip
  4. +4 −4 src/core/qgsactionmanager.h
@@ -62,13 +62,18 @@ class QgsActionManager
//! Remove an action at given index
void removeAction( int index );

/** Does the given values. defaultValueIndex is the index of the
* field to be used if the action has a $currfield placeholder.
* @note available in python bindings as doActionFeature
/**
* Does the given action.
*
* @param index Index of the action
* @param feat Feature to run action for
* @param defaultValueIndex Index of the field to be used if the action has a $currfield placeholder.
* @param scope Expression context scope to add during expression evaluation
*/
void doAction( int index,
const QgsFeature &feat,
int defaultValueIndex = 0 ) /PyName=doActionFeature/;
int defaultValueIndex = 0,
const QgsExpressionContextScope &scope = QgsExpressionContextScope() ) /PyName=doActionFeature/;

/** Does the action using the expression engine to replace any embedded expressions
* in the action definition.
@@ -62,6 +62,20 @@ class QgsActionMenu : QMenu
*/
void setFeature( QgsFeature* feature );

/**
* Sets an expression context scope used to resolve underlying actions.
*
* @note Added in QGIS 2.18
*/
void setExpressionContextScope( const QgsExpressionContextScope &scope );

/**
* Returns an expression context scope used to resolve underlying actions.
*
* @note Added in QGIS 2.18
*/
QgsExpressionContextScope expressionContextScope() const;

signals:
void reinit();

@@ -83,6 +83,20 @@ class QgsIdentifyMenu : QMenu
*/
QList<QgsMapToolIdentify::IdentifyResult> exec( const QList<QgsMapToolIdentify::IdentifyResult>& idResults, QPoint pos );

/**
* Sets an expression context scope used to resolve underlying actions.
*
* @note Added in QGIS 2.18
*/
void setExpressionContextScope( const QgsExpressionContextScope &scope );

/**
* Returns an expression context scope used to resolve underlying actions.
*
* @note Added in QGIS 2.18
*/
QgsExpressionContextScope expressionContextScope() const;

protected:
virtual void closeEvent( QCloseEvent *e );
};
@@ -81,10 +81,10 @@ class CORE_EXPORT QgsActionManager
/**
* Does the given action.
*
* @param actionId action id
* @param feature feature to run action for
* @param defaultValueIndex index of the field to be used if the action has a $currfield placeholder.
* @param scope expression context scope to add during expression evaluation
* @param index Index of the action
* @param feat Feature to run action for
* @param defaultValueIndex Index of the field to be used if the action has a $currfield placeholder.
* @param scope Expression context scope to add during expression evaluation
*
* @note available in python bindings as doActionFeature
*/

0 comments on commit 4fe0013

Please sign in to comment.
You can’t perform that action at this time.