sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1505 from volaya/master

Browse Source 
[Processing] Refactoring of parameters and outputs
This commit is contained in:
alexbruy 2014-07-21 14:44:40 +03:00
commit 314316350d
266 changed files with 2146 additions and 3356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py
View File

@ -31,8 +31,8 @@ from qgis.core import *
from processing.core.Processing import Processing
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.outputs.OutputVector import OutputVector
from processing.core.parameters import ParameterVector
from processing.core.outputs import OutputVector
from processing.tools import dataobjects, vector

8
python/plugins/processing/algs/gdal/ClipByExtent.py
View File

@ -31,10 +31,10 @@ from qgis.core import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

10
python/plugins/processing/algs/gdal/ClipByMask.py
View File

@ -32,12 +32,12 @@ from qgis.core import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
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

12
python/plugins/processing/algs/gdal/ColorRelief.py
View File

@ -29,12 +29,12 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/GridAverage.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

10
python/plugins/processing/algs/gdal/GridDataMetrics.py
View File

@ -29,11 +29,11 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/GridInvDist.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/GridNearest.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/aspect.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/contour.py
View File

@ -31,11 +31,11 @@ from qgis.core import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
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

4
python/plugins/processing/algs/gdal/extractprojection.py
View File

@ -31,8 +31,8 @@ from osgeo import gdal, osr
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
class ExtractProjection(GdalAlgorithm):

8
python/plugins/processing/algs/gdal/fillnodata.py
View File

@ -28,10 +28,10 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.outputs import OutputRaster
from processing.tools.system import *

6
python/plugins/processing/algs/gdal/gdal2xyz.py
View File

@ -30,9 +30,9 @@ from PyQt4.QtCore import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputTable import OutputTable
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputTable
from processing.tools.system import *

10
python/plugins/processing/algs/gdal/gdaladdo.py
View File

@ -26,11 +26,11 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

8
python/plugins/processing/algs/gdal/hillshade.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

6
python/plugins/processing/algs/gdal/information.py
View File

@ -26,9 +26,9 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputHTML import OutputHTML
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.outputs import OutputHTML
from processing.algs.gdal.GdalUtils import GdalUtils

6
python/plugins/processing/algs/gdal/merge.py
View File

@ -27,9 +27,9 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.outputs.OutputRaster import OutputRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
from processing.core.outputs import OutputRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterMultipleInput
from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils

8
python/plugins/processing/algs/gdal/nearblack.py
View File

@ -26,10 +26,10 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

8
python/plugins/processing/algs/gdal/ogr2ogr.py
View File

@ -32,10 +32,10 @@ from PyQt4.QtGui import *
from qgis.core import *
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputVector import OutputVector
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputVector
from processing.tools.system import *

4
python/plugins/processing/algs/gdal/ogrinfo.py
View File

@ -30,8 +30,8 @@ from PyQt4.QtCore import *
from PyQt4.QtGui import *
from qgis.core import *
from processing.parameters.ParameterVector import ParameterVector
from processing.outputs.OutputHTML import OutputHTML
from processing.core.parameters import ParameterVector
from processing.core.outputs import OutputHTML
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm

6
python/plugins/processing/algs/gdal/ogrsql.py
View File

@ -31,9 +31,9 @@ from qgis.core import *
from processing.core.GeoAlgorithmExecutionException import \
GeoAlgorithmExecutionException
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputVector import OutputVector
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputVector
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm

6
python/plugins/processing/algs/gdal/pct2rgb.py
View File

@ -28,9 +28,9 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.tools.system import *
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

6
python/plugins/processing/algs/gdal/polygonize.py
View File

@ -27,9 +27,9 @@ __revision__ = '$Format:%H$'
from PyQt4 import QtCore
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputVector import OutputVector
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputVector
from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils

10
python/plugins/processing/algs/gdal/proximity.py
View File

@ -26,11 +26,11 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils

10
python/plugins/processing/algs/gdal/rasterize.py
View File

@ -27,11 +27,11 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.tools.system import *
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterTableField import ParameterTableField
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

