Add function to QgsExpression

qgis · Aug 30, 2012 · 4a97a92 · 4a97a92
1 parent ab36a36
commit 4a97a92
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -787,6 +787,11 @@ static QVariant fcnRound( const QVariantList& values , QgsFeature *f, QgsExpress
   return QVariant();
 }
 
+static QVariant fcnScale( const QVariantList&, QgsFeature*, QgsExpression* parent )
+{
+    return QVariant( parent->scale() );
+}
+
 QList<QgsExpression::FunctionDef> QgsExpression::gmBuiltinFunctions;
 
 const QList<QgsExpression::FunctionDef> &QgsExpression::BuiltinFunctions()
@@ -854,6 +859,7 @@ const QList<QgsExpression::FunctionDef> &QgsExpression::BuiltinFunctions()
     // special columns
     << FunctionDef( "$rownum", 0, fcnRowNumber, QObject::tr( "Record" ) )
     << FunctionDef( "$id", 0, fcnFeatureId, QObject::tr( "Record" ) )
+    << FunctionDef( "$scale", 0, fcnScale, QObject::tr( "Record" ) )
     ;
   }
 

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -121,6 +121,10 @@ class CORE_EXPORT QgsExpression
     //! Return the number used for $rownum special column
     int currentRowNumber() { return mRowNumber; }
 
+    void setScale( double scale ) { mScale = scale; }
+
+    int scale() {return mScale; }
+
     //! Return the parsed expression as a string - useful for debugging
     QString dump() const;
 
@@ -510,6 +514,7 @@ class CORE_EXPORT QgsExpression
     QString mEvalErrorString;
 
     int mRowNumber;
+    double mScale;
 
     void initGeomCalculator();
     QgsDistanceArea* mCalc;

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -567,6 +567,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   }
 
   QString labelText;
+
   // Check to see if we are a expression string.
   if ( isExpression )
   {
@@ -576,6 +577,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
       QgsDebugMsg( "Expression parser error:" + exp->parserErrorString() );
       return;
     }
+    exp->setScale( context.rendererScale() );
     QVariant result = exp->evaluate( &f, layer->pendingFields() );
     if ( exp->hasEvalError() )
     {