5 changes: 0 additions & 5 deletions python/plugins/sextante/gdal/scripts/proximity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,3 @@
dstband = None
src_ds = None
dst_ds = None





6 changes: 0 additions & 6 deletions python/plugins/sextante/gdal/scripts/sieve.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,3 @@
src_ds = None
dst_ds = None
mask_ds = None






37 changes: 20 additions & 17 deletions python/plugins/sextante/gdal/translate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

import os

from PyQt4 import QtGui

from sextante.core.GeoAlgorithm import GeoAlgorithm

from sextante.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterBoolean import ParameterBoolean
from sextante.parameters.ParameterSelection import ParameterSelection
from sextante.parameters.ParameterExtent import ParameterExtent
from sextante.parameters.ParameterCrs import ParameterCrs
from sextante.outputs.OutputRaster import OutputRaster
import os

from sextante.gdal.GdalUtils import GdalUtils

class translate(GeoAlgorithm):
Expand Down Expand Up @@ -79,26 +83,25 @@ def processAlgorithm(self, progress):
sds = self.getParameterValue(translate.SDS)
extra = str(self.getParameterValue(translate.EXTRA))

commands = ["gdal_translate"]
commands.append("-of")
commands.append(GdalUtils.getFormatShortNameFromFilename(out))
arguments = []
arguments.append("-of")
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
if outsizePerc == "True":
outsizeStr = "-outsize "+outsize+"% "+outsize+"%"
outsizeStr = "-outsize " + outsize + "% " + outsize + "%"
else:
outsizeStr = "-outsize "+outsize+" "+outsize
commands.append(outsizeStr)
commands.append("-a_nodata "+noData)
outsizeStr = "-outsize " + outsize + " " + outsize
arguments.append(outsizeStr)
arguments.append("-a_nodata " + noData)
if expand != "none":
commands.append("-expand "+expand)
arguments.append("-expand " + expand)
regionCoords = projwin.split(",")
commands.append("-projwin "+regionCoords[0]+" "+regionCoords[3]+" "+regionCoords[1]+" "+regionCoords[2])
arguments.append("-projwin " + regionCoords[0] + " " + regionCoords[3] + " " + regionCoords[1] + " " + regionCoords[2])
if srs is not None:
commands.append("-a_srs "+str(srs))
arguments.append("-a_srs " + str(srs))
if sds:
commands.append("-sds")
commands.append(extra)
commands.append(self.getParameterValue(translate.INPUT))
commands.append(out)

arguments.append("-sds")
arguments.append(extra)
arguments.append(self.getParameterValue(translate.INPUT))
arguments.append(out)

GdalUtils.runGdal(commands, progress)
GdalUtils.runGdal(["gdal_translate", GdalUtils.escapeAndJoin(arguments)], progress)
40 changes: 22 additions & 18 deletions python/plugins/sextante/gdal/warp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@
__revision__ = '$Format:%H$'

import os
from qgis.core import *
from PyQt4 import QtGui

from qgis.core import *

from sextante.core.GeoAlgorithm import GeoAlgorithm

from sextante.parameters.ParameterRaster import ParameterRaster
from sextante.outputs.OutputRaster import OutputRaster
from sextante.parameters.ParameterSelection import ParameterSelection
from sextante.parameters.ParameterCrs import ParameterCrs
from sextante.gdal.GdalUtils import GdalUtils
from sextante.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterString import ParameterString
from sextante.outputs.OutputRaster import OutputRaster

from sextante.gdal.GdalUtils import GdalUtils

class warp(GeoAlgorithm):

Expand Down Expand Up @@ -64,21 +68,21 @@ def defineCharacteristics(self):
def processAlgorithm(self, progress):
srs = self.getParameterValue(warp.DEST_SRS)
self.crs = QgsCoordinateReferenceSystem(srs)
commands = ["gdalwarp"]
commands.append("-s_srs")
commands.append(str(self.getParameterValue(warp.SOURCE_SRS)))
commands.append("-t_srs")
commands.append(str(srs))
commands.append("-r")
commands.append(warp.METHOD_OPTIONS[self.getParameterValue(warp.METHOD)])
commands.append("-of")
arguments = []
arguments.append("-s_srs")
arguments.append(str(self.getParameterValue(warp.SOURCE_SRS)))
arguments.append("-t_srs")
arguments.append(str(srs))
arguments.append("-r")
arguments.append(warp.METHOD_OPTIONS[self.getParameterValue(warp.METHOD)])
arguments.append("-of")
out = self.getOutputValue(warp.OUTPUT)
commands.append(GdalUtils.getFormatShortNameFromFilename(out))
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
if self.getParameterValue(warp.TR) != 0:
trStr = "-tr "+str(self.getParameterValue(warp.TR))+" "+str(self.getParameterValue(warp.TR))
commands.append(trStr)
commands.append(str(self.getParameterValue(warp.EXTRA)))
commands.append(self.getParameterValue(warp.INPUT))
commands.append(out)
trStr = "-tr " + str(self.getParameterValue(warp.TR)) + " " + str(self.getParameterValue(warp.TR))
arguments.append(trStr)
arguments.append(str(self.getParameterValue(warp.EXTRA)))
arguments.append(self.getParameterValue(warp.INPUT))
arguments.append(out)

GdalUtils.runGdal(commands, progress)
GdalUtils.runGdal(["gdalwarp", GdalUtils.escapeAndJoin(arguments)], progress)