Skip to content

Commit 3f8f3c0

Browse files
author
jef
committed
fix ftools typo
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13498 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c30dbba commit 3f8f3c0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

python/plugins/fTools/tools/doGeoprocessing.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ def intersect( self ):
846846
vproviderB.select( allAttrsB )
847847
crs_match = vproviderA.crs() == vproviderB.crs()
848848
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
849-
longNames = ftools_utils.checkFieldNameLenght( fields )
849+
longNames = ftools_utils.checkFieldNameLength( fields )
850850
if not longNames.isEmpty():
851851
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
852852
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1009,7 +1009,7 @@ def union( self ):
10091009
if vproviderA.crs() == vproviderB.crs(): crs_match = True
10101010
else: crs_match = False
10111011
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
1012-
longNames = ftools_utils.checkFieldNameLenght( fields )
1012+
longNames = ftools_utils.checkFieldNameLength( fields )
10131013
if not longNames.isEmpty():
10141014
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
10151015
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1138,7 +1138,7 @@ def symetrical_difference( self ):
11381138
if vproviderA.crs() == vproviderB.crs(): crs_match = True
11391139
else: crs_match = False
11401140
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
1141-
longNames = ftools_utils.checkFieldNameLenght( fields )
1141+
longNames = ftools_utils.checkFieldNameLength( fields )
11421142
if not longNames.isEmpty():
11431143
message = QString( 'Following field names are longer than 10 characters:\n%1' ).arg( longNames.join( '\n' ) )
11441144
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message

python/plugins/fTools/tools/doJoinAttributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def compute(self, inName, inField, joinName, joinField, outName, keep, useTable,
179179
fieldList1.extend(fieldList2)
180180
fieldList1 = dict(zip(seq, fieldList1))
181181
# check for correct field names
182-
longNames = ftools_utils.checkFieldNameLenght( fieldList1 )
182+
longNames = ftools_utils.checkFieldNameLength( fieldList1 )
183183
if not longNames.isEmpty():
184184
QMessageBox.warning( self, self.tr( 'Incorrect field names' ),
185185
self.tr( 'No output will be created.\nFollowing field names are longer than 10 characters:\n%1' )

python/plugins/fTools/tools/doSpatialJoin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def compute(self, inName, joinName, outName, summary, sumList, keep, progressBar
143143
fieldList1 = dict(zip(seq, fieldList1))
144144

145145
# check for correct field names
146-
longNames = ftools_utils.checkFieldNameLenght( fieldList1 )
146+
longNames = ftools_utils.checkFieldNameLength( fieldList1 )
147147
if not longNames.isEmpty():
148148
QMessageBox.warning( self, self.tr( 'Incorrect field names' ),
149149
self.tr( 'No output will be created.\nFollowing field names are longer than 10 characters:\n%1' )

python/plugins/fTools/tools/ftools_utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# extractPoints( QgsGeometry )
1313
# testForUniqueness( QList *QgsField, QList *QgsField )
1414
# createUniqueFieldName( QgsField.name() )
15-
# checkFieldNameLenght( QgsFieldMap )
15+
# checkFieldNameLength( QgsFieldMap )
1616
# getLayerNames( QGis.vectorType() )
1717
# getFieldNames( QgsVectorLayer )
1818
# getVectorLayerByName( QgsVectorLayer.name() )
@@ -161,7 +161,7 @@ def createUniqueFieldName( field ):
161161
return field
162162

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

0 commit comments

Comments
 (0)