6
python/plugins/processing/algs/gdal/rgb2pct.py
View File

@ -27,9 +27,9 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.tools.system import *
from processing.algs.gdal.GdalUtils import GdalUtils

8
python/plugins/processing/algs/gdal/roughness.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/sieve.py
View File

@ -28,10 +28,10 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/slope.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

8
python/plugins/processing/algs/gdal/tpi.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

16
python/plugins/processing/algs/gdal/translate.py
View File

@ -27,14 +27,14 @@ __revision__ = '$Format:%H$'
from qgis.core import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterCrs import ParameterCrs
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterCrs
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

8
python/plugins/processing/algs/gdal/tri.py
View File

@ -29,10 +29,10 @@ __revision__ = '$Format:%H$'
from PyQt4.QtGui import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import *

12
python/plugins/processing/algs/gdal/warp.py
View File

@ -27,12 +27,12 @@ __revision__ = '$Format:%H$'
from qgis.core import *
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterCrs import ParameterCrs
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterCrs
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

57
python/plugins/processing/algs/grass/GrassAlgorithm.py
View File

@ -37,25 +37,11 @@ from qgis.utils import iface
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.ProcessingConfig import ProcessingConfig
from processing.core.ProcessingLog import ProcessingLog
from processing.core.WrongHelpFileException import WrongHelpFileException
from processing.core.GeoAlgorithmExecutionException import \
GeoAlgorithmExecutionException
from processing.parameters.ParameterFactory import ParameterFactory
from processing.parameters.ParameterTable import ParameterTable
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster
from processing.outputs.OutputHTML import OutputHTML
from processing.outputs.OutputVector import OutputVector
from processing.outputs.OutputFactory import OutputFactory
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import *
from processing.core.outputs import *
from GrassUtils import GrassUtils
@ -96,26 +82,22 @@ class GrassAlgorithm(GeoAlgorithm):
def getParameterDescriptions(self):
descs = {}
_, helpfile = self.help()
try:
_, helpfile = self.help()
except WrongHelpFileException:
return descs
if helpfile:
try:
infile = open(helpfile)
lines = infile.readlines()
for i in range(len(lines)):
if lines[i].startswith('<DT><b>'):
for param in self.parameters:
searchLine = '<b>' + param.name + '</b>'
if searchLine in lines[i]:
i += 1
descs[param.name] = (lines[i])[4:-6]
break
infile = open(helpfile)
lines = infile.readlines()
for i in range(len(lines)):
if lines[i].startswith('<DT><b>'):
for param in self.parameters:
searchLine = '<b>' + param.name + '</b>'
if searchLine in lines[i]:
i += 1
descs[param.name] = (lines[i])[4:-6]
break
infile.close()
except Exception:
pass
infile.close()
except Exception:
pass
return descs
def defineCharacteristicsFromFile(self):
@ -129,11 +111,12 @@ class GrassAlgorithm(GeoAlgorithm):
hasRasterOutput = False
hasVectorInput = False
vectorOutputs = 0
line = lines.readline().strip('\n').strip()
while line != '':
try:
line = line.strip('\n').strip()
if line.startswith('Parameter'):
parameter = ParameterFactory.getFromString(line)
parameter = getParameterFromString(line)
self.addParameter(parameter)
if isinstance(parameter, ParameterVector):
hasVectorInput = True
@ -141,11 +124,11 @@ class GrassAlgorithm(GeoAlgorithm):
and parameter.datatype < 3:
hasVectorInput = True
elif line.startswith('*Parameter'):
param = ParameterFactory.getFromString(line[1:])
param = getParameterFromString(line[1:])
param.isAdvanced = True
self.addParameter(param)
else:
output = OutputFactory.getFromString(line)
output = getOutputFromString(line)
self.addOutput(output)
if isinstance(output, OutputRaster):
hasRasterOutput = True

8
python/plugins/processing/algs/grass/nviz.py
View File

@ -29,10 +29,10 @@ from PyQt4 import QtGui
from qgis.core import *
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterRaster import ParameterRaster
from processing.core.parameters import ParameterMultipleInput
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterRaster
from GrassUtils import GrassUtils
from processing.tools.system import *
from processing.tools import dataobjects

