This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch upstream-master in repository pktools.
commit 1f4825e7c1683cd6e8685936078ad8e46b7a7dcb Merge: 2142c8c f7d3dcb Author: Pieter Kempeneers <kempe...@gmail.com> Date: Tue Sep 9 18:58:00 2014 +0200 merge after conflict in pkcrop_gui configure.ac | 3 +- qt/pkcrop_gui/mainwindow.cc | 4 +- src/algorithms/CostFactory.h | 8 +- src/algorithms/CostFactorySVM.cc | 178 ++++++++++ .../pkfssvm.h => algorithms/CostFactorySVM.h} | 19 +- src/algorithms/Makefile.am | 4 +- src/apps/Makefile.am | 4 +- src/apps/pkcomposite.cc | 36 +- src/apps/pkfsann.cc | 4 +- src/apps/pkfssvm.cc | 328 +++++++++---------- src/apps/pkoptsvm.cc | 363 +++++++++++---------- 11 files changed, 580 insertions(+), 371 deletions(-) diff --cc qt/pkcrop_gui/mainwindow.cc index 9ca5237,e77f3d5..1b46e53 --- a/qt/pkcrop_gui/mainwindow.cc +++ b/qt/pkcrop_gui/mainwindow.cc @@@ -262,13 -261,15 +262,15 @@@ void MainWindow::on_toolButton_Run_clic QProcess *myProcess = new QProcess(this); myProcess->start(program); myProcess->setProcessChannelMode(QProcess::MergedChannels); + this->setCursor(Qt::WaitCursor); myProcess->waitForFinished(-1); +// QString p_stderr = myProcess->readyReadStandardError(); +// if(!p_stderr.isEmpty()){ +// QMessageBox msgBox; +// msgBox.setText(p_stderr); +// msgBox.exec(); +// } + this->setCursor(Qt::ArrowCursor); - QMessageBox msgBox; - QString p_stderr = myProcess->readAllStandardError(); - if(!p_stderr.isEmpty()){ - msgBox.setText(p_stderr); - msgBox.exec(); - } QString p_stdout = myProcess->readAll(); ui->consoleEdit->insertPlainText(p_stdout); delete myProcess; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel