From c63d16a3b215aaf126031f5201388e18e0410ace Mon Sep 17 00:00:00 2001
From: Alexander Bruy <alexander.bruy@gmail.com>
Date: Mon, 18 Jan 2016 15:55:25 +0200
Subject: [PATCH] [gdaltools] allow multiple nodata valued in Build VRT tool
 (fix #11063)

---
 python/plugins/GdalTools/tools/doBuildVRT.py  |  8 +-
 .../plugins/GdalTools/tools/widgetBuildVRT.ui | 93 +++++++++----------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/python/plugins/GdalTools/tools/doBuildVRT.py b/python/plugins/GdalTools/tools/doBuildVRT.py
index 5380e101306..39b5b2d3f2e 100644
--- a/python/plugins/GdalTools/tools/doBuildVRT.py
+++ b/python/plugins/GdalTools/tools/doBuildVRT.py
@@ -52,7 +52,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
                 (self.inSelector, SIGNAL("filenameChanged()")),
                 (self.outSelector, SIGNAL("filenameChanged()")),
                 (self.resolutionComboBox, SIGNAL("currentIndexChanged(int)"), self.resolutionCheck),
-                (self.srcNoDataSpin, SIGNAL("valueChanged(int)"), self.srcNoDataCheck, 1700),
+                (self.noDataEdit, SIGNAL("textChanged( const QString & )"), self.srcNoDataCheck, 1700),
                 (self.inputDirCheck, SIGNAL("stateChanged(int)")),
                 (self.separateCheck, SIGNAL("stateChanged(int)"), None, 1700),
                 (self.targetSRSEdit, SIGNAL("textChanged(const QString &)"), self.targetSRSCheck),
@@ -145,8 +145,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
         if self.separateCheck.isChecked():
             arguments.append("-separate")
         if self.srcNoDataCheck.isChecked():
-            arguments.append("-srcnodata")
-            arguments.append(str(self.srcNoDataSpin.value()))
+            nodata = self.noDataEdit.text().strip()
+            if nodata:
+                arguments.append("-srcnodata")
+                arguments.append(nodata)
         if self.targetSRSCheck.isChecked() and self.targetSRSEdit.text():
             arguments.append("-a_srs")
             arguments.append(self.targetSRSEdit.text())
diff --git a/python/plugins/GdalTools/tools/widgetBuildVRT.ui b/python/plugins/GdalTools/tools/widgetBuildVRT.ui
index d385a667dc2..b7afae2a6b2 100644
--- a/python/plugins/GdalTools/tools/widgetBuildVRT.ui
+++ b/python/plugins/GdalTools/tools/widgetBuildVRT.ui
@@ -25,47 +25,10 @@
      <property name="sizeConstraint">
       <enum>QLayout::SetNoConstraint</enum>
      </property>
-     <item row="0" column="0" colspan="2">
-      <widget class="QCheckBox" name="inputSelLayersCheck">
+     <item row="10" column="0" colspan="2">
+      <widget class="QCheckBox" name="allowProjDiffCheck">
        <property name="text">
-        <string>Use visible raster layers for input</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
-     </item>
-     <item row="6" column="1">
-      <widget class="QSpinBox" name="srcNoDataSpin">
-       <property name="minimum">
-        <number>-100000</number>
-       </property>
-       <property name="maximum">
-        <number>65000</number>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QCheckBox" name="targetSRSCheck">
-       <property name="text">
-        <string>Target SRS</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QCheckBox" name="srcNoDataCheck">
-       <property name="text">
-        <string>&amp;Source No Data</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>&amp;Input files</string>
-       </property>
-       <property name="buddy">
-        <cstring>inSelector</cstring>
+        <string>Allow projection difference</string>
        </property>
       </widget>
      </item>
@@ -79,10 +42,16 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="2">
-      <widget class="QCheckBox" name="inputDirCheck">
+     <item row="2" column="1">
+      <widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string>Choose input directory instead of files</string>
+        <string>&amp;Input files</string>
+       </property>
+       <property name="buddy">
+        <cstring>inSelector</cstring>
        </property>
       </widget>
      </item>
@@ -93,15 +62,29 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="0" colspan="2">
-      <widget class="QCheckBox" name="allowProjDiffCheck">
+     <item row="1" column="0" colspan="2">
+      <widget class="QCheckBox" name="inputDirCheck">
        <property name="text">
-        <string>Allow projection difference</string>
+        <string>Choose input directory instead of files</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
+     <item row="4" column="1">
+      <widget class="GdalToolsInOutSelector" name="outSelector" native="true"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QCheckBox" name="targetSRSCheck">
+       <property name="text">
+        <string>Target SRS</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="inputSelLayersCheck">
+       <property name="text">
+        <string>Use visible raster layers for input</string>
+       </property>
+      </widget>
      </item>
      <item row="5" column="0">
       <widget class="QCheckBox" name="resolutionCheck">
@@ -138,6 +121,13 @@
        </item>
       </widget>
      </item>
+     <item row="6" column="0">
+      <widget class="QCheckBox" name="srcNoDataCheck">
+       <property name="text">
+        <string>&amp;Source No Data</string>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="1">
       <widget class="QCheckBox" name="recurseCheck">
        <property name="text">
@@ -159,6 +149,13 @@
        </item>
       </layout>
      </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="noDataEdit">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>