[QGIS Commit] r15470 - in trunk/qgis/python/plugins/GdalTools: . tools

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2011-03-13 16:46:37 -0700 (Sun, 13 Mar 2011)
New Revision: 15470

Modified:
   trunk/qgis/python/plugins/GdalTools/__init__.py
   trunk/qgis/python/plugins/GdalTools/tools/doClipper.py
Log:
make gdaltools clipper working with the raster provider


Modified: trunk/qgis/python/plugins/GdalTools/__init__.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/__init__.py	2011-03-13 23:21:00 UTC (rev 15469)
+++ trunk/qgis/python/plugins/GdalTools/__init__.py	2011-03-13 23:46:37 UTC (rev 15470)
@@ -22,7 +22,7 @@
 def description():
   return "Integrate gdal tools into qgis"
 def version(): 
-  return "Version 1.2.21" 
+  return "Version 1.2.22" 
 def qgisMinimumVersion():
   return "1.0"
 def icon():

Modified: trunk/qgis/python/plugins/GdalTools/tools/doClipper.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doClipper.py	2011-03-13 23:21:00 UTC (rev 15469)
+++ trunk/qgis/python/plugins/GdalTools/tools/doClipper.py	2011-03-13 23:46:37 UTC (rev 15470)
@@ -59,12 +59,14 @@
       for i in range(self.canvas.layerCount()-1, -1, -1): 
         layer = self.canvas.layer(i) 
         # only raster layers, but not WMS ones
-        if layer.type() == layer.RasterLayer and ( not layer.usesProvider() ):
-            # do not use the output file as input
-            if layer.source() == self.outputFileEdit.text():
-              continue
+        if layer.type() == layer.RasterLayer:
+          if layer.usesProvider() and layer.providerKey() != 'gdal':
+            continue
 
-            self.inputFiles << layer.source()
+        # do not use the output file as input
+        if layer.source() == self.outputFileEdit.text():
+          continue
+        self.inputFiles << layer.source()
 
       if self.inputFiles.isEmpty():
         self.extentSelector.stop()