sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add an isField test for QgsExpression

Browse Source 
Checks whether expression consists of solely a field reference
This commit is contained in:
vmora 2015-04-27 09:10:59 +10:00 committed by Nyall Dawson
parent ffeb61d549
commit d4319621a5
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/qgsexpression.sip
View File

@ -72,6 +72,11 @@ class QgsExpression
//! @note added in 2.2 //! @note added in 2.2
static bool hasSpecialColumn( const QString& name ); static bool hasSpecialColumn( const QString& name );
/** Checks whether an expression consists only of a single field reference
* @note added in 2.9
*/
bool isField() const;
static bool isValid( const QString& text, const QgsFields& fields, QString &errorMessage ); static bool isValid( const QString& text, const QgsFields& fields, QString &errorMessage );
void setScale( double scale ); void setScale( double scale );

5
src/core/qgsexpression.h
View File

@ -155,6 +155,11 @@ class CORE_EXPORT QgsExpression
//! @note added in 2.2 //! @note added in 2.2
static bool hasSpecialColumn( const QString& name ); static bool hasSpecialColumn( const QString& name );
/** Checks whether an expression consists only of a single field reference
* @note added in 2.9
*/
bool isField() const { return rootNode() && dynamic_cast<const NodeColumnRef*>( rootNode() ) ;}
static bool isValid( const QString& text, const QgsFields& fields, QString &errorMessage ); static bool isValid( const QString& text, const QgsFields& fields, QString &errorMessage );
void setScale( double scale ) { mScale = scale; } void setScale( double scale ) { mScale = scale; }

10
tests/src/core/testqgsexpression.cpp
View File

@ -1099,6 +1099,16 @@ class TestQgsExpression: public QObject
QCOMPARE( QgsExpression::evaluateToDouble( QString( "a" ), 9.0 ), 9.0 ); QCOMPARE( QgsExpression::evaluateToDouble( QString( "a" ), 9.0 ), 9.0 );
QCOMPARE( QgsExpression::evaluateToDouble( QString(), 9.0 ), 9.0 ); QCOMPARE( QgsExpression::evaluateToDouble( QString(), 9.0 ), 9.0 );
} }
void eval_isField()
{
QCOMPARE( QgsExpression( "" ).isField(), false );
QCOMPARE( QgsExpression( "42" ).isField(), false );
QCOMPARE( QgsExpression( "foo" ).isField(), true );
QCOMPARE( QgsExpression( "\"foo bar\"" ).isField(), true );
QCOMPARE( QgsExpression( "sqrt(foo)" ).isField(), false );
QCOMPARE( QgsExpression( "foo + bar" ).isField(), false );
}
}; };
QTEST_MAIN( TestQgsExpression ) QTEST_MAIN( TestQgsExpression )