Skip to content

Commit f2c9b03

Browse files
author
cpolymeris@gmail.com
committed
SAGA commandline to algorithm execution dialog log
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@331 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
1 parent ae44e7b commit f2c9b03

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/sextante/gui/AlgorithmExecutionDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def accept(self):
199199
self.algEx.percentageChanged.connect(self.setPercentage)
200200
self.algEx.textChanged.connect(self.setText)
201201
self.algEx.iterated.connect(self.iterate)
202+
self.algEx.infoSet.connect(self.log)
202203
self.algEx.start()
203204
self.log("Algorithm %s started" % self.alg.name)
204205
self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setEnabled(True)
@@ -274,9 +275,8 @@ def cancel(self):
274275
except:
275276
pass
276277

277-
@pyqtSlot(str, bool)
278+
@pyqtSlot(str)
278279
def log(self, msg, error = False):
279-
print "!", msg
280280
if error:
281281
SextanteLog.addToLog(SextanteLog.LOG_ERROR, msg)
282282
self.logText.append('<b>' + msg + '</b>')

src/sextante/gui/AlgorithmExecutor.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class AlgorithmExecutor(QThread):
1010
textChanged = pyqtSignal(QString)
1111
error = pyqtSignal(str)
1212
iterated = pyqtSignal(int)
13+
infoSet = pyqtSignal(str)
1314
#started & finished inherited from QThread
1415

1516
def __init__(self, alg, iterParam = None, parent = None):
@@ -24,6 +25,8 @@ def setText(self, text):
2425
self.algorithmExecutor.textChanged.emit(text)
2526
def setPercentage(self, p):
2627
self.algorithmExecutor.percentageChanged.emit(p)
28+
def setInfo(self, info):
29+
self.algorithmExecutor.infoSet.emit(info)
2730
self.progress = Progress(self)
2831
if self.parameterToIterate:
2932
self.run = self.runalgIterating

src/sextante/saga/SagaAlgorithm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ def processAlgorithm(self, progress):
278278
loglines = []
279279
loglines.append("SAGA execution commands")
280280
for line in commands:
281+
progress.setInfo(line)
281282
loglines.append(line)
282283
if SextanteConfig.getSetting(SagaUtils.SAGA_LOG_COMMANDS):
283284
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)

0 commit comments

Comments
 (0)