Skip to content

Commit a148dcc

Browse files
author
rblazek
committed
fixed ticket 45 - new field does not appear in vector label properties dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@5686 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d24fadd commit a148dcc

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

src/gui/qgslabel.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,11 @@ void QgsLabel::addRequiredFields ( std::list<int> *fields )
418418
}
419419
}
420420

421+
void QgsLabel::setFields( std::vector<QgsField> const & fields )
422+
{
423+
mField = fields;
424+
}
425+
421426
std::vector<QgsField> & QgsLabel::fields ( void )
422427
{
423428
return mField;

src/gui/qgslabel.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ class QgsLabel
8989
//! add vector of required fields to existing list of fields
9090
void addRequiredFields ( std::list<int> *fields );
9191

92+
//! Set available fields
93+
void setFields( std::vector<QgsField> const & fields );
94+
9295
//! Available vector fields
9396
std::vector<QgsField> & fields ( void );
9497

src/gui/qgsvectorlayerproperties.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qgsattributeactiondialog.h"
2222
#include "qgscontinuouscolordialog.h"
2323
#include "qgsgraduatedsymboldialog.h"
24+
#include "qgslabel.h"
2425
#include "qgslabeldialog.h"
2526
#include "qgslayerprojectionselector.h"
2627
#include "qgssinglesymboldialog.h"
@@ -208,6 +209,8 @@ void QgsVectorLayerProperties::reset( void )
208209

209210
QObject::connect(legendtypecombobox, SIGNAL(activated(const QString &)), this, SLOT(alterLayerDialog(const QString &)));
210211

212+
// reset fields in label dialog
213+
layer->label()->setFields ( layer->fields() );
211214

212215
//set the metadata contents
213216
teMetadata->setText(getMetadata());

0 commit comments

Comments
 (0)