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

fix build error and update sips

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-06-14 11:47:05 +02:00
parent 5d70839f11
commit 03475be523
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsexpression.sip
View File

@ -66,6 +66,8 @@ class QgsExpression
//! @note added in 2.2
static bool hasSpecialColumn( const QString& name );
static bool isValid( const QString& text, const QgsFields& fields, QString &errorMessage );
void setScale( double scale );
double scale();

15
python/gui/qgsfieldexpressionwidget.sip
View File

@ -20,6 +20,8 @@ class QgsFieldExpressionWidget : QWidget
//! setFilters allows fitering according to the type of field
void setFilters( QgsFieldProxyModel::Filters filters );
void setLeftHandButtonStyle( bool isLeft );
//! currently used filter on list of fields
QgsFieldProxyModel::Filters filters();
@ -33,6 +35,17 @@ class QgsFieldExpressionWidget : QWidget
*/
QString currentField( bool *isExpression = 0, bool *isValid = 0 );
/**
* Return true if the current expression is valid
*/
bool isValidExpression( QString *expressionError = 0 );
bool isExpression();
/**
* Return the current text that is set in the expression area
*/
QString currentText();
//! Returns the currently used layer
QgsVectorLayer* layer();
@ -43,6 +56,8 @@ class QgsFieldExpressionWidget : QWidget
//! fieldChanged signal with indication of the validity of the expression
void fieldChanged( QString fieldName, bool isValid );
void returnPressed();
public slots:
//! set the layer used to display the fields and expression
void setLayer( QgsVectorLayer* layer );

2
src/core/qgsexpression.cpp
View File

@ -1729,7 +1729,7 @@ bool QgsExpression::hasSpecialColumn( const QString& name )
return gmSpecialColumns.contains( name );
}
bool QgsExpression::isValid( const QString &text, const QgsFields &fields, QString errorMessage )
bool QgsExpression::isValid( const QString &text, const QgsFields &fields, QString &errorMessage )
{
QgsExpression exp( text );
exp.prepare( fields );

2
src/core/qgsexpression.h
View File

@ -152,7 +152,7 @@ class CORE_EXPORT QgsExpression
//! @note added in 2.2
static bool hasSpecialColumn( const QString& name );
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; }

5
src/gui/qgsfieldexpressionwidget.cpp
View File

@ -87,9 +87,10 @@ QString QgsFieldExpressionWidget::currentText()
return mCombo->currentText();
}
bool QgsFieldExpressionWidget::isValidExpression( QString& expressionError )
bool QgsFieldExpressionWidget::isValidExpression( QString *expressionError )
{
return QgsExpression::isValid( currentText(), layer()->pendingFields(), expressionError );
QString temp;
return QgsExpression::isValid( currentText(), layer()->pendingFields(), expressionError ? *expressionError : temp );
}
bool QgsFieldExpressionWidget::isExpression()

4
src/gui/qgsfieldexpressionwidget.h
View File

@ -77,11 +77,11 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
/**
* Return true if the current expression is valid
*/
bool isValidExpression( QString& expressionError = QString() );
bool isValidExpression( QString *expressionError = 0 );
bool isExpression();
/**
* Retun the current text that is set in the expression area
* Return the current text that is set in the expression area
*/
QString currentText();