Skip to content

Commit 45593bf

Browse files
author
Hugo Mercier
committedOct 4, 2012
Revert "Revert "Merge pull request #245 from Oslandia/atlas_integration""
This reverts commit 8a1953b.
1 parent 1ed1188 commit 45593bf

36 files changed

+2045
-200
lines changed
 

‎python/core/qgsexpression.sip

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ class QgsExpression
4343
//! Return the number used for $rownum special column
4444
int currentRowNumber();
4545

46+
//! Assign a special column
47+
static void setSpecialColumn( const QString& name, QVariant value );
48+
//! Unset a special column
49+
static void unsetSpecialColumn( const QString& name );
50+
//! Return the value of the given special column or a null QVariant if undefined
51+
static QVariant specialColumn( const QString& name );
52+
4653
void setScale( double scale );
4754

4855
int scale();
@@ -64,7 +71,6 @@ class QgsExpression
6471
static QString replaceExpressionText( QString action, QgsFeature &feat,
6572
QgsVectorLayer* layer,
6673
const QMap<QString, QVariant> *substitutionMap = 0 );
67-
6874
//
6975

7076
enum UnaryOperator
@@ -141,6 +147,11 @@ class QgsExpression
141147
*/
142148
static int functionCount();
143149

150+
/**
151+
* Returns a list of special Column definitions
152+
*/
153+
static QList<QgsExpression::FunctionDef> specialColumns();
154+
144155
//! return quoted column reference (in double quotes)
145156
static QString quotedColumnRef( QString name );
146157
//! return quoted string (in single quotes)

0 commit comments

Comments
 (0)
Please sign in to comment.