Skip to content

Commit

Permalink
Merge pull request #1505 from volaya/master
Browse files Browse the repository at this point in the history 
[Processing] Refactoring of parameters and outputs
  • Loading branch information
@alexbruy
alexbruy committed Jul 21, 2014
2 parents 460cee1 + 6486594 commit 3143163
Show file tree
Hide file tree
Showing 266 changed files with 2,148 additions and 3,358 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py
View file
Expand Up @@ -31,8 +31,8 @@


from processing.core.Processing import Processing from processing.core.Processing import Processing
from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.outputs.OutputVector import OutputVector from processing.core.outputs import OutputVector
from processing.tools import dataobjects, vector from processing.tools import dataobjects, vector




Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/ClipByExtent.py
View file
Expand Up @@ -31,10 +31,10 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm


from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterExtent import ParameterExtent from processing.core.parameters import ParameterExtent
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/gdal/ClipByMask.py
View file
Expand Up @@ -32,12 +32,12 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm


from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString


from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/gdal/ColorRelief.py
View file
Expand Up @@ -29,12 +29,12 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.parameters.ParameterFile import ParameterFile from processing.core.parameters import ParameterFile
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/GridAverage.py
View file
Expand Up @@ -29,10 +29,10 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField from processing.core.parameters import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/gdal/GridDataMetrics.py
View file
Expand Up @@ -29,11 +29,11 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField from processing.core.parameters import ParameterTableField
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/GridInvDist.py
View file
Expand Up @@ -29,10 +29,10 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField from processing.core.parameters import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/GridNearest.py
View file
Expand Up @@ -29,10 +29,10 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField from processing.core.parameters import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/aspect.py
View file
Expand Up @@ -29,10 +29,10 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/contour.py
View file
Expand Up @@ -31,11 +31,11 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm


from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString


from processing.outputs.OutputVector import OutputVector from processing.core.outputs import OutputVector


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/extractprojection.py
View file
Expand Up @@ -31,8 +31,8 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean




class ExtractProjection(GdalAlgorithm): class ExtractProjection(GdalAlgorithm):
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/fillnodata.py
View file
Expand Up @@ -28,10 +28,10 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm


from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster


from processing.tools.system import * from processing.tools.system import *


Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/gdal2xyz.py
View file
Expand Up @@ -30,9 +30,9 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm


from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputTable import OutputTable from processing.core.outputs import OutputTable


from processing.tools.system import * from processing.tools.system import *


Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/gdal/gdaladdo.py
View file
Expand Up @@ -26,11 +26,11 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/hillshade.py
View file
Expand Up @@ -29,10 +29,10 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/information.py
View file
Expand Up @@ -26,9 +26,9 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.outputs.OutputHTML import OutputHTML from processing.core.outputs import OutputHTML
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils




Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/merge.py
View file
Expand Up @@ -27,9 +27,9 @@




from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput from processing.core.parameters import ParameterMultipleInput
from processing.tools.system import * from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/nearblack.py
View file
Expand Up @@ -26,10 +26,10 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils




Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/ogr2ogr.py
View file
Expand Up @@ -32,10 +32,10 @@


from qgis.core import * from qgis.core import *


from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.outputs.OutputVector import OutputVector from processing.core.outputs import OutputVector


from processing.tools.system import * from processing.tools.system import *


Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/ogrinfo.py
View file
Expand Up @@ -30,8 +30,8 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *
from qgis.core import * from qgis.core import *


from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.outputs.OutputHTML import OutputHTML from processing.core.outputs import OutputHTML


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/ogrsql.py
View file
Expand Up @@ -31,9 +31,9 @@


from processing.core.GeoAlgorithmExecutionException import \ from processing.core.GeoAlgorithmExecutionException import \
GeoAlgorithmExecutionException GeoAlgorithmExecutionException
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.outputs.OutputVector import OutputVector from processing.core.outputs import OutputVector


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/pct2rgb.py
View file
Expand Up @@ -28,9 +28,9 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.tools.system import * from processing.tools.system import *
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils




Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/polygonize.py
View file
Expand Up @@ -27,9 +27,9 @@


from PyQt4 import QtCore from PyQt4 import QtCore
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.outputs.OutputVector import OutputVector from processing.core.outputs import OutputVector
from processing.tools.system import * from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/gdal/proximity.py
View file
Expand Up @@ -26,11 +26,11 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterString import ParameterString from processing.core.parameters import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.tools.system import * from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/gdal/rasterize.py
View file
Expand Up @@ -27,11 +27,11 @@


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.tools.system import * from processing.tools.system import *
from processing.parameters.ParameterVector import ParameterVector from processing.core.parameters import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField from processing.core.parameters import ParameterTableField
from processing.parameters.ParameterSelection import ParameterSelection from processing.core.parameters import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils




Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/rgb2pct.py
View file
Expand Up @@ -27,9 +27,9 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.tools.system import * from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/gdal/roughness.py
View file
Expand Up @@ -27,10 +27,10 @@




from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.core.parameters import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean from processing.core.parameters import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import * from processing.tools.system import *


Expand Down

0 comments on commit 3143163

Please sign in to comment.