Skip to content

Commit d7811a1

Browse files
brushtylerbrushtyler
committed
allow to choose input directory in GdalTools Merge tool (fix #4930)
1 parent 767ee01 commit d7811a1

File tree

2 files changed

+78
-27
lines changed

2 files changed

+78
-27
lines changed

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

+56-19
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def __init__(self, iface):
1919

2020
self.inSelector.setType( self.inSelector.FILE )
2121
self.outSelector.setType( self.outSelector.FILE )
22+
self.recurseCheck.hide()
2223

2324
self.outputFormat = Utils.fillRasterOutputFormat()
2425
self.extent = None
@@ -28,7 +29,9 @@ def __init__(self, iface):
2829
(self.inSelector, SIGNAL("filenameChanged()")),
2930
(self.outSelector, SIGNAL("filenameChanged()")),
3031
(self.noDataSpin, SIGNAL("valueChanged(int)"), self.noDataCheck),
31-
( self.separateCheck, SIGNAL( "stateChanged( int )" ) ),
32+
(self.inputDirCheck, SIGNAL("stateChanged(int)")),
33+
(self.recurseCheck, SIGNAL("stateChanged(int)"), self.inputDirCheck),
34+
( self.separateCheck, SIGNAL( "stateChanged( int )" ) ),
3235
( self.pctCheck, SIGNAL( "stateChanged( int )" ) ),
3336
( self.intersectCheck, SIGNAL( "stateChanged( int )" ) ),
3437
(self.creationOptionsTable, [SIGNAL("cellValueChanged(int, int)"), SIGNAL("rowRemoved()")], self.creationGroupBox)
@@ -37,37 +40,57 @@ def __init__(self, iface):
3740

3841
self.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFilesEdit)
3942
self.connect(self.outSelector, SIGNAL("selectClicked()"), self.fillOutputFileEdit)
40-
self.connect(self.intersectCheck, SIGNAL("stateChanged(int)"), self.refreshExtent)
43+
self.connect(self.intersectCheck, SIGNAL("toggled(bool)"), self.refreshExtent)
44+
self.connect(self.inputDirCheck, SIGNAL("stateChanged( int )"), self.switchToolMode)
45+
self.connect(self.inSelector, SIGNAL("filenameChanged()"), self.refreshExtent)
46+
47+
def switchToolMode(self):
48+
self.recurseCheck.setVisible( self.inputDirCheck.isChecked() )
49+
self.inSelector.clear()
50+
51+
if self.inputDirCheck.isChecked():
52+
self.inFileLabel = self.label.text()
53+
self.label.setText( QCoreApplication.translate( "GdalTools", "&Input directory" ) )
54+
55+
QObject.disconnect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFilesEdit)
56+
QObject.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputDir)
57+
else:
58+
self.label.setText( self.inFileLabel )
59+
60+
QObject.connect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputFilesEdit)
61+
QObject.disconnect(self.inSelector, SIGNAL("selectClicked()"), self.fillInputDir)
4162

