Merge pull request #1021 from etiennesky/gdal_merge

fix gdal merge nodata value and UI improvements
qgis · Dec 9, 2013 · fc24767 · fc24767
2 parents 221263d + fdc3ba7
commit fc24767
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/python/plugins/GdalTools/tools/doMerge.py b/python/plugins/GdalTools/tools/doMerge.py
@@ -147,6 +147,9 @@ def getArguments(self):
       if self.noDataCheck.isChecked():
         arguments.append("-n")
         arguments.append(str(self.noDataSpin.value()))
+        if Utils.GdalConfig.versionNum() >= 1900:
+          arguments.append("-a_nodata")
+          arguments.append(str(self.noDataSpin.value()))
       if self.separateCheck.isChecked():
         arguments.append("-separate")
       if self.pctCheck.isChecked():

diff --git a/python/plugins/GdalTools/tools/widgetMerge.ui b/python/plugins/GdalTools/tools/widgetMerge.ui
@@ -106,7 +106,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="creationOptionsGroupBox">
+    <widget class="QgsCollapsibleGroupBox" name="creationOptionsGroupBox">
      <property name="title">
       <string>&amp;Creation Options</string>
      </property>
@@ -116,9 +116,15 @@
      <property name="checked">
       <bool>false</bool>
      </property>
+     <property name="collapsed" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="saveCollapsedState" stdset="0">
+      <bool>true</bool>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">
-       <number>0</number>
+       <number>9</number>
       </property>
       <item>
        <widget class="QgsRasterFormatSaveOptionsWidget" name="creationOptionsWidget" native="true"/>
@@ -141,6 +147,12 @@
    <header>qgis.gui</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>qgis.gui</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>