Did some R and GRASS testing and debugging

Added the OTB folder with a skeleton of OTB alg provider git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@70 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 11, 2012 · 3eba62c · 3eba62c
1 parent b86bbe5
commit 3eba62c
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 26 deletions.
diff --git a/src/otb/OTBAlgorithmProvider.py b/src/otb/OTBAlgorithmProvider.py
@@ -0,0 +1,23 @@
+import os
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from sextante.core.AlgorithmProvider import AlgorithmProvider
+
+class GdalAlgorithmProvider(AlgorithmProvider):
+
+    def __init__(self):
+        AlgorithmProvider.__init__(self)
+        self.createAlgsList()
+
+    def getName(self):
+        return "OTB"
+
+    def getIcon(self):
+        return QIcon(os.path.dirname(__file__) + "/icons/otb.png")
+
+    def _loadAlgorithms(self):
+        self.algs = self.preloadedAlgs
+
+    def createAlgsList(self):
+        self.preloadedAlgs = []
+
diff --git a/src/otb/__init__.py b/src/otb/__init__.py
diff --git a/src/sextante/core/SextanteConfig.py b/src/sextante/core/SextanteConfig.py
@@ -10,12 +10,14 @@ class SextanteConfig():
     VECTOR_POLYGON_STYLE = "VECTOR_POLYGON_STYLE"
     SHOW_RECENT_ALGORITHMS = "SHOW_RECENT_ALGORITHMS"
     USE_SELECTED = "USE_SELECTED"
+    USE_FILENAME_AS_LAYER_NAME = "USE_FILENAME_AS_LAYER_NAME"
 
     settings = {}
 
     @staticmethod
     def initialize():
         SextanteConfig.addSetting(Setting("General", SextanteConfig.USE_SELECTED, "Use only selected features in external application", True))
+        SextanteConfig.addSetting(Setting("General", SextanteConfig.USE_FILENAME_AS_LAYER_NAME, "Use filename as layer name", True))
         SextanteConfig.addSetting(Setting("General", SextanteConfig.SHOW_RECENT_ALGORITHMS, "Show recently executed algorithms", True))
         SextanteConfig.addSetting(Setting("General", SextanteConfig.OUTPUT_FOLDER,
                                            "Output folder", SextanteUtils.tempFolder()))

diff --git a/src/sextante/gdal/GdalUtils.py b/src/sextante/gdal/GdalUtils.py
@@ -39,6 +39,7 @@ def getSupportedRasters():
             gdal.AllRegister()
 
         GdalUtils.supportedRasters = {}
+        GdalUtils.supportedRasters["GTiff"] = ["tif"]
         for i in range(gdal.GetDriverCount()):
             driver = gdal.GetDriver(i)
             if driver == None:

diff --git a/src/sextante/grass/GrassAlgorithm.py b/src/sextante/grass/GrassAlgorithm.py
@@ -74,15 +74,14 @@ def calculateRegion(self):
                         layer = param.value
                     else:
                         layer = QGisLayers.getObjectFromUri(param.value)
-                    self.addToResamplingExtent(layer, first)
+                    self.addToRegion(layer, first)
                     first = False
                 elif isinstance(param, ParameterMultipleInput):
-                    if param.datatype == ParameterMultipleInput.TYPE_RASTER:
-                        layers = param.value.split(";")
-                        for layername in layers:
-                            layer = QGisLayers.getObjectFromUri(layername, first)
-                            self.addToResamplingExtent(layer, first)
-                            first = False
+                    layers = param.value.split(";")
+                    for layername in layers:
+                        layer = QGisLayers.getObjectFromUri(layername, first)
+                        self.addToRegion(layer, first)
+                        first = False
         else:
             self.xmin = SextanteConfig.getSetting(GrassUtils.GRASS_REGION_XMIN)
             self.xmax = SextanteConfig.getSetting(GrassUtils.GRASS_REGION_XMAX)
@@ -93,11 +92,13 @@ def calculateRegion(self):
 
     def addToRegion(self, layer, first):
         if first:
+            self.cellsize = 0
             self.xmin = layer.extent().xMinimum()
             self.xmax = layer.extent().xMaximum()
             self.ymin = layer.extent().yMinimum()
             self.ymax = layer.extent().yMaximum()
