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

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2011-03-12 17:16:00 -0800 (Sat, 12 Mar 2011)
New Revision: 15459

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


Modified: trunk/qgis/python/plugins/GdalTools/GdalTools.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/GdalTools.py	2011-03-12 22:58:17 UTC (rev 15458)
+++ trunk/qgis/python/plugins/GdalTools/GdalTools.py	2011-03-13 01:16:00 UTC (rev 15459)
@@ -89,7 +89,7 @@
     rasterText = QCoreApplication.translate( "QgisApp", "&Raster" )
 
     for a in actions:
-        if a.menu().title() == rasterText:
+        if a.menu() != None and a.menu().title() == rasterText:
             rasterMenu = a.menu()
             break
 

Modified: trunk/qgis/python/plugins/GdalTools/__init__.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/__init__.py	2011-03-12 22:58:17 UTC (rev 15458)
+++ trunk/qgis/python/plugins/GdalTools/__init__.py	2011-03-13 01:16:00 UTC (rev 15459)
@@ -22,7 +22,7 @@
 def description():
   return "Integrate gdal tools into qgis"
 def version(): 
-  return "Version 1.2.20" 
+  return "Version 1.2.21" 
 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	2011-03-12 22:58:17 UTC (rev 15458)
+++ trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2011-03-13 01:16:00 UTC (rev 15459)
@@ -98,7 +98,9 @@
   layerMap = QgsMapLayerRegistry.instance().mapLayers()
   for name, layer in layerMap.iteritems():
     # only raster layers, but not WMS ones
-    if layer.type() == layer.RasterLayer and ( not layer.usesProvider() ):
+    if layer.type() == layer.RasterLayer:
+      if layer.usesProvider() and layer.providerKey() != 'gdal':
+        continue
       layers[count] = layer
       names.append(layer.name())
       count = count +1