R script execution log information: commands and console output.

cpolymeris@gmail.com · cpolymeris@gmail.com · commit cf2fca099874 · 2012-08-10T21:39:12.000Z
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@346 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
diff --git a/src/sextante/r/RAlgorithm.py b/src/sextante/r/RAlgorithm.py
@@ -177,8 +177,10 @@ def processAlgorithm(self, progress):
         loglines = []
         loglines.append("R execution commands")
         loglines += self.getFullSetOfRCommands()
+        for line in loglines:
+            progress.setCommand(line)
         SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
-        RUtils.executeRAlgorithm(self)
+        RUtils.executeRAlgorithm(self, progress)
         if self.showPlots:
             htmlfilename = self.getOutputValue(RAlgorithm.RPLOTS)
             f = open(htmlfilename, "w")
diff --git a/src/sextante/r/RUtils.py b/src/sextante/r/RUtils.py
@@ -47,7 +47,7 @@ def getConsoleOutputFilename():
 
 
     @staticmethod
-    def executeRAlgorithm(alg):
+    def executeRAlgorithm(alg, progress):
         RUtils.verboseCommands = alg.getVerboseCommands();
         RUtils.createRScriptFromRCommands(alg.getFullSetOfRCommands())
         if SextanteUtils.isWindows():
@@ -64,6 +64,8 @@ def executeRAlgorithm(alg):
         loglines = []
         loglines.append("R execution console output")
         loglines += RUtils.allConsoleResults
+        for line in loglines:
+            progress.setConsoleInfo(line)
         SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
 
     @staticmethod
