added r histogram script

fixed bug in r script editor fixed bug in modeler when using lagorithms with optional raster layers git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@178 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · May 9, 2012 · a8651bc · a8651bc
1 parent 6d6331d
commit a8651bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/sextante/modeler/ModelerAlgorithm.py b/src/sextante/modeler/ModelerAlgorithm.py
@@ -281,8 +281,7 @@ def getAsPythonCode(self):
                 aap = self.algParameters[i][param.name]
                 if aap == None:
                     runline += ", None"
-
-                if isinstance(param, ParameterMultipleInput):
+                elif isinstance(param, ParameterMultipleInput):
                     value = self.paramValues[aap.param]
                     tokens = value.split(";")
                     layerslist = []

diff --git a/src/sextante/r/EditRScriptDialog.py b/src/sextante/r/EditRScriptDialog.py
@@ -12,9 +12,11 @@ def __init__(self, alg):
         self.setModal(True)
         self.setupUi()
         self.update = False
+        self.help = None
 
     def setupUi(self):
         self.setWindowTitle("Edit script")
+        self.resize(600, 350)
         layout = QVBoxLayout()
         self.text = QtGui.QTextEdit()
         self.text.setObjectName("text")
@@ -48,20 +50,20 @@ def saveAlgorithm(self):
             filename = QtGui.QFileDialog.getSaveFileName(self, "Save Script", RUtils.RScriptsFolder(), "R-SEXTANTE scripts (*.rsx)")
 
         if filename:
-            self.alg.descriptionFile = filename
+            #self.alg.descriptionFile = filename
             text = self.text.toPlainText()
             fout = open(filename, "w")
             fout.write(text)
             fout.close()
             self.update = True
             #if help strings were defined before saving the model for the first time, we do it here
             if self.help:
-                f = open(self.alg.descriptionFile + ".help", "wb")
+                f = open(filename + ".help", "wb")
                 pickle.dump(self.help, f)
                 f.close()
                 self.help = None
             QtGui.QMessageBox.information(self, "Script saving", "Script was correctly saved.")
-            #self.close()
+            self.close()
 
     def cancelPressed(self):
         self.update = False

diff --git a/src/sextante/r/RAlgorithm.py b/src/sextante/r/RAlgorithm.py
@@ -213,7 +213,7 @@ def getImportCommands(self):
             if isinstance(param, ParameterRaster):
                 value = param.value
                 value = value.replace("\\", "/")
-                commands.append(param.name + " = " + "readGDAL(\"" + value + "\"")
+                commands.append(param.name + " = " + "readGDAL(\"" + value + "\")")
             if isinstance(param, ParameterVector):
                 value = param.getSafeExportedLayer()
                 value = value.replace("\\", "/")

diff --git a/src/sextante/r/scripts/Raster_histogram.rsx b/src/sextante/r/scripts/Raster_histogram.rsx
@@ -0,0 +1,3 @@
+##layer = raster 
+##showplots
+hist(as.matrix(layer))