move ftools utils to tools utils module

Author: volaya

python/plugins/processing/algs/ftools/BasicStatisticsNumbers.py

@@ -26,19 +26,14 @@
 import math
 
 from PyQt4.QtCore import *
-
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
-
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterTableField import ParameterTableField
-
 from processing.outputs.OutputHTML import OutputHTML
 from processing.outputs.OutputNumber import OutputNumber
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class BasicStatisticsNumbers(GeoAlgorithm):
 
@@ -57,7 +52,6 @@ class BasicStatisticsNumbers(GeoAlgorithm):
     MEDIAN = "MEDIAN"
     UNIQUE = "UNIQUE"
 
-
     #===========================================================================
     # def getIcon(self):
     #    return QtGui.QIcon(os.path.dirname(__file__) + "/icons/basic_statistics.png")

python/plugins/processing/algs/ftools/BasicStatisticsStrings.py

@@ -26,20 +26,14 @@
 import codecs
 
 from PyQt4.QtCore import *
-
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
-
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterTableField import ParameterTableField
-from processing.parameters.ParameterBoolean import ParameterBoolean
-
 from processing.outputs.OutputHTML import OutputHTML
 from processing.outputs.OutputNumber import OutputNumber
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class BasicStatisticsStrings(GeoAlgorithm):
 

python/plugins/processing/algs/ftools/Clip.py

@@ -24,18 +24,13 @@
 __revision__ = '$Format:%H$'
 
 from PyQt4.QtCore import *
-
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
 from processing.core.ProcessingLog import ProcessingLog
-
 from processing.parameters.ParameterVector import ParameterVector
-
 from processing.outputs.OutputVector import OutputVector
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class Clip(GeoAlgorithm):
 
@@ -69,7 +64,7 @@ def processAlgorithm(self, progress):
         inFeatB = QgsFeature()
         outFeat = QgsFeature()
 
-        index = utils.createSpatialIndex(layerB)
+        index = utils.spatialindex(layerB)
 
         selectionA = QGisLayers.features(layerA)
 
@@ -113,7 +108,7 @@ def processAlgorithm(self, progress):
                             outFeat.setAttributes(attrs)
                             writer.addFeature(outFeat)
                         except:
-                            FEAT_EXCEPT = False
+                            FEATURE_EXCEPT = False
                             continue
                     except:
                         GEOS_EXCEPT = False

python/plugins/processing/algs/ftools/ConvexHull.py

@@ -26,20 +26,14 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
-from processing.core.ProcessingLog import ProcessingLog
-
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterTableField import ParameterTableField
 from processing.parameters.ParameterSelection import ParameterSelection
-
 from processing.outputs.OutputVector import OutputVector
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class ConvexHull(GeoAlgorithm):
 

python/plugins/processing/algs/ftools/Difference.py

@@ -23,18 +23,13 @@
 __revision__ = '$Format:%H$'
 
 from PyQt4.QtCore import *
-
 from qgis.core import *
-
 from processing.core.QGisLayers import QGisLayers
 from processing.core.ProcessingLog import ProcessingLog
 from processing.core.GeoAlgorithm import GeoAlgorithm
-
 from processing.parameters.ParameterVector import ParameterVector
-
 from processing.outputs.OutputVector import OutputVector
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class Difference(GeoAlgorithm):
 
@@ -69,7 +64,7 @@ def processAlgorithm(self, progress):
         inFeatB = QgsFeature()
         outFeat = QgsFeature()
 
-        index = utils.createSpatialIndex(layerB)
+        index = utils.spatialindex(layerB)
 
         selectionA = QGisLayers.features(layerA)
 

python/plugins/processing/algs/ftools/Dissolve.py

@@ -28,13 +28,12 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from qgis.core import *
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 from processing.parameters.ParameterVector import ParameterVector
 from processing.core.QGisLayers import QGisLayers
 from processing.outputs.OutputVector import OutputVector
 from processing.parameters.ParameterBoolean import ParameterBoolean
 from processing.parameters.ParameterTableField import ParameterTableField
-from processing.core.ProcessingLog import ProcessingLog
 
 class Dissolve(GeoAlgorithm):
 

python/plugins/processing/algs/ftools/ExportGeometryInfo.py

@@ -24,18 +24,13 @@
 __revision__ = '$Format:%H$'
 
 from PyQt4.QtCore import *
-
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
-
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterSelection import ParameterSelection
-
 from processing.outputs.OutputVector import OutputVector
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class ExportGeometryInfo(GeoAlgorithm):
 

python/plugins/processing/algs/ftools/ExtractNodes.py

@@ -25,13 +25,11 @@
 
 from PyQt4.QtCore import *
 from qgis.core import *
-
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.QGisLayers import QGisLayers
 from processing.parameters.ParameterVector import ParameterVector
 from processing.outputs.OutputVector import OutputVector
-
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class ExtractNodes(GeoAlgorithm):
 

python/plugins/processing/algs/ftools/FToolsUtils.py

@@ -16,7 +16,7 @@
 *                                                                         *
 ***************************************************************************
 """
-from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
+
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
 __copyright__ = '(C) 2012, Victor Olaya'
@@ -30,8 +30,7 @@
 from processing.parameters.ParameterVector import ParameterVector
 from processing.core.QGisLayers import QGisLayers
 from processing.outputs.OutputVector import OutputVector
-from processing.algs.ftools import FToolsUtils as utils
-from processing.core.ProcessingLog import ProcessingLog
+from processing.tools import vector as utils
 
 class Intersection(GeoAlgorithm):
 
@@ -54,7 +53,7 @@ def processAlgorithm(self, progress):
         inFeatA = QgsFeature()
         inFeatB = QgsFeature()
         outFeat = QgsFeature()
-        index = utils.createSpatialIndex(vlayerB)
+        index = utils.spatialindex(vlayerB)
         nElement = 0
         selectionA = QGisLayers.features(vlayerA)
         nFeat = len(selectionA)

python/plugins/processing/algs/ftools/Intersection.py

@@ -30,7 +30,7 @@
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterTableField import ParameterTableField
 from processing.outputs.OutputVector import OutputVector
-from processing.algs.ftools import FToolsUtils as utils
+from processing.tools import vector as utils
 
 class LinesIntersection(GeoAlgorithm):
 
@@ -73,7 +73,7 @@ def processAlgorithm(self, progress):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
                      QGis.WKBPoint, layerA.dataProvider().crs())
 
-        spatialIndex = utils.createSpatialIndex(layerB)
+        spatialIndex = utils.spatialindex(layerB)
 
         inFeatA = QgsFeature()
         inFeatB = QgsFeature()