mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-17 00:09:36 -04:00
Merge pull request #2893 from NaturalGIS/processing_gdalwarp_extent
processing: add extent parameter to gdal_warp
This commit is contained in:
commit
d808ef9ab6
@ -31,6 +31,7 @@ from PyQt.QtGui import QIcon
|
|||||||
|
|
||||||
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
|
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
|
||||||
from processing.core.parameters import ParameterRaster
|
from processing.core.parameters import ParameterRaster
|
||||||
|
from processing.core.parameters import ParameterExtent
|
||||||
from processing.core.parameters import ParameterSelection
|
from processing.core.parameters import ParameterSelection
|
||||||
from processing.core.parameters import ParameterCrs
|
from processing.core.parameters import ParameterCrs
|
||||||
from processing.core.parameters import ParameterNumber
|
from processing.core.parameters import ParameterNumber
|
||||||
@ -64,6 +65,7 @@ class warp(GdalAlgorithm):
|
|||||||
BIGTIFFTYPE = ['', 'YES', 'NO', 'IF_NEEDED', 'IF_SAFER']
|
BIGTIFFTYPE = ['', 'YES', 'NO', 'IF_NEEDED', 'IF_SAFER']
|
||||||
COMPRESSTYPE = ['NONE', 'JPEG', 'LZW', 'PACKBITS', 'DEFLATE']
|
COMPRESSTYPE = ['NONE', 'JPEG', 'LZW', 'PACKBITS', 'DEFLATE']
|
||||||
TFW = 'TFW'
|
TFW = 'TFW'
|
||||||
|
RAST_EXT = 'RAST_EXT'
|
||||||
|
|
||||||
def getIcon(self):
|
def getIcon(self):
|
||||||
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'warp.png'))
|
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'warp.png'))
|
||||||
@ -84,6 +86,7 @@ class warp(GdalAlgorithm):
|
|||||||
0.0, None, 0.0))
|
0.0, None, 0.0))
|
||||||
self.addParameter(ParameterSelection(self.METHOD,
|
self.addParameter(ParameterSelection(self.METHOD,
|
||||||
self.tr('Resampling method'), self.METHOD_OPTIONS))
|
self.tr('Resampling method'), self.METHOD_OPTIONS))
|
||||||
|
self.addParameter(ParameterExtent(self.RAST_EXT, self.tr('Raster extent')))
|
||||||
|
|
||||||
params = []
|
params = []
|
||||||
params.append(ParameterSelection(self.RTYPE,
|
params.append(ParameterSelection(self.RTYPE,
|
||||||
@ -125,7 +128,8 @@ class warp(GdalAlgorithm):
|
|||||||
compress = self.COMPRESSTYPE[self.getParameterValue(self.COMPRESS)]
|
compress = self.COMPRESSTYPE[self.getParameterValue(self.COMPRESS)]
|
||||||
bigtiff = self.BIGTIFFTYPE[self.getParameterValue(self.BIGTIFF)]
|
bigtiff = self.BIGTIFFTYPE[self.getParameterValue(self.BIGTIFF)]
|
||||||
tfw = unicode(self.getParameterValue(self.TFW))
|
tfw = unicode(self.getParameterValue(self.TFW))
|
||||||
|
rastext = unicode(self.getParameterValue(self.RAST_EXT))
|
||||||
|
|
||||||
arguments = []
|
arguments = []
|
||||||
arguments.append('-ot')
|
arguments.append('-ot')
|
||||||
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
|
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
|
||||||
@ -149,6 +153,18 @@ class warp(GdalAlgorithm):
|
|||||||
arguments.append(unicode(self.getParameterValue(self.TR)))
|
arguments.append(unicode(self.getParameterValue(self.TR)))
|
||||||
arguments.append(unicode(self.getParameterValue(self.TR)))
|
arguments.append(unicode(self.getParameterValue(self.TR)))
|
||||||
extra = unicode(self.getParameterValue(self.EXTRA))
|
extra = unicode(self.getParameterValue(self.EXTRA))
|
||||||
|
regionCoords = rastext.split(',')
|
||||||
|
try:
|
||||||
|
rastext = []
|
||||||
|
rastext.append('-te')
|
||||||
|
rastext.append(regionCoords[0])
|
||||||
|
rastext.append(regionCoords[2])
|
||||||
|
rastext.append(regionCoords[1])
|
||||||
|
rastext.append(regionCoords[3])
|
||||||
|
except IndexError:
|
||||||
|
rastext = []
|
||||||
|
if rastext:
|
||||||
|
arguments.extend(rastext)
|
||||||
if len(extra) > 0:
|
if len(extra) > 0:
|
||||||
arguments.append(extra)
|
arguments.append(extra)
|
||||||
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
|
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
|
||||||
|
Loading…
x
Reference in New Issue
Block a user