57
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -37,25 +37,11 @@ from qgis.utils import iface
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.ProcessingConfig import ProcessingConfig
from processing.core.ProcessingLog import ProcessingLog
from processing.core.WrongHelpFileException import WrongHelpFileException
from processing.core.GeoAlgorithmExecutionException import \
GeoAlgorithmExecutionException
from processing.parameters.ParameterFactory import ParameterFactory
from processing.parameters.ParameterTable import ParameterTable
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster
from processing.outputs.OutputHTML import OutputHTML
from processing.outputs.OutputVector import OutputVector
from processing.outputs.OutputFactory import OutputFactory
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import *
from processing.core.outputs import *
from Grass7Utils import Grass7Utils
@ -97,26 +83,22 @@ class Grass7Algorithm(GeoAlgorithm):
def getParameterDescriptions(self):
descs = {}
_, helpfile = self.help()
try:
_, helpfile = self.help()
except WrongHelpFileException:
return descs
if helpfile:
try:
infile = open(helpfile)
lines = infile.readlines()
for i in range(len(lines)):
if lines[i].startswith('<DT><b>'):
for param in self.parameters:
searchLine = '<b>' + param.name + '</b>'
if searchLine in lines[i]:
i += 1
descs[param.name] = (lines[i])[4:-6]
break
infile = open(helpfile)
lines = infile.readlines()
for i in range(len(lines)):
if lines[i].startswith('<DT><b>'):
for param in self.parameters:
searchLine = '<b>' + param.name + '</b>'
if searchLine in lines[i]:
i += 1
descs[param.name] = (lines[i])[4:-6]
break
infile.close()
except Exception:
pass
infile.close()
except Exception:
pass
return descs
def defineCharacteristicsFromFile(self):
@ -130,11 +112,12 @@ class Grass7Algorithm(GeoAlgorithm):
hasRasterOutput = False
hasVectorInput = False
vectorOutputs = 0
line = lines.readline().strip('\n').strip()
while line != '':
try:
line = line.strip('\n').strip()
if line.startswith('Parameter'):
parameter = ParameterFactory.getFromString(line)
parameter = getParameterFromString(line)
self.addParameter(parameter)
if isinstance(parameter, ParameterVector):
hasVectorInput = True
@ -142,11 +125,11 @@ class Grass7Algorithm(GeoAlgorithm):
and parameter.datatype < 3:
hasVectorInput = True
elif line.startswith('*Parameter'):
param = ParameterFactory.getFromString(line[1:])
param = getParameterFromString(line[1:])
param.isAdvanced = True
self.addParameter(param)
else:
output = OutputFactory.getFromString(line)
output = getOutputFromString(line)
self.addOutput(output)
if isinstance(output, OutputRaster):
hasRasterOutput = True

8
python/plugins/processing/algs/grass7/nviz7.py
View File

@ -29,10 +29,10 @@ from PyQt4 import QtGui
from qgis.core import *
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterRaster import ParameterRaster
from processing.core.parameters import ParameterMultipleInput
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterRaster
from Grass7Utils import Grass7Utils
from processing.tools.system import *
from processing.tools import dataobjects

8
python/plugins/processing/algs/lidar/fusion/ASCII2DTM.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

8
python/plugins/processing/algs/lidar/fusion/CanopyMaxima.py
View File

@ -28,10 +28,10 @@ __revision__ = '$Format:%H$'
import os
from PyQt4 import QtGui
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputTable import OutputTable
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.outputs import OutputTable
from FusionUtils import FusionUtils
from FusionAlgorithm import FusionAlgorithm

12
python/plugins/processing/algs/lidar/fusion/CanopyModel.py
View File

@ -29,12 +29,12 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

6
python/plugins/processing/algs/lidar/fusion/Catalog.py
View File

@ -24,9 +24,9 @@ __copyright__ = '(C) 2014, Agresta S. Coop'
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
from FusionUtils import FusionUtils
from FusionAlgorithm import FusionAlgorithm

