[processing] put all qgis algs in single directory

qgis · Oct 3, 2014 · 1b85973 · 1b85973
1 parent 3ce7be5
commit 1b85973
Show file tree

Hide file tree

Showing 62 changed files with 57 additions and 72 deletions.
diff --git a/...lgs/qgis/ftools/BasicStatisticsNumbers.py → ...ssing/algs/qgis/BasicStatisticsNumbers.py b/...lgs/qgis/ftools/BasicStatisticsNumbers.py → ...ssing/algs/qgis/BasicStatisticsNumbers.py
diff --git a/...lgs/qgis/ftools/BasicStatisticsStrings.py → ...ssing/algs/qgis/BasicStatisticsStrings.py b/...lgs/qgis/ftools/BasicStatisticsStrings.py → ...ssing/algs/qgis/BasicStatisticsStrings.py
diff --git a/...ins/processing/algs/qgis/ftools/Buffer.py → ...on/plugins/processing/algs/qgis/Buffer.py b/...ins/processing/algs/qgis/ftools/Buffer.py → ...on/plugins/processing/algs/qgis/Buffer.py
diff --git a/python/plugins/processing/algs/qgis/CMakeLists.txt b/python/plugins/processing/algs/qgis/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB PY_FILES *.py)
 FILE(GLOB HELP_FILES help/*.rst)
 FILE(GLOB SCRIPT_FILES scripts/*.*)
 
-ADD_SUBDIRECTORY(mmqgisx)
-ADD_SUBDIRECTORY(ftools)
 ADD_SUBDIRECTORY(ui)
 
 PLUGIN_INSTALL(processing algs/qgis ${PY_FILES})

diff --git a/...processing/algs/qgis/ftools/copyright.txt → ...ugins/processing/algs/qgis/COPYING.fTools b/...processing/algs/qgis/ftools/copyright.txt → ...ugins/processing/algs/qgis/COPYING.fTools
diff --git a/...rocessing/algs/qgis/mmqgisx/copyright.txt → ...ugins/processing/algs/qgis/COPYING.mmqgis b/...rocessing/algs/qgis/mmqgisx/copyright.txt → ...ugins/processing/algs/qgis/COPYING.mmqgis
diff --git a/.../processing/algs/qgis/ftools/Centroids.py → ...plugins/processing/algs/qgis/Centroids.py b/.../processing/algs/qgis/ftools/Centroids.py → ...plugins/processing/algs/qgis/Centroids.py
diff --git a/...ugins/processing/algs/qgis/ftools/Clip.py → python/plugins/processing/algs/qgis/Clip.py b/...ugins/processing/algs/qgis/ftools/Clip.py → python/plugins/processing/algs/qgis/Clip.py
diff --git a/...processing/algs/qgis/ftools/ConvexHull.py → ...lugins/processing/algs/qgis/ConvexHull.py b/...processing/algs/qgis/ftools/ConvexHull.py → ...lugins/processing/algs/qgis/ConvexHull.py
diff --git a/...s/processing/algs/qgis/ftools/Delaunay.py → .../plugins/processing/algs/qgis/Delaunay.py b/...s/processing/algs/qgis/ftools/Delaunay.py → .../plugins/processing/algs/qgis/Delaunay.py
diff --git a/...cessing/algs/qgis/mmqgisx/DeleteColumn.py → ...gins/processing/algs/qgis/DeleteColumn.py b/...cessing/algs/qgis/mmqgisx/DeleteColumn.py → ...gins/processing/algs/qgis/DeleteColumn.py
diff --git a/...qgis/mmqgisx/DeleteDuplicateGeometries.py → ...ng/algs/qgis/DeleteDuplicateGeometries.py b/...qgis/mmqgisx/DeleteDuplicateGeometries.py → ...ng/algs/qgis/DeleteDuplicateGeometries.py
diff --git a/...ing/algs/qgis/ftools/DensifyGeometries.py → ...processing/algs/qgis/DensifyGeometries.py b/...ing/algs/qgis/ftools/DensifyGeometries.py → ...processing/algs/qgis/DensifyGeometries.py
diff --git a/.../qgis/ftools/DensifyGeometriesInterval.py → ...ng/algs/qgis/DensifyGeometriesInterval.py b/.../qgis/ftools/DensifyGeometriesInterval.py → ...ng/algs/qgis/DensifyGeometriesInterval.py
diff --git a/...processing/algs/qgis/ftools/Difference.py → ...lugins/processing/algs/qgis/Difference.py b/...processing/algs/qgis/ftools/Difference.py → ...lugins/processing/algs/qgis/Difference.py
diff --git a/...s/processing/algs/qgis/ftools/Dissolve.py → .../plugins/processing/algs/qgis/Dissolve.py b/...s/processing/algs/qgis/ftools/Dissolve.py → .../plugins/processing/algs/qgis/Dissolve.py
diff --git a/.../processing/algs/qgis/ftools/Eliminate.py → ...plugins/processing/algs/qgis/Eliminate.py b/.../processing/algs/qgis/ftools/Eliminate.py → ...plugins/processing/algs/qgis/Eliminate.py
diff --git a/...ng/algs/qgis/ftools/ExportGeometryInfo.py → ...rocessing/algs/qgis/ExportGeometryInfo.py b/...ng/algs/qgis/ftools/ExportGeometryInfo.py → ...rocessing/algs/qgis/ExportGeometryInfo.py
diff --git a/...ssing/algs/qgis/ftools/ExtentFromLayer.py → ...s/processing/algs/qgis/ExtentFromLayer.py b/...ssing/algs/qgis/ftools/ExtentFromLayer.py → ...s/processing/algs/qgis/ExtentFromLayer.py
diff --git a/...g/algs/qgis/mmqgisx/ExtractByAttribute.py → ...rocessing/algs/qgis/ExtractByAttribute.py b/...g/algs/qgis/mmqgisx/ExtractByAttribute.py → ...rocessing/algs/qgis/ExtractByAttribute.py
diff --git a/...ing/algs/qgis/ftools/ExtractByLocation.py → ...processing/algs/qgis/ExtractByLocation.py b/...ing/algs/qgis/ftools/ExtractByLocation.py → ...processing/algs/qgis/ExtractByLocation.py
diff --git a/...ocessing/algs/qgis/ftools/ExtractNodes.py → ...gins/processing/algs/qgis/ExtractNodes.py b/...ocessing/algs/qgis/ftools/ExtractNodes.py → ...gins/processing/algs/qgis/ExtractNodes.py
diff --git a/...g/algs/qgis/ftools/FixedDistanceBuffer.py → ...ocessing/algs/qgis/FixedDistanceBuffer.py b/...g/algs/qgis/ftools/FixedDistanceBuffer.py → ...ocessing/algs/qgis/FixedDistanceBuffer.py
diff --git a/...sing/algs/qgis/mmqgisx/GeometryConvert.py → ...s/processing/algs/qgis/GeometryConvert.py b/...sing/algs/qgis/mmqgisx/GeometryConvert.py → ...s/processing/algs/qgis/GeometryConvert.py
diff --git a/...gins/processing/algs/qgis/mmqgisx/Grid.py → python/plugins/processing/algs/qgis/Grid.py b/...gins/processing/algs/qgis/mmqgisx/Grid.py → python/plugins/processing/algs/qgis/Grid.py
diff --git a/...s/processing/algs/qgis/mmqgisx/Gridify.py → ...n/plugins/processing/algs/qgis/Gridify.py b/...s/processing/algs/qgis/mmqgisx/Gridify.py → ...n/plugins/processing/algs/qgis/Gridify.py
diff --git a/...ocessing/algs/qgis/mmqgisx/HubDistance.py → ...ugins/processing/algs/qgis/HubDistance.py b/...ocessing/algs/qgis/mmqgisx/HubDistance.py → ...ugins/processing/algs/qgis/HubDistance.py
diff --git a/.../processing/algs/qgis/mmqgisx/HubLines.py → .../plugins/processing/algs/qgis/HubLines.py b/.../processing/algs/qgis/mmqgisx/HubLines.py → .../plugins/processing/algs/qgis/HubLines.py
diff --git a/...ocessing/algs/qgis/ftools/Intersection.py → ...gins/processing/algs/qgis/Intersection.py b/...ocessing/algs/qgis/ftools/Intersection.py → ...gins/processing/algs/qgis/Intersection.py
diff --git a/...ing/algs/qgis/ftools/LinesIntersection.py → ...processing/algs/qgis/LinesIntersection.py b/...ing/algs/qgis/ftools/LinesIntersection.py → ...processing/algs/qgis/LinesIntersection.py
diff --git a/...ssing/algs/qgis/ftools/LinesToPolygons.py → ...s/processing/algs/qgis/LinesToPolygons.py b/...ssing/algs/qgis/ftools/LinesToPolygons.py → ...s/processing/algs/qgis/LinesToPolygons.py
diff --git a/...processing/algs/qgis/ftools/MeanCoords.py → ...lugins/processing/algs/qgis/MeanCoords.py b/...processing/algs/qgis/ftools/MeanCoords.py → ...lugins/processing/algs/qgis/MeanCoords.py
diff --git a/...ins/processing/algs/qgis/mmqgisx/Merge.py → python/plugins/processing/algs/qgis/Merge.py b/...ins/processing/algs/qgis/mmqgisx/Merge.py → python/plugins/processing/algs/qgis/Merge.py
diff --git a/...lgs/qgis/ftools/MultipartToSingleparts.py → ...ssing/algs/qgis/MultipartToSingleparts.py b/...lgs/qgis/ftools/MultipartToSingleparts.py → ...ssing/algs/qgis/MultipartToSingleparts.py
diff --git a/...s/qgis/ftools/NearestNeighbourAnalysis.py → ...ing/algs/qgis/NearestNeighbourAnalysis.py b/...s/qgis/ftools/NearestNeighbourAnalysis.py → ...ing/algs/qgis/NearestNeighbourAnalysis.py
diff --git a/...cessing/algs/qgis/ftools/PointDistance.py → ...ins/processing/algs/qgis/PointDistance.py b/...cessing/algs/qgis/ftools/PointDistance.py → ...ins/processing/algs/qgis/PointDistance.py
diff --git a/...ssing/algs/qgis/ftools/PointsInPolygon.py → ...s/processing/algs/qgis/PointsInPolygon.py b/...ssing/algs/qgis/ftools/PointsInPolygon.py → ...s/processing/algs/qgis/PointsInPolygon.py
diff --git a/...algs/qgis/ftools/PointsInPolygonUnique.py → ...essing/algs/qgis/PointsInPolygonUnique.py b/...algs/qgis/ftools/PointsInPolygonUnique.py → ...essing/algs/qgis/PointsInPolygonUnique.py
diff --git a/...gs/qgis/ftools/PointsInPolygonWeighted.py → ...sing/algs/qgis/PointsInPolygonWeighted.py b/...gs/qgis/ftools/PointsInPolygonWeighted.py → ...sing/algs/qgis/PointsInPolygonWeighted.py
diff --git a/...ssing/algs/qgis/ftools/PolygonsToLines.py → ...s/processing/algs/qgis/PolygonsToLines.py b/...ssing/algs/qgis/ftools/PolygonsToLines.py → ...s/processing/algs/qgis/PolygonsToLines.py
diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -29,62 +29,61 @@
 __revision__ = '$Format:%H$'
 
 from PyQt4.QtGui import *
-from ftools.RandomExtract import RandomExtract
-from ftools.RandomExtractWithinSubsets import RandomExtractWithinSubsets
-from ftools.ExtractByLocation import ExtractByLocation
 
 from processing.core.AlgorithmProvider import AlgorithmProvider
-from ftools.PointsInPolygon import PointsInPolygon
-from ftools.PointsInPolygonUnique import PointsInPolygonUnique
-from ftools.PointsInPolygonWeighted import PointsInPolygonWeighted
-from ftools.SumLines import SumLines
-from ftools.BasicStatisticsNumbers import BasicStatisticsNumbers
-from ftools.BasicStatisticsStrings import BasicStatisticsStrings
-from ftools.NearestNeighbourAnalysis import NearestNeighbourAnalysis
-from ftools.LinesIntersection import LinesIntersection
-from ftools.MeanCoords import MeanCoords
-from ftools.PointDistance import PointDistance
-from ftools.UniqueValues import UniqueValues
-from ftools.ReprojectLayer import ReprojectLayer
-from ftools.ExportGeometryInfo import ExportGeometryInfo
-from ftools.Centroids import Centroids
-from ftools.Delaunay import Delaunay
-from ftools.VoronoiPolygons import VoronoiPolygons
-from ftools.DensifyGeometries import DensifyGeometries
-from ftools.MultipartToSingleparts import MultipartToSingleparts
-from ftools.SimplifyGeometries import SimplifyGeometries
-from ftools.LinesToPolygons import LinesToPolygons
-from ftools.PolygonsToLines import PolygonsToLines
-from ftools.SinglePartsToMultiparts import SinglePartsToMultiparts
-from ftools.ExtractNodes import ExtractNodes
-from ftools.ConvexHull import ConvexHull
-from ftools.FixedDistanceBuffer import FixedDistanceBuffer
-from ftools.VariableDistanceBuffer import VariableDistanceBuffer
-from ftools.Clip import Clip
-from ftools.Difference import Difference
-from ftools.Dissolve import Dissolve
-from ftools.Intersection import Intersection
-from ftools.ExtentFromLayer import ExtentFromLayer
-from ftools.RandomSelection import RandomSelection
-from ftools.RandomSelectionWithinSubsets import RandomSelectionWithinSubsets
-from ftools.SelectByLocation import SelectByLocation
-from ftools.Union import Union
-from ftools.DensifyGeometriesInterval import DensifyGeometriesInterval
-from ftools.Eliminate import Eliminate
-from ftools.SpatialJoin import SpatialJoin
-
-from mmqgisx.DeleteColumn import DeleteColumn
-from mmqgisx.DeleteDuplicateGeometries import DeleteDuplicateGeometries
-from mmqgisx.TextToFloat import TextToFloat
-from mmqgisx.ExtractByAttribute import ExtractByAttribute
-from mmqgisx.SelectByAttribute import SelectByAttribute
-from mmqgisx.Grid import Grid
-from mmqgisx.Gridify import Gridify
-from mmqgisx.HubDistance import HubDistance
-from mmqgisx.HubLines import HubLines
-from mmqgisx.Merge import Merge
-from mmqgisx.GeometryConvert import GeometryConvert
 
+from RandomExtract import RandomExtract
+from RandomExtractWithinSubsets import RandomExtractWithinSubsets
+from ExtractByLocation import ExtractByLocation
+from PointsInPolygon import PointsInPolygon
+from PointsInPolygonUnique import PointsInPolygonUnique
+from PointsInPolygonWeighted import PointsInPolygonWeighted
+from SumLines import SumLines
+from BasicStatisticsNumbers import BasicStatisticsNumbers
+from BasicStatisticsStrings import BasicStatisticsStrings
+from NearestNeighbourAnalysis import NearestNeighbourAnalysis
+from LinesIntersection import LinesIntersection
+from MeanCoords import MeanCoords
+from PointDistance import PointDistance
+from UniqueValues import UniqueValues
+from ReprojectLayer import ReprojectLayer
+from ExportGeometryInfo import ExportGeometryInfo
+from Centroids import Centroids
+from Delaunay import Delaunay
+from VoronoiPolygons import VoronoiPolygons
+from DensifyGeometries import DensifyGeometries
+from MultipartToSingleparts import MultipartToSingleparts
+from SimplifyGeometries import SimplifyGeometries
+from LinesToPolygons import LinesToPolygons
+from PolygonsToLines import PolygonsToLines
+from SinglePartsToMultiparts import SinglePartsToMultiparts
+from ExtractNodes import ExtractNodes
+from ConvexHull import ConvexHull
+from FixedDistanceBuffer import FixedDistanceBuffer
+from VariableDistanceBuffer import VariableDistanceBuffer
+from Clip import Clip
+from Difference import Difference
+from Dissolve import Dissolve
+from Intersection import Intersection
+from ExtentFromLayer import ExtentFromLayer
+from RandomSelection import RandomSelection
+from RandomSelectionWithinSubsets import RandomSelectionWithinSubsets
+from SelectByLocation import SelectByLocation
+from Union import Union
+from DensifyGeometriesInterval import DensifyGeometriesInterval
+from Eliminate import Eliminate
+from SpatialJoin import SpatialJoin
+from DeleteColumn import DeleteColumn
+from DeleteDuplicateGeometries import DeleteDuplicateGeometries
+from TextToFloat import TextToFloat
+from ExtractByAttribute import ExtractByAttribute
+from SelectByAttribute import SelectByAttribute
+from Grid import Grid
+from Gridify import Gridify
+from HubDistance import HubDistance
+from HubLines import HubLines
+from Merge import Merge
+from GeometryConvert import GeometryConvert
 from ConcaveHull import ConcaveHull
 from Polygonize import Polygonize
 from RasterLayerStatistics import RasterLayerStatistics
@@ -146,14 +145,11 @@ def __init__(self):
                         RandomSelection(), RandomSelectionWithinSubsets(),
                         SelectByLocation(), RandomExtract(),
                         RandomExtractWithinSubsets(), ExtractByLocation(),
-                        SpatialJoin(),
-                        # ------ mmqgisx ------
-                        DeleteColumn(), DeleteDuplicateGeometries(),
-                        TextToFloat(), ExtractByAttribute(),
-                        SelectByAttribute(), Grid(), Gridify(), HubDistance(),
-                        HubLines(), Merge(), GeometryConvert(),
-                        # ------ native algs ------
-                        AddTableField(), FieldsCalculator(),
+                        SpatialJoin(), DeleteColumn(),
+                        DeleteDuplicateGeometries(), TextToFloat(),
+                        ExtractByAttribute(), SelectByAttribute(), Grid(),
+                        Gridify(), HubDistance(), HubLines(), Merge(),
+                        GeometryConvert(), AddTableField(), FieldsCalculator(),
                         SaveSelectedFeatures(), JoinAttributes(),
                         AutoincrementalField(), Explode(), FieldsPyculator(),
                         EquivalentNumField(), PointsLayerFromTable(),

diff --git a/...cessing/algs/qgis/ftools/RandomExtract.py → ...ins/processing/algs/qgis/RandomExtract.py b/...cessing/algs/qgis/ftools/RandomExtract.py → ...ins/processing/algs/qgis/RandomExtract.py
diff --git a/...qgis/ftools/RandomExtractWithinSubsets.py → ...g/algs/qgis/RandomExtractWithinSubsets.py b/...qgis/ftools/RandomExtractWithinSubsets.py → ...g/algs/qgis/RandomExtractWithinSubsets.py
diff --git a/...ssing/algs/qgis/ftools/RandomSelection.py → ...s/processing/algs/qgis/RandomSelection.py b/...ssing/algs/qgis/ftools/RandomSelection.py → ...s/processing/algs/qgis/RandomSelection.py
diff --git a/...is/ftools/RandomSelectionWithinSubsets.py → ...algs/qgis/RandomSelectionWithinSubsets.py b/...is/ftools/RandomSelectionWithinSubsets.py → ...algs/qgis/RandomSelectionWithinSubsets.py
diff --git a/...essing/algs/qgis/ftools/ReprojectLayer.py → ...ns/processing/algs/qgis/ReprojectLayer.py b/...essing/algs/qgis/ftools/ReprojectLayer.py → ...ns/processing/algs/qgis/ReprojectLayer.py
diff --git a/...ng/algs/qgis/mmqgisx/SelectByAttribute.py → ...processing/algs/qgis/SelectByAttribute.py b/...ng/algs/qgis/mmqgisx/SelectByAttribute.py → ...processing/algs/qgis/SelectByAttribute.py
diff --git a/...sing/algs/qgis/ftools/SelectByLocation.py → .../processing/algs/qgis/SelectByLocation.py b/...sing/algs/qgis/ftools/SelectByLocation.py → .../processing/algs/qgis/SelectByLocation.py
diff --git a/...ng/algs/qgis/ftools/SimplifyGeometries.py → ...rocessing/algs/qgis/SimplifyGeometries.py b/...ng/algs/qgis/ftools/SimplifyGeometries.py → ...rocessing/algs/qgis/SimplifyGeometries.py
diff --git a/...gs/qgis/ftools/SinglePartsToMultiparts.py → ...sing/algs/qgis/SinglePartsToMultiparts.py b/...gs/qgis/ftools/SinglePartsToMultiparts.py → ...sing/algs/qgis/SinglePartsToMultiparts.py
diff --git a/...rocessing/algs/qgis/ftools/SpatialJoin.py → ...ugins/processing/algs/qgis/SpatialJoin.py b/...rocessing/algs/qgis/ftools/SpatialJoin.py → ...ugins/processing/algs/qgis/SpatialJoin.py
diff --git a/...s/processing/algs/qgis/ftools/SumLines.py → .../plugins/processing/algs/qgis/SumLines.py b/...s/processing/algs/qgis/ftools/SumLines.py → .../plugins/processing/algs/qgis/SumLines.py
diff --git a/...ocessing/algs/qgis/mmqgisx/TextToFloat.py → ...ugins/processing/algs/qgis/TextToFloat.py b/...ocessing/algs/qgis/mmqgisx/TextToFloat.py → ...ugins/processing/algs/qgis/TextToFloat.py
diff --git a/...gins/processing/algs/qgis/ftools/Union.py → python/plugins/processing/algs/qgis/Union.py b/...gins/processing/algs/qgis/ftools/Union.py → python/plugins/processing/algs/qgis/Union.py
diff --git a/...ocessing/algs/qgis/ftools/UniqueValues.py → ...gins/processing/algs/qgis/UniqueValues.py b/...ocessing/algs/qgis/ftools/UniqueValues.py → ...gins/processing/algs/qgis/UniqueValues.py
diff --git a/...lgs/qgis/ftools/VariableDistanceBuffer.py → ...ssing/algs/qgis/VariableDistanceBuffer.py b/...lgs/qgis/ftools/VariableDistanceBuffer.py → ...ssing/algs/qgis/VariableDistanceBuffer.py
diff --git a/...ssing/algs/qgis/ftools/VoronoiPolygons.py → ...s/processing/algs/qgis/VoronoiPolygons.py b/...ssing/algs/qgis/ftools/VoronoiPolygons.py → ...s/processing/algs/qgis/VoronoiPolygons.py
diff --git a/python/plugins/processing/algs/qgis/ftools/CMakeLists.txt b/python/plugins/processing/algs/qgis/ftools/CMakeLists.txt
diff --git a/python/plugins/processing/algs/qgis/ftools/__init__.py b/python/plugins/processing/algs/qgis/ftools/__init__.py
diff --git a/python/plugins/processing/algs/qgis/mmqgisx/CMakeLists.txt b/python/plugins/processing/algs/qgis/mmqgisx/CMakeLists.txt
diff --git a/python/plugins/processing/algs/qgis/mmqgisx/__init__.py b/python/plugins/processing/algs/qgis/mmqgisx/__init__.py
diff --git a/...ns/processing/algs/qgis/ftools/voronoi.py → ...n/plugins/processing/algs/qgis/voronoi.py b/...ns/processing/algs/qgis/ftools/voronoi.py → ...n/plugins/processing/algs/qgis/voronoi.py