From dfcc09f12d2d560696c55f16090c75e8c1a8791c Mon Sep 17 00:00:00 2001 From: jef Date: Sun, 16 May 2010 11:19:13 +0000 Subject: [PATCH] fix ftools typo git-svn-id: http://svn.osgeo.org/qgis/trunk@13498 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/fTools/tools/doGeoprocessing.py | 6 +++--- python/plugins/fTools/tools/doJoinAttributes.py | 2 +- python/plugins/fTools/tools/doSpatialJoin.py | 2 +- python/plugins/fTools/tools/ftools_utils.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py index 87c25006ba9..40388b6328f 100755 --- a/python/plugins/fTools/tools/doGeoprocessing.py +++ b/python/plugins/fTools/tools/doGeoprocessing.py @@ -846,7 +846,7 @@ class geoprocessingThread( QThread ): 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 @@ class geoprocessingThread( QThread ): 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 @@ class geoprocessingThread( QThread ): 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 diff --git a/python/plugins/fTools/tools/doJoinAttributes.py b/python/plugins/fTools/tools/doJoinAttributes.py index a56e34fc105..1b9acb58b30 100755 --- a/python/plugins/fTools/tools/doJoinAttributes.py +++ b/python/plugins/fTools/tools/doJoinAttributes.py @@ -179,7 +179,7 @@ class Dialog(QDialog, Ui_Dialog): 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' ) diff --git a/python/plugins/fTools/tools/doSpatialJoin.py b/python/plugins/fTools/tools/doSpatialJoin.py index 7ab462ea9d2..0845ac840c0 100755 --- a/python/plugins/fTools/tools/doSpatialJoin.py +++ b/python/plugins/fTools/tools/doSpatialJoin.py @@ -143,7 +143,7 @@ class Dialog(QDialog, Ui_Dialog): 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' ) diff --git a/python/plugins/fTools/tools/ftools_utils.py b/python/plugins/fTools/tools/ftools_utils.py index a536cfbaa1d..45d7672b483 100755 --- a/python/plugins/fTools/tools/ftools_utils.py +++ b/python/plugins/fTools/tools/ftools_utils.py @@ -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: