Commit bb906020 authored by Alexander Semke's avatar Alexander Semke
Browse files

Don't update the variable model for R in case we're dealing with help...

Don't update the variable model for R in case we're dealing with help expressions and removed obsolete function calls on temp objects in scilabexpression.cpp.
parent db41e57c
Pipeline #154379 passed with stage
in 7 minutes and 23 seconds
......@@ -34,9 +34,7 @@ void RExpression::evaluate()
|| cmd.startsWith(QStringLiteral("vignette("))
|| cmd == QStringLiteral("demos()")
|| cmd.startsWith(QStringLiteral("help.search(")) )
m_isHelpRequest=true;
else
m_isHelpRequest=false;
setIsHelpRequest(true);
session()->enqueueExpression(this);
}
......@@ -52,7 +50,7 @@ void RExpression::parseOutput(const QString& text)
//qDebug() << "output text: " << text;
if (!text.trimmed().isEmpty())
{
if(m_isHelpRequest)
if(isHelpRequest())
addResult(new Cantor::HelpResult(text));
else
addResult(new Cantor::TextResult(text));
......@@ -120,7 +118,7 @@ void RExpression::showFilesAsResult(const QStringList& files)
}
qDebug()<<"content: "<<content;
if(m_isHelpRequest)
if(isHelpRequest())
setResult(new Cantor::HelpResult(content));
else
setResult(new Cantor::TextResult(content));
......
......@@ -98,8 +98,8 @@ void ScilabSession::login()
QObject::connect(m_process, &QProcess::readyReadStandardOutput, this, &ScilabSession::readOutput);
QObject::connect(m_process, &QProcess::readyReadStandardError, this, &ScilabSession::readError);
m_process->readAllStandardOutput().clear();
m_process->readAllStandardError().clear();
m_process->readAllStandardOutput();
m_process->readAllStandardError();
changeStatus(Cantor::Session::Done);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment