[processing] add help links for gdal/ogr alga

qgis · May 21, 2015 · 7a35d62 · 7a35d62
1 parent f1dc58c
commit 7a35d62
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/gdal/ClipByExtent.py b/python/plugins/processing/algs/gdal/ClipByExtent.py
@@ -83,3 +83,6 @@ def getConsoleCommands(self):
         arguments.append(out)
 
         return ['gdal_translate', GdalUtils.escapeAndJoin(arguments)]
+
+    def commandName(self):
+        return "gdal_translate"
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithm.py b/python/plugins/processing/algs/gdal/GdalAlgorithm.py
@@ -47,6 +47,23 @@ def getCustomParametersDialog(self):
 
     def processAlgorithm(self, progress):
         GdalUtils.runGdal(self.getConsoleCommands(), progress)
+
+    def help(self):
+        try:
+            return False, "http://www.gdal.org/%s.html" % self.commandName()   
+        except:
+            return False, None
+
+    def commandName(self):
+        alg = self.getCopy()
+        for output in alg.outputs:
+            output.setValue("dummy")
+        for param in alg.parameters:
+            param.setValue("1")
+        name = alg.getConsoleCommands()[0]
+        if name.endswith(".py"):
+            name = name[:-3]
+        return name
 
 
 class GdalScriptAlgorithm(ScriptAlgorithm):

diff --git a/python/plugins/processing/algs/gdal/aspect.py b/python/plugins/processing/algs/gdal/aspect.py
@@ -92,3 +92,4 @@ def getConsoleCommands(self):
             arguments.append('-zero_for_flat')
 
         return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]
+
diff --git a/python/plugins/processing/algs/gdal/gdal2xyz.py b/python/plugins/processing/algs/gdal/gdal2xyz.py
@@ -68,4 +68,4 @@ def getConsoleCommands(self):
         else:
             commands = ['gdal2xyz.py', GdalUtils.escapeAndJoin(arguments)]
 
-        return commands, progress
+        return commands
diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py
@@ -147,3 +147,5 @@ def getConsoleCommands(self):
 
         return commands
 
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py b/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
@@ -123,3 +123,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclip.py b/python/plugins/processing/algs/gdal/ogr2ogrclip.py
@@ -86,3 +86,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py b/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
@@ -91,3 +91,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py b/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
@@ -138,3 +138,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py b/python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py
@@ -146,3 +146,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py b/python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py
@@ -99,3 +99,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
@@ -192,4 +192,7 @@ def getConsoleCommands(self):
         else:
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
-        return commands
+        return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
@@ -274,3 +274,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -280,3 +280,6 @@ def getConsoleCommands(self):
             commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
 
         return commands
+
+    def commandName(self):
+        return "ogr2ogr"
diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py
@@ -48,7 +48,7 @@ def defineCharacteristics(self):
         self.addOutput(OutputHTML(self.OUTPUT, self.tr('Layer information')))
 
     def getConsoleCommands(self):
-        arguments = []
+        arguments = ["orginfo"]
         arguments.append('-al')
         arguments.append('-so')
         layer = self.getParameterValue(self.INPUT)

diff --git a/python/plugins/processing/algs/gdal/rasterize_over.py b/python/plugins/processing/algs/gdal/rasterize_over.py
@@ -54,7 +54,7 @@ def defineCharacteristics(self):
         self.addParameter(ParameterRaster(self.INPUT_RASTER,
             self.tr('Existing raster layer'), False))
 
-    def processAlgorithm(self, progress):
+    def getConsoleCommands(self, progress):
         inLayer = self.getParameterValue(self.INPUT)
         ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
         inRasterLayer = self.getParameterValue(self.INPUT_RASTER)

diff --git a/python/plugins/processing/core/GeoAlgorithm.py b/python/plugins/processing/core/GeoAlgorithm.py
@@ -119,7 +119,7 @@ def help(self):
 
         qgsVersion = QGis.QGIS_VERSION_INT
         major = qgsVersion / 10000
-        minor = minor = (qgsVersion - major * 10000) / 100
+        minor = (qgsVersion - major * 10000) / 100
         if minor % 2 == 1:
             qgsVersion = 'testing'
         else: