From a8b3f90806169290ef313359c2897e21b5e5def6 Mon Sep 17 00:00:00 2001 From: Alexander Wolf Date: Sat, 31 Aug 2019 23:07:45 +0700 Subject: [PATCH] Fixed core.resetOutput(); method behaviour (Fix #750) Calling this method should clearing the output file and Output window in Script Console. --- src/gui/ScriptConsole.cpp | 17 ++++++++++++----- src/scripting/StelScriptOutput.cpp | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/gui/ScriptConsole.cpp b/src/gui/ScriptConsole.cpp index e0ddc74193673..527ab4c2d28ec 100644 --- a/src/gui/ScriptConsole.cpp +++ b/src/gui/ScriptConsole.cpp @@ -199,7 +199,7 @@ void ScriptConsole::preprocessScript() void ScriptConsole::runScript() { ui->tabs->setCurrentIndex(1); - ui->logBrowser->setHtml(""); + ui->logBrowser->clear(); appendLogLine(QString("Starting script at %1").arg(QDateTime::currentDateTime().toString())); if (!StelApp::getInstance().getScriptMgr().runScriptDirect(ui->scriptEdit->toPlainText(), ui->includeEdit->text())) @@ -239,10 +239,17 @@ void ScriptConsole::appendLogLine(const QString& s) void ScriptConsole::appendOutputLine(const QString& s) { - QString html = ui->outputBrowser->toHtml(); - html.replace(QRegExp("^\\s+"), ""); - html += s; - ui->outputBrowser->setHtml(html); + if (s.isEmpty()) + { + ui->outputBrowser->clear(); + } + else + { + QString html = ui->outputBrowser->toHtml(); + html.replace(QRegExp("^\\s+"), ""); + html += s; + ui->outputBrowser->setHtml(html); + } } diff --git a/src/scripting/StelScriptOutput.cpp b/src/scripting/StelScriptOutput.cpp index b7f065c9e6e1c..94f37de13ddf1 100644 --- a/src/scripting/StelScriptOutput.cpp +++ b/src/scripting/StelScriptOutput.cpp @@ -48,6 +48,7 @@ void StelScriptOutput::writeLog(QString msg) void StelScriptOutput::reset(void) { + outputFile.resize(0); outputFile.reset(); outputText.clear(); }