4263
def fillInputFilesEdit(self):
4364
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
4465
files = Utils.FileDialog.getOpenFileNames(self, self.tr( "Select the files to Merge" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
4566
if files.isEmpty():
4667
return
4768
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
69+
self.inSelector.setFilename(files)
4870

49-
self.inSelector.setFilename(files.join(","))
71+
def refreshExtent(self):
72+
files = self.getInputFileNames()
5073
self.intersectCheck.setEnabled( files.count() > 1 )
51-
self.refreshExtent()
5274

53-
def refreshExtent(self):
54-
files = self.getInputFileName()
75+
if not self.intersectCheck.isChecked():
76+
self.someValueChanged()
77+
return
78+
5579
if files.count() < 2:
5680
self.intersectCheck.setChecked( False )
57-
self.extent = None
5881
return
5982

60-
self.extent = self.getExtent()
61-
self.someValueChanged()
62-
63-
if not self.intersectCheck.isChecked():
64-
return
83+
self.extent = self.getIntersectedExtent( files )
6584

6685
if self.extent == None:
6786
QMessageBox.warning( self, self.tr( "Error retrieving the extent" ), self.tr( 'GDAL was unable to retrieve the extent from any file. \nThe "Use intersected extent" option will be unchecked.' ) )
6887
self.intersectCheck.setChecked( False )
88+
return
89+
6990
elif self.extent.isEmpty():
7091
QMessageBox.warning( self, self.tr( "Empty extent" ), self.tr( 'The computed extent is empty. \nDisable the "Use intersected extent" option to have a nonempty output.' ) )
92+
93+
self.someValueChanged()
7194

7295
def fillOutputFileEdit(self):
7396
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
@@ -79,6 +102,12 @@ def fillOutputFileEdit(self):
79102
self.outputFormat = Utils.fillRasterOutputFormat( lastUsedFilter, outputFile )
80103
self.outSelector.setFilename( outputFile )
81104

105+
def fillInputDir( self ):
106+
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Merge" ))
107+
if inputDir.isEmpty():
108+
return
109+
self.inSelector.setFilename( inputDir )
110+
82111
def getArguments(self):
83112
arguments = QStringList()
84113
if self.intersectCheck.isChecked():
@@ -105,31 +134,39 @@ def getArguments(self):
105134
arguments << self.outputFormat
106135
arguments << "-o"
107136
arguments << outputFn
108-
arguments << self.getInputFileName()
137+
arguments << self.getInputFileNames()
109138
return arguments
110139

111140
def getOutputFileName(self):
112141
return self.outSelector.filename()
113142

114143
def getInputFileName(self):
115-
return self.inSelector.filename().split( "," )
144+
if self.inputDirCheck.isChecked():
145+
return self.inSelector.filename()
146+
return self.inSelector.filename().split(",", QString.SkipEmptyParts)
147+
148+
def getInputFileNames(self):
149+
if self.inputDirCheck.isChecked():
150+
return Utils.getRasterFiles( self.inSelector.filename(), self.recurseCheck.isChecked() )
151+
return self.inSelector.filename().split(",", QString.SkipEmptyParts)
116152

117153
def addLayerIntoCanvas(self, fileInfo):
118154
self.iface.addRasterLayer(fileInfo.filePath())
119155

120-
def getExtent( self ):
121-
files = self.getInputFileName()
122-
123-
i = 0
124-
res = rect2 = None
156+
def getIntersectedExtent(self, files):
157+
res = None
125158
for fileName in files:
126159
if res == None:
127160
res = Utils.getRasterExtent( self, fileName )
128161
continue
162+
129163
rect2 = Utils.getRasterExtent( self, fileName )
130164
if rect2 == None:
131165
continue
166+
132167
res = res.intersect( rect2 )
168+
if res.isEmpty():
169+
break
133170

134171
return res
135172

‎python/plugins/GdalTools/tools/widgetMerge.ui

+22-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>342</width>
10-
<height>226</height>
9+
<width>345</width>
10+
<height>276</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -22,7 +22,7 @@
2222
<layout class="QVBoxLayout" name="verticalLayout">
2323
<item>
2424
<layout class="QGridLayout" name="gridLayout">
25-
<item row="0" column="0">
25+
<item row="1" column="0">
2626
<widget class="QLabel" name="label">
2727
<property name="text">
2828
<string>&amp;Input files</string>
@@ -32,7 +32,7 @@
3232
</property>
3333
</widget>
3434
</item>
35-
<item row="1" column="0">
35+
<item row="3" column="0">
3636
<widget class="QLabel" name="label_2">
3737
<property name="text">
3838
<string>&amp;Output file</string>
@@ -42,14 +42,14 @@
4242
</property>
4343
</widget>
4444
</item>
45-
<item row="2" column="0">
45+
<item row="4" column="0">
4646
<widget class="QCheckBox" name="noDataCheck">
4747
<property name="text">
4848
<string>&amp;No data value</string>
4949
</property>
5050
</widget>
5151
</item>
52-
<item row="2" column="1">
52+
<item row="4" column="1">
5353
<widget class="QSpinBox" name="noDataSpin">
5454
<property name="minimum">
5555
<number>-100000</number>
@@ -59,12 +59,26 @@
5959
</property>
6060
</widget>
6161
</item>
62-
<item row="0" column="1">
62+
<item row="1" column="1">
6363
<widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
6464
</item>
65-
<item row="1" column="1">
65+
<item row="3" column="1">
6666
<widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
6767
</item>
68+
<item row="0" column="0" colspan="2">
69+
<widget class="QCheckBox" name="inputDirCheck">
70+
<property name="text">
71+
<string>Choose input directory instead of files</string>
72+
</property>
73+
</widget>
74+
</item>
75+
<item row="2" column="1">
76+
<widget class="QCheckBox" name="recurseCheck">
77+
<property name="text">
78+
<string>Recurse subdirectories</string>
79+
</property>
80+
</widget>
81+
</item>
6882
</layout>
6983
</item>
7084
<item>

0 commit comments

Comments
 (0)