Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #245 from Oslandia/atlas_integration
[FEATURE] Support for creation of map atlasses in print composer - Atlas integration
  • Loading branch information
timlinux committed Sep 28, 2012
2 parents 23352ce + 80eb345 commit fe8385e
Show file tree
Hide file tree
Showing 36 changed files with 2,045 additions and 200 deletions.
13 changes: 12 additions & 1 deletion python/core/qgsexpression.sip
Expand Up @@ -43,6 +43,13 @@ class QgsExpression
//! Return the number used for $rownum special column
int currentRowNumber();

//! Assign a special column
static void setSpecialColumn( const QString& name, QVariant value );
//! Unset a special column
static void unsetSpecialColumn( const QString& name );
//! Return the value of the given special column or a null QVariant if undefined
static QVariant specialColumn( const QString& name );

void setScale( double scale );

int scale();
Expand All @@ -64,7 +71,6 @@ class QgsExpression
static QString replaceExpressionText( QString action, QgsFeature &feat,
QgsVectorLayer* layer,
const QMap<QString, QVariant> *substitutionMap = 0 );

//

enum UnaryOperator
Expand Down Expand Up @@ -141,6 +147,11 @@ class QgsExpression
*/
static int functionCount();

/**
* Returns a list of special Column definitions
*/
static QList<QgsExpression::FunctionDef> specialColumns();

//! return quoted column reference (in double quotes)
static QString quotedColumnRef( QString name );
//! return quoted string (in single quotes)
Expand Down

0 comments on commit fe8385e

Please sign in to comment.