Merge pull request #462 from MatMatt/master

volaya · volaya · commit 7bc758e6752c · 2013-03-07T00:16:43.000-08:00
[sextante] R scripts can now have empty lines
diff --git a/python/plugins/sextante/r/RAlgorithm.py b/python/plugins/sextante/r/RAlgorithm.py
@@ -97,9 +97,10 @@ def defineCharacteristicsFromFile(self):
         filename = os.path.basename(self.descriptionFile)
         self.name = filename[:filename.rfind(".")].replace("_", " ")
         self.group = "User R scripts"
+        ender = 0
         lines = open(self.descriptionFile)
         line = lines.readline().strip("\n").strip("\r")
-        while line != "":
+        while ender < 10:
             if line.startswith("##"):
                 try:
                     self.processParameterLine(line)
@@ -112,6 +113,10 @@ def defineCharacteristicsFromFile(self):
                     self.addOutput(OutputHTML(RAlgorithm.R_CONSOLE_OUTPUT, "R Console Output"))
                 self.showConsoleOutput = True
             else:
+                if line == '':
+                    ender += 1
+                else:
+                    ender=0
                 self.commands.append(line)
             self.script += line + "\n"
             line = lines.readline().strip("\n").strip("\r")
