Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions EasyCustomLabeling/EasyCustomLabeling.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,16 @@ def runLabel(self):

#end of general tests and user interaction --------------------------------------------------
sourceLayerProvider = sourceLayer.dataProvider()
sourceLayerFields = sourceLayerProvider.fields()
if hasattr(sourceLayer, "fields"):
sourceLayerFields = sourceLayer.fields()
else:
sourceLayerFields = sourceLayer.pendingFields()

feat = QgsFeature()

#asks for default field to use as labeling (thanks to Victor Axbom Layer to labeled layer plugin)
# create the dialog
self.dlg = EasyCustomLabelingDialog(sourceLayerProvider)
self.dlg = EasyCustomLabelingDialog(sourceLayerFields)
ret_dlg_field = self.dlg.exec_()
#cancels if user cancels dialog:
if ret_dlg_field == 0 :
Expand Down
11 changes: 5 additions & 6 deletions EasyCustomLabeling/EasyCustomLabelingDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@

class EasyCustomLabelingDialog(QDialog, Ui_EasyCustomLabeling):

def __init__(self, ldp):
def __init__(self, layerFields):
QDialog.__init__(self)
# Set up the user interface from Designer.
self.setupUi(self)

self.loadFields(ldp)
self.loadFields(layerFields)

def loadFields(self, ldp):
fields = ldp.fieldNameMap()
for fieldname, index in fields.iteritems():
self.labelfield.addItem(fieldname)
def loadFields(self, layerFields):
for field in layerFields:
self.labelfield.addItem(field.name())