Skip to content

Commit 1dd8e79

Browse files
volayavolaya
committedOct 24, 2015
Merge pull request #2389 from NaturalGIS/gdal_advanced
Processing gdal translate and warp advanced parameters as such
·
ltr-3_40archive/master_2
2 parents fd26acd + 03333c8 commit 1dd8e79

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed
 

‎python/plugins/processing/algs/gdal/translate.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,34 @@ def defineCharacteristics(self):
8787
self.addParameter(ParameterBoolean(self.SDS,
8888
self.tr('Copy all subdatasets of this file to individual output files'),
8989
False))
90-
self.addParameter(ParameterSelection(self.RTYPE,
90+
91+
params = []
92+
params.append(ParameterSelection(self.RTYPE,
9193
self.tr('Output raster type'), self.TYPE, 5))
92-
self.addParameter(ParameterSelection(self.COMPRESS,
94+
params.append(ParameterSelection(self.COMPRESS,
9395
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 4))
94-
self.addParameter(ParameterNumber(self.JPEGCOMPRESSION,
96+
params.append(ParameterNumber(self.JPEGCOMPRESSION,
9597
self.tr('Set the JPEG compression level'),
9698
1, 100, 75))
97-
self.addParameter(ParameterNumber(self.ZLEVEL,
99+
params.append(ParameterNumber(self.ZLEVEL,
98100
self.tr('Set the DEFLATE compression level'),
99101
1, 9, 6))
100-
self.addParameter(ParameterNumber(self.PREDICTOR,
102+
params.append(ParameterNumber(self.PREDICTOR,
101103
self.tr('Set the predictor for LZW or DEFLATE compression'),
102104
1, 3, 1))
103-
self.addParameter(ParameterBoolean(self.TILED,
105+
params.append(ParameterBoolean(self.TILED,
104106
self.tr('Create tiled output (only used for the GTiff format)'), False))
105-
self.addParameter(ParameterSelection(self.BIGTIFF,
107+
params.append(ParameterSelection(self.BIGTIFF,
106108
self.tr('Control whether the created file is a BigTIFF or a classic TIFF'), self.BIGTIFFTYPE, 0))
107-
self.addParameter(ParameterBoolean(self.TFW,
109+
params.append(ParameterBoolean(self.TFW,
108110
self.tr('Force the generation of an associated ESRI world file (.tfw))'), False))
109-
self.addParameter(ParameterString(self.EXTRA,
111+
params.append(ParameterString(self.EXTRA,
110112
self.tr('Additional creation parameters'), '', optional=True))
113+
114+
for param in params:
115+
param.isAdvanced = True
116+
self.addParameter(param)
117+
111118
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Converted')))
112119

113120
def getConsoleCommands(self):
@@ -175,6 +182,7 @@ def getConsoleCommands(self):
175182
arguments.append("-co TFW=YES")
176183
if len(bigtiff) > 0:
177184
arguments.append("-co BIGTIFF=" + bigtiff)
185+
178186
arguments.append(self.getParameterValue(self.INPUT))
179187
arguments.append(out)
180188

‎python/plugins/processing/algs/gdal/warp.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,34 @@ def defineCharacteristics(self):
7575
0.0, None, 0.0))
7676
self.addParameter(ParameterSelection(self.METHOD,
7777
self.tr('Resampling method'), self.METHOD_OPTIONS))
78-
self.addParameter(ParameterSelection(self.RTYPE,
78+
79+
params = []
80+
params.append(ParameterSelection(self.RTYPE,
7981
self.tr('Output raster type'), self.TYPE, 5))
80-
self.addParameter(ParameterSelection(self.COMPRESS,
82+
params.append(ParameterSelection(self.COMPRESS,
8183
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 4))
82-
self.addParameter(ParameterNumber(self.JPEGCOMPRESSION,
84+
params.append(ParameterNumber(self.JPEGCOMPRESSION,
8385
self.tr('Set the JPEG compression level'),
8486
1, 100, 75))
85-
self.addParameter(ParameterNumber(self.ZLEVEL,
87+
params.append(ParameterNumber(self.ZLEVEL,
8688
self.tr('Set the DEFLATE compression level'),
8789
1, 9, 6))
88-
self.addParameter(ParameterNumber(self.PREDICTOR,
90+
params.append(ParameterNumber(self.PREDICTOR,
8991
self.tr('Set the predictor for LZW or DEFLATE compression'),
9092
1, 3, 1))
91-
self.addParameter(ParameterBoolean(self.TILED,
93+
params.append(ParameterBoolean(self.TILED,
9294
self.tr('Create tiled output (only used for the GTiff format)'), False))
93-
self.addParameter(ParameterSelection(self.BIGTIFF,
95+
params.append(ParameterSelection(self.BIGTIFF,
9496
self.tr('Control whether the created file is a BigTIFF or a classic TIFF'), self.BIGTIFFTYPE, 0))
95-
self.addParameter(ParameterBoolean(self.TFW,
97+
params.append(ParameterBoolean(self.TFW,
9698
self.tr('Force the generation of an associated ESRI world file (.tfw))'), False))
97-
self.addParameter(ParameterString(self.EXTRA,
99+
params.append(ParameterString(self.EXTRA,
98100
self.tr('Additional creation parameters'), '', optional=True))
101+
102+
for param in params:
103+
param.isAdvanced = True
104+
self.addParameter(param)
105+
99106
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Reprojected')))
100107

101108
def getConsoleCommands(self):
@@ -149,6 +156,7 @@ def getConsoleCommands(self):
149156
arguments.append("-co TFW=YES")
150157
if len(bigtiff) > 0:
151158
arguments.append("-co BIGTIFF=" + bigtiff)
159+
152160
arguments.append(self.getParameterValue(self.INPUT))
153161
arguments.append(out)
154162

0 commit comments

Comments
 (0)
Please sign in to comment.