[QGIS Commit] r13498 - trunk/qgis/python/plugins/fTools/tools

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-16 07:19:13 -0400 (Sun, 16 May 2010)
New Revision: 13498

Modified:
   trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
   trunk/qgis/python/plugins/fTools/tools/doJoinAttributes.py
   trunk/qgis/python/plugins/fTools/tools/doSpatialJoin.py
   trunk/qgis/python/plugins/fTools/tools/ftools_utils.py
Log:
fix ftools typo

Modified: trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2010-05-15 22:44:58 UTC (rev 13497)
+++ trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2010-05-16 11:19:13 UTC (rev 13498)
@@ -846,7 +846,7 @@
     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 @@
     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 @@
     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

Modified: trunk/qgis/python/plugins/fTools/tools/doJoinAttributes.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doJoinAttributes.py	2010-05-15 22:44:58 UTC (rev 13497)
+++ trunk/qgis/python/plugins/fTools/tools/doJoinAttributes.py	2010-05-16 11:19:13 UTC (rev 13498)
@@ -179,7 +179,7 @@
     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' )

Modified: trunk/qgis/python/plugins/fTools/tools/doSpatialJoin.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doSpatialJoin.py	2010-05-15 22:44:58 UTC (rev 13497)
+++ trunk/qgis/python/plugins/fTools/tools/doSpatialJoin.py	2010-05-16 11:19:13 UTC (rev 13498)
@@ -143,7 +143,7 @@
             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' )

Modified: trunk/qgis/python/plugins/fTools/tools/ftools_utils.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/ftools_utils.py	2010-05-15 22:44:58 UTC (rev 13497)
+++ trunk/qgis/python/plugins/fTools/tools/ftools_utils.py	2010-05-16 11:19:13 UTC (rev 13498)
@@ -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 @@
     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: