Skip to content

Commit ef56c53

Browse files
jef-njef-n
committedOct 29, 2014
GDAL tools: put tif back to top for save file dialog formats (fixes #11507)
1 parent 75bfc1b commit ef56c53

File tree

14 files changed

+39
-13
lines changed

14 files changed

+39
-13
lines changed
 

‎python/plugins/GdalTools/tools/GdalTools_utils.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,30 @@ def allRastersFilter(self):
430430

431431
return self.rastersFilter
432432

433+
# Retrieves the filter for supported raster files to save
434+
# Skip *, *.zip and *.vrt and move tif to top
435+
# TODO: only the formats with GDAL_DCAP_CREATE
436+
@classmethod
437+
def saveRastersFilter(self):
438+
# move tif to top if available
439+
available = self.allRastersFilter().split(";;")
440+
441+
filters = []
442+
443+
for f in available:
444+
if "*.tif" in f:
445+
filters.append( f )
446+
break
447+
448+
for f in available:
449+
if "*.tif" in f or "*.zip" in f or "(*)" in f:
450+
continue
451+
452+
filters.append( f )
453+
454+
return ";;".join( filters )
455+
456+
433457
# Retrieves the last used filter for raster files
434458
# Note: filter string is in a list
435459
@classmethod

‎python/plugins/GdalTools/tools/doClipper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def fillInputFileEdit(self):
112112

113113
def fillOutputFileEdit(self):
114114
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
115-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
115+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter)
116116
if outputFile == '':
117117
return
118118
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doDEM.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def fillInputFileEdit(self):
108108

109109
def fillOutputFileEdit(self):
110110
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
111-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
111+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
112112
if not outputFile:
113113
return
114114
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doFillNodata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def fillInputFile( self ):
118118

119119
def fillOutputFile( self ):
120120
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
121-
outputFile = Utils.FileDialog.getSaveFileName( self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
121+
outputFile = Utils.FileDialog.getSaveFileName( self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
122122
if not outputFile:
123123
return
124124
Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter )

‎python/plugins/GdalTools/tools/doGrid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def fillInputFileEdit(self):
113113

114114
def fillOutputFileEdit(self):
115115
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
116-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
116+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
117117
if not outputFile:
118118
return
119119
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doMerge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def refreshExtent(self):
121121

122122
def fillOutputFileEdit(self):
123123
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
124-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select where to save the Merge output" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
124+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select where to save the Merge output" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
125125
if not outputFile:
126126
return
127127
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doNearBlack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def fillInputFileEdit(self):
7373

7474
def fillOutputFileEdit(self):
7575
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
76-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
76+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter)
7777
if not outputFile:
7878
return
7979
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doPctRgb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def fillInputFile(self):
109109

110110
def fillOutputFileEdit(self):
111111
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
112-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
112+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
113113
if not outputFile:
114114
return
115115
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doProximity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def fillInputFileEdit(self):
7676

7777
def fillOutputFileEdit(self):
7878
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
79-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
79+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter)
8080
if not outputFile:
8181
return
8282
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doRasterize.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,12 @@ def fillOutputFileEdit(self):
9696
gdalVersion = Utils.GdalConfig.versionNum()
9797
if gdalVersion >= 1800:
9898
fileDialogFunc = Utils.FileDialog.getSaveFileName
99+
filters = Utils.FileFilter.saveRastersFilter()
99100
else:
100101
fileDialogFunc = Utils.FileDialog.getOpenFileName
102+
filters = Utils.FileFilter.allRastersFilter()
101103

102-
outputFile = fileDialogFunc(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
104+
outputFile = fileDialogFunc(self, self.tr( "Select the raster file to save the results to" ), filters, lastUsedFilter)
103105
if not outputFile:
104106
return
105107
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doRgbPct.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def fillInputFile(self):
106106

107107
def fillOutputFileEdit(self):
108108
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
109-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
109+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
110110
if not outputFile:
111111
return
112112
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doSieve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def fillInputFileEdit(self):
7171

7272
def fillOutputFileEdit(self):
7373
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
74-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
74+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
7575
if not outputFile:
7676
return
7777
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doTranslate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def fillInputDir( self ):
158158

159159
def fillOutputFileEdit(self):
160160
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
161-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
161+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
162162
if not outputFile:
163163
return
164164
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

‎python/plugins/GdalTools/tools/doWarp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def fillInputFile(self):
126126

127127
def fillOutputFileEdit(self):
128128
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
129-
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
129+
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.saveRastersFilter(), lastUsedFilter )
130130
if not outputFile:
131131
return
132132
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

0 commit comments

Comments
 (0)