sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

QgsFieldModel::layer() returns QgsVectorLayer

Browse Source
This commit is contained in:
Denis Rouzaud 2014-04-29 08:41:52 +02:00
parent fe20f7bbfa
commit 41cc509cbb
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/qgsfieldmodel.sip
View File

@ -43,7 +43,7 @@ class QgsFieldModel : QAbstractItemModel
void removeExpression();
//! returns the currently used layer
QgsMapLayer* layer();
QgsVectorLayer* layer();
public slots:
//! set the layer of whch fields are displayed

7
src/gui/qgsfieldcombobox.cpp
View File

@ -33,12 +33,7 @@ void QgsFieldComboBox::setLayer( QgsMapLayer *layer )
QgsVectorLayer *QgsFieldComboBox::layer()
{
QgsMapLayer* layer = mFieldModel->layer();
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
if ( vl )
return vl;
else
return 0;
return mFieldModel->layer();
}
void QgsFieldComboBox::setField( QString fieldName )

7
src/gui/qgsfieldexpressionwidget.cpp
View File

@ -83,12 +83,7 @@ QString QgsFieldExpressionWidget::currentField( bool *isExpression )
QgsVectorLayer *QgsFieldExpressionWidget::layer()
{
QgsMapLayer* layer = mFieldModel->layer();
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
if ( vl )
return vl;
else
return 0;
return mFieldModel->layer();
}
void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )

2
src/gui/qgsfieldmodel.h
View File

@ -65,7 +65,7 @@ class GUI_EXPORT QgsFieldModel : public QAbstractItemModel
void removeExpression();
//! returns the currently used layer
QgsMapLayer* layer() {return mLayer;}
QgsVectorLayer* layer() {return mLayer;}
public slots:
//! set the layer of whch fields are displayed