Skip to content

Commit ec1424b

Browse files
author
cpolymeris@gmail.com
committed
Log console output (SAGA; OTB; GRASS).
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@339 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
1 parent 4bb5e36 commit ec1424b

7 files changed

+15
-1
lines changed

src/sextante/grass/GrassAlgorithm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def processAlgorithm(self, progress):
274274
loglines = []
275275
loglines.append("GRASS execution commands")
276276
for line in commands:
277-
progress.setInfo(line)
277+
progress.setCommand(line)
278278
loglines.append(line)
279279
if SextanteConfig.getSetting(GrassUtils.GRASS_LOG_COMMANDS):
280280
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)

src/sextante/grass/GrassUtils.py

+1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ def executeGrass(commands, progress):
265265
pass
266266
else:
267267
loglines.append(line)
268+
progress.setConsoleInfo(line)
268269
if SextanteConfig.getSetting(GrassUtils.GRASS_LOG_CONSOLE):
269270
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
270271
shutil.rmtree(GrassUtils.grassMapsetFolder(), True)

src/sextante/gui/AlgorithmExecutionDialog.py

+5
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ def accept(self):
209209
if SextanteConfig.getSetting(SextanteConfig.SHOW_DEBUG_IN_DIALOG):
210210
self.algEx.commandSet.connect(self.setCommand)
211211
self.algEx.debugInfoSet.connect(self.setDebugInfo)
212+
self.algEx.consoleInfoSet.connect(self.setConsoleInfo)
212213
self.algEx.start()
213214
self.setInfo("<b>Algorithm %s started</b>" % self.alg.name)
214215
self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setEnabled(True)
@@ -304,6 +305,10 @@ def setCommand(self, cmd):
304305
def setDebugInfo(self, msg):
305306
self.setInfo('<span style="color:blue">' + msg + '</span>')
306307

308+
@pyqtSlot(str)
309+
def setConsoleInfo(self, msg):
310+
self.setCommand('<span style="color:darkgray">' + msg + '</span>')
311+
307312
def setPercentage(self, i):
308313
if self.progress.maximum() == 0:
309314
self.progress.setMaximum(100)

src/sextante/gui/AlgorithmExecutor.py

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class AlgorithmExecutor(QThread):
1414
infoSet = pyqtSignal(str)
1515
commandSet = pyqtSignal(str)
1616
debugInfoSet = pyqtSignal(str)
17+
consoleInfoSet = pyqtSignal(str)
1718
#started & finished inherited from QThread
1819

1920
def __init__(self, alg, iterParam = None, parent = None):
@@ -34,6 +35,8 @@ def setCommand(self, cmd):
3435
self.algorithmExecutor.commandSet.emit(cmd)
3536
def setDebugInfo(self, info):
3637
self.algorithmExecutor.debugInfoSet.emit(info)
38+
def setConsoleInfo(self, info):
39+
self.algorithmExecutor.consoleInfoSet.emit(info)
3740
self.progress = Progress(self)
3841
if self.parameterToIterate:
3942
self.run = self.runalgIterating

src/sextante/gui/UnthreadedAlgorithmExecutor.py

+3
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ def setCommand(self, _):
8383

8484
def setDebugInfo(self, _):
8585
pass
86+
87+
def setConsoleInfo(self, _):
88+
pass

src/sextante/otb/OTBUtils.py

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def executeOtb(commands, progress):
6565
progress.setPercentage(perc)
6666
else:
6767
loglines.append(line)
68+
progress.setConsoleInfo(line)
6869
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
6970

7071

src/sextante/saga/SagaUtils.py

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ def executeSaga(progress):
7979
line = line.strip()
8080
if line!="/" and line!="-" and line !="\\" and line!="|":
8181
loglines.append(line)
82+
progress.setConsoleInfo(line)
8283
if SextanteConfig.getSetting(SagaUtils.SAGA_LOG_CONSOLE):
8384
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
8485

0 commit comments

Comments
 (0)