Skip to content
Permalink
Browse files

[processing] cleanup files from unused code and remove some files

  • Loading branch information
alexbruy committed Nov 27, 2017
1 parent ee8435a commit 3d4a59bb8bc4130ca9a78a9aea2be2cebf21d000
Showing with 39 additions and 1,803 deletions.
  1. +1 −6 python/plugins/processing/algs/gdal/gdalcalc.py
  2. +0 −6 python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
  3. +0 −9 python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
  4. +0 −8 python/plugins/processing/algs/gdal/rasterize.py
  5. +0 −4 python/plugins/processing/algs/gdal/rasterize_over.py
  6. +0 −2 python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
  7. +0 −196 python/plugins/processing/algs/grass7/nviz7.py
  8. +1 −2 python/plugins/processing/algs/qgis/Aspect.py
  9. +1 −2 python/plugins/processing/algs/qgis/Hillshade.py
  10. +1 −2 python/plugins/processing/algs/qgis/HypsometricCurves.py
  11. +1 −2 python/plugins/processing/algs/qgis/PointsFromLines.py
  12. +1 −2 python/plugins/processing/algs/qgis/PointsFromPolygons.py
  13. +1 −2 python/plugins/processing/algs/qgis/Relief.py
  14. +1 −2 python/plugins/processing/algs/qgis/Ruggedness.py
  15. +1 −3 python/plugins/processing/algs/qgis/Slope.py
  16. +15 −12 python/plugins/processing/algs/qgis/ui/RasterCalculatorWidgets.py
  17. +0 −340 python/plugins/processing/core/GeoAlgorithm.py
  18. +0 −1 python/plugins/processing/core/Processing.py
  19. +0 −343 python/plugins/processing/core/outputs.py
  20. +5 −534 python/plugins/processing/core/parameters.py
  21. +0 −5 python/plugins/processing/gui/AlgorithmDialog.py
  22. +1 −11 python/plugins/processing/gui/BatchPanel.py
  23. +5 −18 python/plugins/processing/gui/wrappers.py
  24. +1 −1 python/plugins/processing/modeler/ModelerParametersDialog.py
  25. +0 −1 python/plugins/processing/script/ScriptAlgorithm.py
  26. +0 −1 python/plugins/processing/tests/CMakeLists.txt
  27. +0 −124 python/plugins/processing/tests/ParametersTest.py
  28. +2 −2 python/plugins/processing/tests/testdata/scripts/centroids.py
  29. +0 −122 python/plugins/processing/tools/dataobjects.py
  30. +1 −5 python/plugins/processing/tools/general.py
  31. +0 −35 python/plugins/processing/tools/vector.py
@@ -26,15 +26,10 @@
__revision__ = '$Format:%H$'

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.core.parameters import ParameterString
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

from processing.tools.system import isWindows

from processing.algs.gdal.GdalUtils import GdalUtils


class gdalcalc(GdalAlgorithm):

@@ -27,12 +27,6 @@

from qgis.core import QgsSettings

from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterTable
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterTableField

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

@@ -25,15 +25,6 @@

__revision__ = '$Format:%H$'


from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterCrs
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterTableField

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

@@ -30,14 +30,6 @@

from qgis.PyQt.QtGui import QIcon

from processing.core.parameters import (ParameterVector,
ParameterExtent,
ParameterTableField,
ParameterSelection,
ParameterNumber,
ParameterString)
from processing.core.outputs import OutputRaster

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

@@ -31,10 +31,6 @@

from qgis.PyQt.QtGui import QIcon

from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterTableField

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

@@ -36,7 +36,6 @@
from .Grass7Utils import Grass7Utils
from .Grass7Algorithm import Grass7Algorithm
from processing.tools.system import isWindows, isMac
#from .nviz7 import nviz7

pluginPath = os.path.normpath(os.path.join(
os.path.split(os.path.dirname(__file__))[0], os.pardir))
@@ -109,7 +108,6 @@ def createAlgsList(self):
except Exception as e:
QgsMessageLog.logMessage(
self.tr('Could not open GRASS GIS 7 algorithm: {0}\n{1}').format(descriptionFile, str(e)), self.tr('Processing'), QgsMessageLog.CRITICAL)
#algs.append(nviz7())
return algs

def loadAlgorithms(self):

This file was deleted.

@@ -35,7 +35,6 @@
QgsProcessingParameterNumber,
QgsProcessingParameterRasterDestination)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools.dataobjects import exportRasterLayer

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]

@@ -70,7 +69,7 @@ def displayName(self):
return self.tr('Aspect')

def processAlgorithm(self, parameters, context, feedback):
inputFile = exportRasterLayer(self.parameterAsRasterLayer(parameters, self.INPUT, context))
inputFile = self.parameterAsRasterLayer(parameters, self.INPUT, context).source()
zFactor = self.parameterAsDouble(parameters, self.Z_FACTOR, context)

outputFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
@@ -35,7 +35,6 @@
QgsProcessingParameterNumber,
QgsProcessingParameterRasterDestination)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools.dataobjects import exportRasterLayer

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]

@@ -78,7 +77,7 @@ def displayName(self):
return self.tr('Hillshade')

def processAlgorithm(self, parameters, context, feedback):
inputFile = exportRasterLayer(self.parameterAsRasterLayer(parameters, self.INPUT, context))
inputFile = self.parameterAsRasterLayer(parameters, self.INPUT, context).source()
zFactor = self.parameterAsDouble(parameters, self.Z_FACTOR, context)
azimuth = self.parameterAsDouble(parameters, self.AZIMUTH, context)
vAngle = self.parameterAsDouble(parameters, self.V_ANGLE, context)
@@ -43,7 +43,6 @@

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools import raster
from processing.tools.dataobjects import exportRasterLayer


class HypsometricCurves(QgisAlgorithm):
@@ -82,7 +81,7 @@ def displayName(self):
def processAlgorithm(self, parameters, context, feedback):
raster_layer = self.parameterAsRasterLayer(parameters, self.INPUT_DEM, context)
target_crs = raster_layer.crs()
rasterPath = exportRasterLayer(raster_layer)
rasterPath = raster_layer.source()

source = self.parameterAsSource(parameters, self.BOUNDARY_LAYER, context)
step = self.parameterAsDouble(parameters, self.STEP, context)
@@ -41,7 +41,6 @@
QgsProcessingParameterFeatureSink)
from processing.tools import raster
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools.dataobjects import exportRasterLayer


class PointsFromLines(QgisAlgorithm):
@@ -74,7 +73,7 @@ def processAlgorithm(self, parameters, context, feedback):
source = self.parameterAsSource(parameters, self.INPUT_VECTOR, context)

raster_layer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
rasterPath = exportRasterLayer(raster_layer)
rasterPath = raster_layer.source()

rasterDS = gdal.Open(rasterPath, gdal.GA_ReadOnly)
geoTransform = rasterDS.GetGeoTransform()
@@ -42,7 +42,6 @@
from qgis.PyQt.QtCore import QVariant
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools import raster
from processing.tools.dataobjects import exportRasterLayer


class PointsFromPolygons(QgisAlgorithm):
@@ -74,7 +73,7 @@ def processAlgorithm(self, parameters, context, feedback):
source = self.parameterAsSource(parameters, self.INPUT_VECTOR, context)

raster_layer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
rasterPath = exportRasterLayer(raster_layer)
rasterPath = raster_layer.source()

rasterDS = gdal.Open(rasterPath, gdal.GA_ReadOnly)
geoTransform = rasterDS.GetGeoTransform()
@@ -39,7 +39,6 @@
QgsRasterFileWriter,
QgsProcessingException)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools.dataobjects import exportRasterLayer

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]

@@ -126,7 +125,7 @@ def displayName(self):
return self.tr('Relief')

def processAlgorithm(self, parameters, context, feedback):
inputFile = exportRasterLayer(self.parameterAsRasterLayer(parameters, self.INPUT, context))
inputFile = self.parameterAsRasterLayer(parameters, self.INPUT, context).source()
zFactor = self.parameterAsDouble(parameters, self.Z_FACTOR, context)
automaticColors = self.parameterAsBool(parameters, self.AUTO_COLORS, context)
outputFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)

0 comments on commit 3d4a59b

Please sign in to comment.
You can’t perform that action at this time.