Skip to content

Commit 91ea88f

Browse files
alexbruyalexbruy
committedSep 13, 2013
fix rebase conflicts
·
ltr-3_40archive/master_2
1 parent f17e2c0 commit 91ea88f

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed
 

‎python/plugins/sextante/algs/PointsDisplacement.py renamed to ‎python/plugins/processing/algs/PointsDisplacement.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
from qgis.core import *
3131

32-
from sextante.core.GeoAlgorithm import GeoAlgorithm
33-
from sextante.core.QGisLayers import QGisLayers
32+
from processing.core.GeoAlgorithm import GeoAlgorithm
33+
from processing.core.QGisLayers import QGisLayers
3434

35-
from sextante.parameters.ParameterVector import ParameterVector
36-
from sextante.parameters.ParameterNumber import ParameterNumber
37-
from sextante.parameters.ParameterBoolean import ParameterBoolean
38-
from sextante.outputs.OutputVector import OutputVector
35+
from processing.parameters.ParameterVector import ParameterVector
36+
from processing.parameters.ParameterNumber import ParameterNumber
37+
from processing.parameters.ParameterBoolean import ParameterBoolean
38+
from processing.outputs.OutputVector import OutputVector
3939

4040
class PointsDisplacement(GeoAlgorithm):
4141

‎python/plugins/sextante/algs/PointsFromLines.py renamed to ‎python/plugins/processing/algs/PointsFromLines.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
from qgis.core import *
3131

32-
from sextante.core.GeoAlgorithm import GeoAlgorithm
33-
from sextante.core.QGisLayers import QGisLayers
32+
from processing.core.GeoAlgorithm import GeoAlgorithm
33+
from processing.core.QGisLayers import QGisLayers
3434

35-
from sextante.parameters.ParameterRaster import ParameterRaster
36-
from sextante.parameters.ParameterVector import ParameterVector
35+
from processing.parameters.ParameterRaster import ParameterRaster
36+
from processing.parameters.ParameterVector import ParameterVector
3737

38-
from sextante.outputs.OutputVector import OutputVector
38+
from processing.outputs.OutputVector import OutputVector
3939

40-
from sextante.algs import QGISUtils as utils
40+
from processing.algs import QGISUtils as utils
4141

4242
class PointsFromLines(GeoAlgorithm):
4343

‎python/plugins/sextante/algs/PointsFromPolygons.py renamed to ‎python/plugins/processing/algs/PointsFromPolygons.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
from qgis.core import *
3131

32-
from sextante.core.GeoAlgorithm import GeoAlgorithm
33-
from sextante.core.QGisLayers import QGisLayers
32+
from processing.core.GeoAlgorithm import GeoAlgorithm
33+
from processing.core.QGisLayers import QGisLayers
3434

35-
from sextante.parameters.ParameterRaster import ParameterRaster
36-
from sextante.parameters.ParameterVector import ParameterVector
35+
from processing.parameters.ParameterRaster import ParameterRaster
36+
from processing.parameters.ParameterVector import ParameterVector
3737

38-
from sextante.outputs.OutputVector import OutputVector
38+
from processing.outputs.OutputVector import OutputVector
3939

40-
from sextante.algs import QGISUtils as utils
40+
from processing.algs import QGISUtils as utils
4141

4242
class PointsFromPolygons(GeoAlgorithm):
4343

‎python/plugins/processing/algs/QGISAlgorithmProvider.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@
8787
from processing.algs.PointsLayerFromTable import PointsLayerFromTable
8888

8989
from processing.algs.PointsDisplacement import PointsDisplacement
90-
from sextante.algs.ZonalStatistics import ZonalStatistics
91-
from sextante.algs.PointsFromPolygons import PointsFromPolygons
92-
from sextante.algs.PointsFromLines import PointsFromLines
90+
from processing.algs.ZonalStatistics import ZonalStatistics
91+
from processing.algs.PointsFromPolygons import PointsFromPolygons
92+
from processing.algs.PointsFromLines import PointsFromLines
9393

9494
#from processing.algs.VectorLayerHistogram import VectorLayerHistogram
9595
#from processing.algs.VectorLayerScatterplot import VectorLayerScatterplot

‎python/plugins/sextante/algs/ZonalStatistics.py renamed to ‎python/plugins/processing/algs/ZonalStatistics.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030

3131
from qgis.core import *
3232

33-
from sextante.core.GeoAlgorithm import GeoAlgorithm
34-
from sextante.core.QGisLayers import QGisLayers
33+
from processing.core.GeoAlgorithm import GeoAlgorithm
34+
from processing.core.QGisLayers import QGisLayers
3535

36-
from sextante.parameters.ParameterVector import ParameterVector
37-
from sextante.parameters.ParameterRaster import ParameterRaster
38-
from sextante.parameters.ParameterString import ParameterString
39-
from sextante.parameters.ParameterNumber import ParameterNumber
40-
from sextante.parameters.ParameterBoolean import ParameterBoolean
36+
from processing.parameters.ParameterVector import ParameterVector
37+
from processing.parameters.ParameterRaster import ParameterRaster
38+
from processing.parameters.ParameterString import ParameterString
39+
from processing.parameters.ParameterNumber import ParameterNumber
40+
from processing.parameters.ParameterBoolean import ParameterBoolean
4141

42-
from sextante.outputs.OutputVector import OutputVector
42+
from processing.outputs.OutputVector import OutputVector
4343

44-
from sextante.algs.ftools import FToolsUtils as ftools_utils
45-
from sextante.algs import QGISUtils as utils
44+
from processing.algs.ftools import FToolsUtils as ftools_utils
45+
from processing.algs import QGISUtils as utils
4646

4747
class ZonalStatistics(GeoAlgorithm):
4848

0 commit comments

Comments
 (0)
Please sign in to comment.