Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move ftools utils to tools utils module
  • Loading branch information
volaya committed Sep 14, 2013
1 parent c02c28b commit 6d506d6
Show file tree
Hide file tree
Showing 26 changed files with 172 additions and 285 deletions.
Expand Up @@ -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):

Expand All @@ -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")
Expand Down
Expand Up @@ -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):

Expand Down
11 changes: 3 additions & 8 deletions python/plugins/processing/algs/ftools/Clip.py
Expand Up @@ -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):

Expand Down Expand Up @@ -69,7 +64,7 @@ def processAlgorithm(self, progress):
inFeatB = QgsFeature()
outFeat = QgsFeature()

index = utils.createSpatialIndex(layerB)
index = utils.spatialindex(layerB)

selectionA = QGisLayers.features(layerA)

Expand Down Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions python/plugins/processing/algs/ftools/ConvexHull.py
Expand Up @@ -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):

Expand Down
9 changes: 2 additions & 7 deletions python/plugins/processing/algs/ftools/Difference.py
Expand Up @@ -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):

Expand Down Expand Up @@ -69,7 +64,7 @@ def processAlgorithm(self, progress):
inFeatB = QgsFeature()
outFeat = QgsFeature()

index = utils.createSpatialIndex(layerB)
index = utils.spatialindex(layerB)

selectionA = QGisLayers.features(layerA)

Expand Down
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/ftools/Dissolve.py
Expand Up @@ -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):

Expand Down
7 changes: 1 addition & 6 deletions python/plugins/processing/algs/ftools/ExportGeometryInfo.py
Expand Up @@ -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):

Expand Down
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/ftools/ExtractNodes.py
Expand Up @@ -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):

Expand Down
160 changes: 0 additions & 160 deletions python/plugins/processing/algs/ftools/FToolsUtils.py

This file was deleted.

7 changes: 3 additions & 4 deletions python/plugins/processing/algs/ftools/Intersection.py
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
__copyright__ = '(C) 2012, Victor Olaya'
Expand All @@ -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):

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/ftools/LinesIntersection.py
Expand Up @@ -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):

Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 6d506d6

Please sign in to comment.