-            self.cellsize = (layer.extent().xMaximum() - layer.extent().xMinimum())/layer.width()
+            if isinstance(layer, QgsRasterLayer):
+                self.cellsize = (layer.extent().xMaximum() - layer.extent().xMinimum())/layer.width()
         else:
             self.xmin = min(self.xmin, layer.extent().xMinimum())
             self.xmax = max(self.xmax, layer.extent().xMaximum())
@@ -246,7 +247,7 @@ def exportRasterLayer(self, layer):
         self.exportedLayers[layer]= destFilename
         command = "r.in.gdal"
         command +=" input=\"" + layer + "\""
-        command +=" band=0"
+        command +=" band=1"
         command +=" out=" + destFilename;
         command +=" --overwrite -o"
         return command

diff --git a/src/sextante/grass/GrassUtils.py b/src/sextante/grass/GrassUtils.py
@@ -73,8 +73,8 @@ def createGrassScript(commands):
 
         #temporary gisrc file
         output = open(gisrc, "w")
-        mapset = "temp_mapset"
         location = "temp_location"
+        mapset = "user"
         gisdbase = os.path.join(os.path.expanduser("~"), "sextante", "tempdata", "grassdata")
         output.write("GISDBASE: " + gisdbase + "\n");
         output.write("LOCATION_NAME: " + location + "\n");
@@ -83,11 +83,10 @@ def createGrassScript(commands):
         output.close();
 
         output=open(script, "w")
-        shToolsPath = os.path.basename(shell)
         output.write("set HOME=" + os.path.expanduser("~") + "\n");
         output.write("set GISRC=" + gisrc + "\n")
-        output.write("set GRASS_SH=" + shell + "\n")
-        output.write("set PATH=" + shToolsPath + os.sep + "bin;" + shToolsPath + os.sep + "lib;" + "%PATH%\n")
+        output.write("set GRASS_SH=" + shell + "\\bin\\sh.exe\n")
+        output.write("set PATH=" + shell + os.sep + "bin;" + shell + os.sep + "lib;" + "%PATH%\n")
         output.write("set WINGISBASE=" + folder + "\n")
         output.write("set GISBASE=" + folder + "\n");
         output.write("set GRASS_PROJSHARE=" + folder + os.sep + "share" + os.sep + "proj" + "\n")
@@ -104,9 +103,9 @@ def createGrassScript(commands):
         output.write("set PATHEXT=%PATHEXT%;.PY\n")
         output.write("set PYTHONPATH=%PYTHONPATH%;%WINGISBASE%\\etc\\python;%WINGISBASE%\\etc\\wxpython\\n");
         output.write("\n")
-        output.write("g.gisenv.exe set=\"MAPSET=" + mapset + "\"\n")
-        output.write("g.gisenv.exe set=\"LOCATION=" + location + "\"\n")
-        output.write("g.gisenv.exe set=\"LOCATION_NAME=" + location + "\"\n")
+        output.write("g.gisenv.exe set=\"MAPSET= " + mapset + "\n")
+        output.write("g.gisenv.exe set=\"LOCATION=" + location + "\n")
+        output.write("g.gisenv.exe set=\"LOCATION_NAME=" + location + "\n")
         output.write("g.gisenv.exe set=\"GISDBASE=" + gisdbase + "\"\n")
         output.write("g.gisenv.exe set=\"GRASS_GUI=text\"\n")
         for command in commands:
@@ -125,7 +124,7 @@ def createGrassBatchJobFileFromGrassCommands(commands):
 
     @staticmethod
     def grassMapsetFolder():
-        tempfolder = os.path.join(os.path.expanduser("~"), "sextante", "tempdata", "grassdata", "temp_location", "temp_mapset")
+        tempfolder = os.path.join(os.path.expanduser("~"), "sextante", "tempdata", "grassdata", "temp_location")
         mkdir(tempfolder)
         return tempfolder
 
@@ -141,7 +140,7 @@ def createTempMapset():
         mkdir(os.path.join(folder, "PERMANENT"))
         mkdir(os.path.join(folder, "user"))
         mkdir(os.path.join(folder, "PERMANENT", ".tmp"))
-        mkdir(os.path.join(folder, "PERMANENT", "DEFAULT_WIND"))
+        GrassUtils.writeGrassWindow(os.path.join(folder, "PERMANENT", "DEFAULT_WIND"));
         outfile = open(os.path.join(folder, "PERMANENT", "MYNAME"), "w")
         if not latlon:
             outfile.write("SEXTANTE GRASS interface: temporary x/y data processing location.\n");
@@ -229,10 +228,11 @@ def executeGrass(commands, progress):
         for line in iter(proc.readline, ""):
             if "GRASS_INFO_PERCENT" in line:
                 try:
-                    progress.setPercentage(line[line.rfind(":") + 2:])
+                    progress.setPercentage(int(line[len("GRASS_INFO_PERCENT")+ 2:]))
                 except:
                     pass
-            loglines.append(line)
+            else:
+                loglines.append(line)
         SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
         shutil.rmtree(GrassUtils.grassMapsetFolder(), True)
 

diff --git a/src/sextante/gui/SextantePostprocessing.py b/src/sextante/gui/SextantePostprocessing.py
@@ -7,6 +7,8 @@
 from sextante.gui.RenderingStyles import RenderingStyles
 from sextante.outputs.OutputHTML import OutputHTML
 from PyQt4.QtGui import *
+from sextante.core.SextanteConfig import SextanteConfig
+import os
 class SextantePostprocessing:
 
     @staticmethod
@@ -17,7 +19,11 @@ def handleAlgorithmResults(alg):
                 continue
             if isinstance(out, (OutputRaster, OutputVector, OutputTable)):
                 try:
-                    QGisLayers.load(out.value, out.description, alg.crs, RenderingStyles.getStyle(alg.commandLineName(),out.name))
+                    if SextanteConfig.getSetting(SextanteConfig.USE_FILENAME_AS_LAYER_NAME):
+                        name = os.path.basename(out.value)
+                    else:
+                        name = out.description
+                    QGisLayers.load(out.value, name, alg.crs, RenderingStyles.getStyle(alg.commandLineName(),out.name))
                 except Exception, e:
                     QMessageBox.critical(None, "Error", str(e))
             elif isinstance(out, OutputHTML):

diff --git a/src/sextante/r/RAlgorithm.py b/src/sextante/r/RAlgorithm.py
@@ -36,7 +36,7 @@ def __init__(self, descriptionfile):
         self.defineCharacteristicsFromFile()
 
     def getIcon(self):
-        return QtGui.QIcon(os.path.dirname(__file__) + "/../images/script.png")
+        return QtGui.QIcon(os.path.dirname(__file__) + "/../images/r.png")
 
     def defineCharacteristicsFromFile(self):
         self.script = ""
@@ -212,7 +212,7 @@ def getImportCommands(self):
                 filename = os.path.basename(value)
                 filename = filename[:-4]
                 commands.append(param.name + " = readOGR(\"" + value + "\",layer=\"" + filename + "\")")
-            if isinstance(param, ParameterVector):
+            if isinstance(param, ParameterTable):
                 value = param.value
                 if not value.lower().endswith("csv"):
                     raise GeoAlgorithmExecutionException("Unsupported input file format.\n" + value)

diff --git a/src/sextante/r/RUtils.py b/src/sextante/r/RUtils.py
@@ -1,3 +1,4 @@
+from PyQt4.QtGui import *
 from sextante.core.SextanteConfig import SextanteConfig
 import os
 from sextante.core.SextanteUtils import mkdir, SextanteUtils
@@ -69,8 +70,8 @@ def createConsoleOutput():
         RUtils.allConsoleResults = []
         add = False
         lines = open(RUtils.getConsoleOutputFilename())
-        line = lines.readline().strip("\n").strip(" ")
-        while line != "":
+        for line in lines:
+            line = line.strip("\n").strip(" ")
             if line.startswith(">"):
                 line = line[1:].strip(" ")
                 if line in RUtils.verboseCommands:
@@ -80,7 +81,6 @@ def createConsoleOutput():
             elif add:
                 RUtils.consoleResults.append("<p>" + line + "</p>\n");
             RUtils.allConsoleResults.append(line);
-            line = lines.readline().strip("\n").strip(" ")
 
 
     @staticmethod