8
python/plugins/processing/algs/lidar/fusion/ClipData.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterExtent import ParameterExtent
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

8
python/plugins/processing/algs/lidar/fusion/CloudMetrics.py
View File

@ -28,12 +28,12 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.outputs import OutputFile
from FusionUtils import FusionUtils
from FusionAlgorithm import FusionAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterBoolean
class CloudMetrics(FusionAlgorithm):

8
python/plugins/processing/algs/lidar/fusion/Cover.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputRaster
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

6
python/plugins/processing/algs/lidar/fusion/Csv2Grid.py
View File

@ -24,9 +24,9 @@ __copyright__ = '(C) 2014, Agresta S. Coop'
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

4
python/plugins/processing/algs/lidar/fusion/DTM2TIF.py
View File

@ -26,8 +26,8 @@ __copyright__ = "(C) 2014 by Niccolo' Marchi"
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.outputs.OutputRaster import OutputRaster
from processing.core.parameters import ParameterFile
from processing.core.outputs import OutputRaster
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

6
python/plugins/processing/algs/lidar/fusion/FilterData.py
View File

@ -27,9 +27,9 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

6
python/plugins/processing/algs/lidar/fusion/FirstLastReturn.py
View File

@ -26,9 +26,9 @@ __copyright__ = "(C) 2014 by Niccolo' Marchi"
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterBoolean
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

2
python/plugins/processing/algs/lidar/fusion/FusionAlgorithm.py
View File

@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
import os
from PyQt4 import QtGui
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterString
from FusionUtils import FusionUtils

10
python/plugins/processing/algs/lidar/fusion/GridMetrics.py
View File

@ -28,11 +28,11 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
from FusionUtils import FusionUtils
from FusionAlgorithm import FusionAlgorithm

12
python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py
View File

@ -29,14 +29,14 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterString
class GridSurfaceCreate(FusionAlgorithm):

6
python/plugins/processing/algs/lidar/fusion/GroundFilter.py
View File

@ -27,9 +27,9 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputFile
from FusionUtils import FusionUtils
from FusionAlgorithm import FusionAlgorithm

4
python/plugins/processing/algs/lidar/fusion/MergeData.py
View File

@ -26,8 +26,8 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
import os
from processing.parameters.ParameterFile import ParameterFile
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

10
python/plugins/processing/algs/lidar/fusion/PolyClipData.py
View File

@ -28,11 +28,11 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from PyQt4 import QtGui
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils

12
python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py
View File

@ -25,14 +25,14 @@ __revision__ = '$Format:%H$'
import os
import subprocess
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputFile
from FusionAlgorithm import FusionAlgorithm
from FusionUtils import FusionUtils
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterString
class TinSurfaceCreate(FusionAlgorithm):

16
python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
View File

@ -33,14 +33,14 @@ from processing.core.GeoAlgorithm import GeoAlgorithm
from LAStoolsUtils import LAStoolsUtils
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.outputs.OutputFile import OutputFile
from processing.outputs.OutputRaster import OutputRaster
from processing.outputs.OutputVector import OutputVector
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputFile
from processing.core.outputs import OutputRaster
from processing.core.outputs import OutputVector
class LAStoolsAlgorithm(GeoAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/blast2dem.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterSelection
class blast2dem(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/blast2iso.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterNumber
class blast2iso(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/flightlinesToCHM.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
class flightlinesToCHM(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/flightlinesToDTMandDSM.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
class flightlinesToDTMandDSM(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/flightlinesToSingleCHMpitFree.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
class flightlinesToSingleCHMpitFree(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/hugeFileClassify.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
class hugeFileClassify(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/hugeFileGroundClassify.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
class hugeFileGroundClassify(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/hugeFileNormalize.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterNumber
class hugeFileNormalize(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/las2dem.py
View File

@ -32,7 +32,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterSelection
class las2dem(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/las2demPro.py
View File

@ -32,7 +32,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterSelection
class las2demPro(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/las2iso.py
View File

@ -31,7 +31,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterNumber
class las2iso(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/las2las.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
class las2las(LAStoolsAlgorithm):

8
python/plugins/processing/algs/lidar/lastools/las2las_project.py
View File

@ -27,10 +27,10 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
class las2las_project(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/las2las_transform.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
class las2las_transform(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/las2shp.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputFile
class las2shp(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/las2tin.py
View File

@ -31,7 +31,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterNumber
class las2tin(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/las2txt.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.outputs.OutputFile import OutputFile
from processing.core.parameters import ParameterString
from processing.core.outputs import OutputFile
class las2txt(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasboundary.py
View File

@ -32,8 +32,8 @@ from PyQt4 import QtGui
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
class lasboundary(LAStoolsAlgorithm):

8
python/plugins/processing/algs/lidar/lastools/lascanopy.py
View File

@ -27,10 +27,10 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterSelection
class lascanopy(LAStoolsAlgorithm):

8
python/plugins/processing/algs/lidar/lastools/lasclip.py
View File

@ -31,10 +31,10 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lasclip(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lascolor.py
View File

@ -31,7 +31,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster
from processing.core.parameters import ParameterRaster
class lascolor(LAStoolsAlgorithm):

8
python/plugins/processing/algs/lidar/lastools/lascontrol.py
View File

@ -27,10 +27,10 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lascontrol(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasduplicate.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterFile import ParameterFile
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterFile
class lasduplicate(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasgrid.py
View File

@ -31,7 +31,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterSelection
class lasgrid(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasground.py
View File

@ -31,8 +31,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
class lasground(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasgroundPro.py
View File

@ -31,8 +31,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterSelection
class lasgroundPro(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasheight.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterBoolean
class lasheight(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasindex.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterBoolean
class lasindex(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasinfo.py
View File

@ -30,7 +30,7 @@ __revision__ = '$Format:%H$'
import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.outputs.OutputFile import OutputFile
from processing.core.outputs import OutputFile
class lasinfo(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasmerge.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterFile import ParameterFile
from processing.core.parameters import ParameterFile
class lasmerge(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasnoise.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lasnoise(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lasoverage.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lasoverage(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/lasoverlap.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lasoverlap(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasprecision.py
View File

@ -31,7 +31,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.outputs.OutputFile import OutputFile
from processing.core.outputs import OutputFile
class lasprecision(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasquery.py
View File

@ -29,7 +29,7 @@ __revision__ = '$Format:%H$'
import os
from LAStoolsUtils import LAStoolsUtils
from processing.parameters.ParameterExtent import ParameterExtent
from processing.core.parameters import ParameterExtent
from LAStoolsAlgorithm import LAStoolsAlgorithm
from qgis.core import QgsMapLayer, QgsMapLayerRegistry, QgsVectorLayer

2
python/plugins/processing/algs/lidar/lastools/lassort.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterBoolean
class lassort(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/lassplit.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lassplit(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/lasthin.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterSelection import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection
class lasthin(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lastile.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.core.parameters import ParameterNumber
class lastile(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/lastilePro.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
class lastilePro(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/lasvalidate.py
View File

@ -26,7 +26,7 @@ __revision__ = '$Format:%H$'
import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.outputs.OutputFile import OutputFile
from processing.core.outputs import OutputFile
class lasvalidate(LAStoolsAlgorithm):

2
python/plugins/processing/algs/lidar/lastools/laszip.py
View File

@ -27,7 +27,7 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.core.parameters import ParameterBoolean
class laszip(LAStoolsAlgorithm):

4
python/plugins/processing/algs/lidar/lastools/shp2las.py
View File

@ -27,8 +27,8 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterFile import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterFile
class shp2las(LAStoolsAlgorithm):

6
python/plugins/processing/algs/lidar/lastools/txt2las.py
View File

@ -27,9 +27,9 @@ import os
from LAStoolsUtils import LAStoolsUtils
from LAStoolsAlgorithm import LAStoolsAlgorithm
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterFile import ParameterFile
from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterFile
class txt2las(LAStoolsAlgorithm):

Some files were not shown because too many files have changed in this diff Show More