[QGIS Commit] r14938 - in trunk/qgis/python/plugins/GdalTools: .
tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Dec 19 22:34:51 EST 2010
Author: brushtyler
Date: 2010-12-19 19:34:51 -0800 (Sun, 19 Dec 2010)
New Revision: 14938
Modified:
trunk/qgis/python/plugins/GdalTools/__init__.py
trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
trunk/qgis/python/plugins/GdalTools/tools/doProximity.py
trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py
trunk/qgis/python/plugins/GdalTools/tools/doWarp.py
trunk/qgis/python/plugins/GdalTools/tools/widgetProximity.ui
trunk/qgis/python/plugins/GdalTools/tools/widgetWarp.ui
Log:
allow multiple values in proximity tool,
allow multiple no-data values in warp tool,
fixed error in retrieving srs
Modified: trunk/qgis/python/plugins/GdalTools/__init__.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/__init__.py 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/__init__.py 2010-12-20 03:34:51 UTC (rev 14938)
@@ -1,6 +1,6 @@
"""
/***************************************************************************
-Name : GdalTools
+Name : GdalTools
Description : Integrate gdal tools into qgis
Date : 17/Sep/09
copyright : (C) 2009 by Lorenzo Masini and Giuseppe Sucameli (Faunalia)
@@ -22,7 +22,7 @@
def description():
return "Integrate gdal tools into qgis"
def version():
- return "Version 1.2.18"
+ return "Version 1.2.19"
def qgisMinimumVersion():
return "1.0"
def icon():
Modified: trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py 2010-12-20 03:34:51 UTC (rev 14938)
@@ -184,11 +184,13 @@
arr = processSRS.readAllStandardOutput()
processSRS.close()
- if not arr.isEmpty():
- info = QString( arr ).split( "\n" ).filter( "AUTHORITY" )
- if info.count() == 0:
- return QString()
+ if arr.isEmpty():
+ return QString()
+ info = QString( arr ).split( "\n" ).filter( "AUTHORITY" )
+ if info.count() == 0:
+ return QString()
+
srs = info[ info.count() - 1 ]
srs = srs.simplified().remove( "AUTHORITY[" )
srs = srs.remove( QRegExp( "\]{2,4},?" ) ).remove( "\"" )
@@ -294,7 +296,7 @@
# workaround for QGis < 1.5 (see #2376)
# separates multiple extensions that joined by a slash
- if QGis.QGIS_VERSION[0:3] < "1.8":
+ if QGis.QGIS_VERSION[0:3] < "1.5":
formats = self.rastersFilter.split( ";;" )
self.rastersFilter = QString()
for f in formats:
Modified: trunk/qgis/python/plugins/GdalTools/tools/doProximity.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doProximity.py 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/doProximity.py 2010-12-20 03:34:51 UTC (rev 14938)
@@ -26,7 +26,7 @@
[
(self.inputLayerCombo, [SIGNAL("currentIndexChanged(int)"), SIGNAL("editTextChanged(const QString &)")] ),
(self.outputFileEdit, SIGNAL("textChanged(const QString &)")),
- ([self.valueSpin1, self.valueSpin2, self.valueSpin3], SIGNAL("valueChanged(int)"), self.valuesCheck),
+ (self.valuesEdit, SIGNAL("textChanged(const QString &)"), self.valuesCheck),
(self.distUnitsCombo, SIGNAL("currentIndexChanged(int)"), self.distUnitsCheck),
(self.maxDistSpin, SIGNAL("valueChanged(int)"), self.maxDistCheck),
(self.noDataSpin, SIGNAL("valueChanged(int)"), self.noDataCheck),
@@ -73,8 +73,10 @@
arguments << self.inputLayerCombo.currentText()
arguments << self.outputFileEdit.text()
if self.valuesCheck.isChecked():
- arguments << "-values"
- arguments << ",".join([str(self.valueSpin1.value()), str(self.valueSpin2.value()), str(self.valueSpin3.value())])
+ values = self.valuesEdit.text().trimmed()
+ if not values.isEmpty():
+ arguments << "-values"
+ arguments << values.replace(' ', ',')
if self.distUnitsCheck.isChecked() and self.distUnitsCombo.currentIndex() >= 0:
arguments << "-distunits"
arguments << self.distUnitsCombo.currentText()
Modified: trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py 2010-12-20 03:34:51 UTC (rev 14938)
@@ -132,10 +132,17 @@
workDir = QDir( inputDir )
workDir.setFilter( QDir.Files | QDir.NoSymLinks | QDir.NoDotAndDotDot )
workDir.setNameFilters( filter )
- if workDir.entryList().count() > 0:
- fl = inputDir + "/" + workDir.entryList()[ 0 ]
- self.targetSRSEdit.setText( Utils.getRasterSRS( self, fl ) )
+ # search for a valid SRS, then use it as default target SRS
+ srs = QString()
+ for fname in workDir.entryList():
+ fl = inputDir + "/" + fname
+ srs = Utils.getRasterSRS( self, fl )
+ if not srs.isEmpty():
+ break
+ self.targetSRSEdit.setText( srs )
+
+
def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
Modified: trunk/qgis/python/plugins/GdalTools/tools/doWarp.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doWarp.py 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/doWarp.py 2010-12-20 03:34:51 UTC (rev 14938)
@@ -180,13 +180,11 @@
arguments << str( self.heightSpin.value() )
if self.multithreadCheck.isChecked():
arguments << "-multi"
- if self.noDataCheck.isChecked() and not self.noDataEdit.text().isEmpty():
- arguments << "-dstnodata"
- nd = self.noDataEdit.text().simplified()
- if nd.contains( " " ):
- arguments << '"' + nd + '"'
- else:
- arguments << nd
+ if self.noDataCheck.isChecked():
+ nodata = self.noDataEdit.text().trimmed()
+ if not nodata.isEmpty():
+ arguments << "-dstnodata"
+ arguments << nodata
if self.isBatchEnabled():
return arguments
Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetProximity.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetProximity.ui 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetProximity.ui 2010-12-20 03:34:51 UTC (rev 14938)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>356</width>
- <height>257</height>
+ <width>327</width>
+ <height>253</height>
</rect>
</property>
<property name="sizePolicy">
@@ -90,31 +90,6 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QSpinBox" name="valueSpin1">
- <property name="maximum">
- <number>65000</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="valueSpin2">
- <property name="maximum">
- <number>65000</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="valueSpin3">
- <property name="maximum">
- <number>65000</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="3" column="0">
<widget class="QCheckBox" name="distUnitsCheck">
<property name="text">
@@ -181,6 +156,13 @@
</property>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="valuesEdit">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetWarp.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetWarp.ui 2010-12-20 03:15:01 UTC (rev 14937)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetWarp.ui 2010-12-20 03:34:51 UTC (rev 14938)
@@ -192,12 +192,16 @@
<item row="5" column="0">
<widget class="QCheckBox" name="noDataCheck">
<property name="text">
- <string>Set no data value</string>
+ <string>No data values</string>
</property>
</widget>
</item>
<item row="5" column="1">
- <widget class="QLineEdit" name="noDataEdit"/>
+ <widget class="QLineEdit" name="noDataEdit">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="cacheCheck">
More information about the QGIS-commit
mailing list