sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

[gdaltools] allow multiple nodata valued in Build VRT tool (fix #11063)

Browse Source
This commit is contained in:
Alexander Bruy 2016-01-18 15:55:25 +02:00
parent 20bf738f1c
commit c63d16a3b2
2 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/GdalTools/tools/doBuildVRT.py
View File

@ -52,7 +52,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
(self.inSelector, SIGNAL("filenameChanged()")), (self.inSelector, SIGNAL("filenameChanged()")),
(self.outSelector, SIGNAL("filenameChanged()")), (self.outSelector, SIGNAL("filenameChanged()")),
(self.resolutionComboBox, SIGNAL("currentIndexChanged(int)"), self.resolutionCheck), (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.inputDirCheck, SIGNAL("stateChanged(int)")),
(self.separateCheck, SIGNAL("stateChanged(int)"), None, 1700), (self.separateCheck, SIGNAL("stateChanged(int)"), None, 1700),
(self.targetSRSEdit, SIGNAL("textChanged(const QString &)"), self.targetSRSCheck), (self.targetSRSEdit, SIGNAL("textChanged(const QString &)"), self.targetSRSCheck),
@ -145,8 +145,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
if self.separateCheck.isChecked(): if self.separateCheck.isChecked():
arguments.append("-separate") arguments.append("-separate")
if self.srcNoDataCheck.isChecked(): if self.srcNoDataCheck.isChecked():
nodata = self.noDataEdit.text().strip()
if nodata:
arguments.append("-srcnodata") arguments.append("-srcnodata")
arguments.append(str(self.srcNoDataSpin.value())) arguments.append(nodata)
if self.targetSRSCheck.isChecked() and self.targetSRSEdit.text(): if self.targetSRSCheck.isChecked() and self.targetSRSEdit.text():
arguments.append("-a_srs") arguments.append("-a_srs")
arguments.append(self.targetSRSEdit.text()) arguments.append(self.targetSRSEdit.text())

93
python/plugins/GdalTools/tools/widgetBuildVRT.ui
View File

@ -25,47 +25,10 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum> <enum>QLayout::SetNoConstraint</enum>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="inputSelLayersCheck"> <widget class="QCheckBox" name="allowProjDiffCheck">
<property name="text"> <property name="text">
<string>Use visible raster layers for input</string> <string>Allow projection difference</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>
</property> </property>
</widget> </widget>
</item> </item>
@ -79,10 +42,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="2" column="1">
<widget class="QCheckBox" name="inputDirCheck"> <widget class="GdalToolsInOutSelector" name="inSelector" native="true"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Choose input directory instead of files</string> <string>&amp;Input files</string>
</property>
<property name="buddy">
<cstring>inSelector</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@ -93,15 +62,29 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="allowProjDiffCheck"> <widget class="QCheckBox" name="inputDirCheck">
<property name="text"> <property name="text">
<string>Allow projection difference</string> <string>Choose input directory instead of files</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="4" column="1">
<widget class="GdalToolsInOutSelector" name="inSelector" native="true"/> <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>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="resolutionCheck"> <widget class="QCheckBox" name="resolutionCheck">
@ -138,6 +121,13 @@
</item> </item>
</widget> </widget>
</item> </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"> <item row="3" column="1">
<widget class="QCheckBox" name="recurseCheck"> <widget class="QCheckBox" name="recurseCheck">
<property name="text"> <property name="text">
@ -159,6 +149,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="1">
<widget class="QLineEdit" name="noDataEdit">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>