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

remove protected slots in sip

Browse Source 
fix signal emitted twice
handle null expression (fix empty row)
coherent color (colored text, not background)
fix wrong slot
This commit is contained in:
Denis Rouzaud 2014-04-29 08:26:43 +02:00
parent 86700d2426
commit fe20f7bbfa
4 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/gui/qgsfieldcombobox.sip
View File

@ -35,7 +35,4 @@ class QgsFieldComboBox : QComboBox
//! setField sets the currently selected field
void setField( QString fieldName );
protected slots:
void indexChanged( int i );
};

9
python/gui/qgsfieldexpressionwidget.sip
View File

@ -36,13 +36,4 @@ class QgsFieldExpressionWidget : QWidget
//! sets the current field or expression in the widget
void setField( QString fieldName );
protected slots:
//! open the expression dialog to edit the current or add a new expression
void editExpression();
//! when expression is edited by the user in the line edit
void expressionEdited( QString expression );
void indexChanged( int i );
};

55
src/gui/qgsfieldexpressionwidget.cpp
View File

@ -98,37 +98,16 @@ void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
void QgsFieldExpressionWidget::setField( QString fieldName )
{
if ( fieldName.isEmpty() )
return;
QModelIndex idx = mFieldModel->indexFromName( fieldName );
bool isExpression ;
if ( idx.isValid() )
{
isExpression = mFieldModel->data( idx, QgsFieldModel::IsExpressionRole ).toBool();
}
else
if ( !idx.isValid() )
{
// new expression
idx = mFieldModel->setExpression( fieldName );
isExpression = true;
}
mCombo->setCurrentIndex( idx.row() );
QFont font;
font.setItalic( isExpression );
mCombo->lineEdit()->setFont( font );
QPalette palette;
palette.setColor( QPalette::Text, Qt::black );
if ( isExpression )
{
bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
if ( !isValid )
{
palette.setColor( QPalette::Text, Qt::red );
}
}
mCombo->lineEdit()->setPalette( palette );
emit fieldChanged( currentField() );
}
void QgsFieldExpressionWidget::editExpression()
@ -162,6 +141,28 @@ void QgsFieldExpressionWidget::expressionEdited( QString expression )
void QgsFieldExpressionWidget::indexChanged( int i )
{
Q_UNUSED( i );
QString name = currentField();
emit fieldChanged( name );
bool isExpression;
QString fieldName = currentField( &isExpression );
QFont font = mCombo->lineEdit()->font();
font.setItalic( isExpression );
mCombo->lineEdit()->setFont( font );
QPalette palette;
palette.setColor( QPalette::Text, Qt::black );
if ( isExpression )
{
QModelIndex idx = mFieldModel->indexFromName( fieldName );
if ( idx.isValid() )
{
bool isValid = mFieldModel->data( idx, QgsFieldModel::ExpressionValidityRole ).toBool();
if ( !isValid )
{
palette.setColor( QPalette::Text, Qt::red );
}
}
}
mCombo->lineEdit()->setPalette( palette );
emit fieldChanged( fieldName );
}

12
src/gui/qgsfieldmodel.cpp
View File

@ -13,6 +13,8 @@
* *
***************************************************************************/
#include <QFont>
#include "qgsfieldmodel.h"
#include "qgsmaplayermodel.h"
#include "qgsmaplayerproxymodel.h"
@ -51,7 +53,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )
{
if ( mLayer )
{
disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );
disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );
disconnect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );
}
@ -70,7 +72,7 @@ void QgsFieldModel::setLayer( QgsMapLayer *layer )
}
mLayer = vl;
connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateFields() ) );
connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) );
connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) );
updateModel();
}
@ -241,7 +243,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
return alias;
}
case Qt::BackgroundRole:
case Qt::ForegroundRole:
{
if ( exprIdx >= 0 )
{
@ -253,7 +255,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
exp.evaluate( &mFeature, mLayer->pendingFields() );
if ( exp.hasEvalError() )
{
return QBrush( QColor( 240, 60, 60, 180 ) );
return QBrush( QColor( Qt::red ) );
}
}
}
@ -265,7 +267,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
if ( exprIdx >= 0 )
{
// if the line is an expression, set it as italic
QFont font;
QFont font = QFont();
font.setItalic( true );
return font;
}