Skip to content

Commit

Permalink
Merge pull request #1021 from etiennesky/gdal_merge
Browse files Browse the repository at this point in the history
fix gdal merge nodata value and UI improvements
  • Loading branch information
brushtyler committed Dec 9, 2013
2 parents 221263d + fdc3ba7 commit fc24767
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
3 changes: 3 additions & 0 deletions python/plugins/GdalTools/tools/doMerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
16 changes: 14 additions & 2 deletions python/plugins/GdalTools/tools/widgetMerge.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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"/>
Expand All @@ -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/>
Expand Down

0 comments on commit fc24767

Please sign in to comment.