Skip to content

Commit c63d16a

Browse files
alexbruyalexbruy
committedJan 18, 2016
[gdaltools] allow multiple nodata valued in Build VRT tool (fix #11063)
·
ltr-3_40archive/master_2
1 parent 20bf738 commit c63d16a

File tree

2 files changed

+42
-43
lines changed

2 files changed

+42
-43
lines changed
 

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(self, iface):
5252
(self.inSelector, SIGNAL("filenameChanged()")),
5353
(self.outSelector, SIGNAL("filenameChanged()")),
5454
(self.resolutionComboBox, SIGNAL("currentIndexChanged(int)"), self.resolutionCheck),
55-
(self.srcNoDataSpin, SIGNAL("valueChanged(int)"), self.srcNoDataCheck, 1700),
55+
(self.noDataEdit, SIGNAL("textChanged( const QString & )"), self.srcNoDataCheck, 1700),
5656
(self.inputDirCheck, SIGNAL("stateChanged(int)")),
5757
(self.separateCheck, SIGNAL("stateChanged(int)"), None, 1700),
5858
(self.targetSRSEdit, SIGNAL("textChanged(const QString &)"), self.targetSRSCheck),
@@ -145,8 +145,10 @@ def getArguments(self):
145145
if self.separateCheck.isChecked():
146146
arguments.append("-separate")
147147
if self.srcNoDataCheck.isChecked():
148-
arguments.append("-srcnodata")
149-
arguments.append(str(self.srcNoDataSpin.value()))
148+
nodata = self.noDataEdit.text().strip()
149+
if nodata:
150+
arguments.append("-srcnodata")
151+
arguments.append(nodata)
150152
if self.targetSRSCheck.isChecked() and self.targetSRSEdit.text():
151153
arguments.append("-a_srs")
152154
arguments.append(self.targetSRSEdit.text())

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

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,26 @@
2525
<property name="sizeConstraint">
2626
<enum>QLayout::SetNoConstraint</enum>
2727
</property>
28-
<item row="0" column="0" colspan="2">
29-
<widget class="QCheckBox" name="inputSelLayersCheck">
28+
<item row="10" column="0" colspan="2">
29+
<widget class="QCheckBox" name="allowProjDiffCheck">
3030
<property name="text">
31-
<string>Use visible raster layers for input</string>
32-
</property>
33-
</widget>
34-
</item>
35-
<item row="4" column="1">
36-
<widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
37-
</item>
38-
<item row="6" column="1">
39-
<widget class="QSpinBox" name="srcNoDataSpin">
40-
<property name="minimum">
41-
<number>-100000</number>
42-
</property>
43-
<property name="maximum">
44-
<number>65000</number>
31+
<string>Allow projection difference</string>
4532
</property>
4633
</widget>
4734
</item>
48-
<item row="7" column="0">
49-
<widget class="QCheckBox" name="targetSRSCheck">
35+
<item row="4" column="0">
36+
<widget class="QLabel" name="label_2">
5037
<property name="text">
51-
<string>Target SRS</string>
38+
<string>&amp;Output file</string>
5239
</property>
53-
</widget>
54-
</item>
55-
<item row="6" column="0">
56-
<widget class="QCheckBox" name="srcNoDataCheck">
57-
<property name="text">
58-
<string>&amp;Source No Data</string>
40+
<property name="buddy">
41+
<cstring>outSelector</cstring>
5942
</property>
6043
</widget>
6144
</item>
45+
<item row="2" column="1">
46+
<widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
47+
</item>
6248
<item row="2" column="0">
6349
<widget class="QLabel" name="label">
6450
<property name="text">
@@ -69,13 +55,10 @@
6955
</property>
7056
</widget>
7157
</item>
72-
<item row="4" column="0">
73-
<widget class="QLabel" name="label_2">
58+
<item row="8" column="0">
59+
<widget class="QCheckBox" name="separateCheck">
7460
<property name="text">
75-
<string>&amp;Output file</string>
76-
</property>
77-
<property name="buddy">
78-
<cstring>outSelector</cstring>
61+
<string>Se&amp;parate</string>
7962
</property>
8063
</widget>
8164
</item>
@@ -86,23 +69,23 @@
8669
</property>
8770
</widget>
8871
</item>
89-
<item row="8" column="0">
90-
<widget class="QCheckBox" name="separateCheck">
72+
<item row="4" column="1">
73+
<widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
74+
</item>
75+
<item row="7" column="0">
76+
<widget class="QCheckBox" name="targetSRSCheck">
9177
<property name="text">
92-
<string>Se&amp;parate</string>
78+
<string>Target SRS</string>
9379
</property>
9480
</widget>
9581
</item>
96-
<item row="10" column="0" colspan="2">
97-
<widget class="QCheckBox" name="allowProjDiffCheck">
82+
<item row="0" column="0" colspan="2">
83+
<widget class="QCheckBox" name="inputSelLayersCheck">
9884
<property name="text">
99-
<string>Allow projection difference</string>
85+
<string>Use visible raster layers for input</string>
10086
</property>
10187
</widget>
10288
</item>
103-
<item row="2" column="1">
104-
<widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
105-
</item>
10689
<item row="5" column="0">
10790
<widget class="QCheckBox" name="resolutionCheck">
10891
<property name="text">
@@ -138,6 +121,13 @@
138121
</item>
139122
</widget>
140123
</item>
124+
<item row="6" column="0">
125+
<widget class="QCheckBox" name="srcNoDataCheck">
126+
<property name="text">
127+
<string>&amp;Source No Data</string>
128+
</property>
129+
</widget>
130+
</item>
141131
<item row="3" column="1">
142132
<widget class="QCheckBox" name="recurseCheck">
143133
<property name="text">
@@ -159,6 +149,13 @@
159149
</item>
160150
</layout>
161151
</item>
152+
<item row="6" column="1">
153+
<widget class="QLineEdit" name="noDataEdit">
154+
<property name="text">
155+
<string>0</string>
156+
</property>
157+
</widget>
158+
</item>
162159
</layout>
163160
</item>
164161
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.