Skip to content
Permalink
Browse files
fix ftools typo
git-svn-id: http://svn.osgeo.org/qgis/trunk@13498 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 16, 2010
1 parent 8cd75d3 commit dfcc09f12d2d560696c55f16090c75e8c1a8791c
@@ -846,7 +846,7 @@ def intersect( self ):
vproviderB.select( allAttrsB )
crs_match = vproviderA.crs() == vproviderB.crs()
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLenght( fields )
longNames = ftools_utils.checkFieldNameLength( fields )
if not longNames.isEmpty():
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1009,7 +1009,7 @@ def union( self ):
if vproviderA.crs() == vproviderB.crs(): crs_match = True
else: crs_match = False
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLenght( fields )
longNames = ftools_utils.checkFieldNameLength( fields )
if not longNames.isEmpty():
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1138,7 +1138,7 @@ def symetrical_difference( self ):
if vproviderA.crs() == vproviderB.crs(): crs_match = True
else: crs_match = False
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLenght( fields )
longNames = ftools_utils.checkFieldNameLength( fields )
if not longNames.isEmpty():
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -179,7 +179,7 @@ def compute(self, inName, inField, joinName, joinField, outName, keep, useTable,
fieldList1.extend(fieldList2)
fieldList1 = dict(zip(seq, fieldList1))
# check for correct field names
longNames = ftools_utils.checkFieldNameLenght( fieldList1 )
longNames = ftools_utils.checkFieldNameLength( fieldList1 )
if not longNames.isEmpty():
QMessageBox.warning( self, self.tr( 'Incorrect field names' ),
self.tr( 'No output will be created.\nFollowing field names are longer than 10 characters:\n%1' )
@@ -143,7 +143,7 @@ def compute(self, inName, joinName, outName, summary, sumList, keep, progressBar
fieldList1 = dict(zip(seq, fieldList1))

# check for correct field names
longNames = ftools_utils.checkFieldNameLenght( fieldList1 )
longNames = ftools_utils.checkFieldNameLength( fieldList1 )
if not longNames.isEmpty():
QMessageBox.warning( self, self.tr( 'Incorrect field names' ),
self.tr( 'No output will be created.\nFollowing field names are longer than 10 characters:\n%1' )
@@ -12,7 +12,7 @@
# extractPoints( QgsGeometry )
# testForUniqueness( QList *QgsField, QList *QgsField )
# createUniqueFieldName( QgsField.name() )
# checkFieldNameLenght( QgsFieldMap )
# checkFieldNameLength( QgsFieldMap )
# getLayerNames( QGis.vectorType() )
# getFieldNames( QgsVectorLayer )
# getVectorLayerByName( QgsVectorLayer.name() )
@@ -161,7 +161,7 @@ def createUniqueFieldName( field ):
return field

# Return list of field names with more than 10 characters length
def checkFieldNameLenght( fieldList ):
def checkFieldNameLength( fieldList ):
longNames = QStringList()
for num, field in fieldList.iteritems():
if field.name().size() > 10:

0 comments on commit dfcc09f

Please sign in to comment.