Skip to content

Commit 6486594

Browse files
volayavolaya
committed
[Processing] Refactoring of parameters and outputs
It also adds some changes in the core and tools package, to provide a cleaner structure
1 parent 49bc38c commit 6486594

File tree

266 files changed

+2148
-3358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+2148
-3358
lines changed

‎python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
from processing.core.Processing import Processing
3333
from processing.core.GeoAlgorithm import GeoAlgorithm
34-
from processing.parameters.ParameterVector import ParameterVector
35-
from processing.outputs.OutputVector import OutputVector
34+
from processing.core.parameters import ParameterVector
35+
from processing.core.outputs import OutputVector
3636
from processing.tools import dataobjects, vector
3737

3838

‎python/plugins/processing/algs/gdal/ClipByExtent.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3333

34-
from processing.parameters.ParameterRaster import ParameterRaster
35-
from processing.parameters.ParameterExtent import ParameterExtent
36-
from processing.parameters.ParameterString import ParameterString
37-
from processing.outputs.OutputRaster import OutputRaster
34+
from processing.core.parameters import ParameterRaster
35+
from processing.core.parameters import ParameterExtent
36+
from processing.core.parameters import ParameterString
37+
from processing.core.outputs import OutputRaster
3838

3939
from processing.algs.gdal.GdalUtils import GdalUtils
4040

‎python/plugins/processing/algs/gdal/ClipByMask.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3434

35-
from processing.parameters.ParameterRaster import ParameterRaster
36-
from processing.parameters.ParameterVector import ParameterVector
37-
from processing.parameters.ParameterBoolean import ParameterBoolean
38-
from processing.parameters.ParameterString import ParameterString
35+
from processing.core.parameters import ParameterRaster
36+
from processing.core.parameters import ParameterVector
37+
from processing.core.parameters import ParameterBoolean
38+
from processing.core.parameters import ParameterString
3939

40-
from processing.outputs.OutputRaster import OutputRaster
40+
from processing.core.outputs import OutputRaster
4141

4242
from processing.algs.gdal.GdalUtils import GdalUtils
4343

‎python/plugins/processing/algs/gdal/ColorRelief.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterRaster import ParameterRaster
33-
from processing.parameters.ParameterBoolean import ParameterBoolean
34-
from processing.parameters.ParameterNumber import ParameterNumber
35-
from processing.parameters.ParameterFile import ParameterFile
36-
from processing.parameters.ParameterSelection import ParameterSelection
37-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterRaster
33+
from processing.core.parameters import ParameterBoolean
34+
from processing.core.parameters import ParameterNumber
35+
from processing.core.parameters import ParameterFile
36+
from processing.core.parameters import ParameterSelection
37+
from processing.core.outputs import OutputRaster
3838
from processing.algs.gdal.GdalUtils import GdalUtils
3939
from processing.tools.system import *
4040

‎python/plugins/processing/algs/gdal/GridAverage.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterVector import ParameterVector
33-
from processing.parameters.ParameterTableField import ParameterTableField
34-
from processing.parameters.ParameterNumber import ParameterNumber
35-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterVector
33+
from processing.core.parameters import ParameterTableField
34+
from processing.core.parameters import ParameterNumber
35+
from processing.core.outputs import OutputRaster
3636
from processing.algs.gdal.GdalUtils import GdalUtils
3737
from processing.tools.system import *
3838

‎python/plugins/processing/algs/gdal/GridDataMetrics.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterVector import ParameterVector
33-
from processing.parameters.ParameterTableField import ParameterTableField
34-
from processing.parameters.ParameterSelection import ParameterSelection
35-
from processing.parameters.ParameterNumber import ParameterNumber
36-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterVector
33+
from processing.core.parameters import ParameterTableField
34+
from processing.core.parameters import ParameterSelection
35+
from processing.core.parameters import ParameterNumber
36+
from processing.core.outputs import OutputRaster
3737
from processing.algs.gdal.GdalUtils import GdalUtils
3838
from processing.tools.system import *
3939

‎python/plugins/processing/algs/gdal/GridInvDist.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterVector import ParameterVector
33-
from processing.parameters.ParameterTableField import ParameterTableField
34-
from processing.parameters.ParameterNumber import ParameterNumber
35-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterVector
33+
from processing.core.parameters import ParameterTableField
34+
from processing.core.parameters import ParameterNumber
35+
from processing.core.outputs import OutputRaster
3636
from processing.algs.gdal.GdalUtils import GdalUtils
3737
from processing.tools.system import *
3838

‎python/plugins/processing/algs/gdal/GridNearest.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterVector import ParameterVector
33-
from processing.parameters.ParameterTableField import ParameterTableField
34-
from processing.parameters.ParameterNumber import ParameterNumber
35-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterVector
33+
from processing.core.parameters import ParameterTableField
34+
from processing.core.parameters import ParameterNumber
35+
from processing.core.outputs import OutputRaster
3636
from processing.algs.gdal.GdalUtils import GdalUtils
3737
from processing.tools.system import *
3838

‎python/plugins/processing/algs/gdal/aspect.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
from PyQt4.QtGui import *
3030

3131
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
32-
from processing.parameters.ParameterRaster import ParameterRaster
33-
from processing.parameters.ParameterBoolean import ParameterBoolean
34-
from processing.parameters.ParameterNumber import ParameterNumber
35-
from processing.outputs.OutputRaster import OutputRaster
32+
from processing.core.parameters import ParameterRaster
33+
from processing.core.parameters import ParameterBoolean
34+
from processing.core.parameters import ParameterNumber
35+
from processing.core.outputs import OutputRaster
3636
from processing.algs.gdal.GdalUtils import GdalUtils
3737
from processing.tools.system import *
3838

‎python/plugins/processing/algs/gdal/contour.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3333

34-
from processing.parameters.ParameterRaster import ParameterRaster
35-
from processing.parameters.ParameterNumber import ParameterNumber
36-
from processing.parameters.ParameterString import ParameterString
34+
from processing.core.parameters import ParameterRaster
35+
from processing.core.parameters import ParameterNumber
36+
from processing.core.parameters import ParameterString
3737

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

4040
from processing.algs.gdal.GdalUtils import GdalUtils
4141

0 commit comments

Comments
 (0)